Skip to content

Commit

Permalink
[BACKLOG-42521] License Notice in EE Splash Screen
Browse files Browse the repository at this point in the history
Merge pull request #5744 from smaring/DEVO-10693-10.2.0.0

Devo 10693 10.2.0.0

(cherry picked from commit 3afbf00)
  • Loading branch information
smaring authored and singletonc committed Oct 31, 2024
1 parent dbe7866 commit 3af58a6
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 33 deletions.
20 changes: 0 additions & 20 deletions assemblies/pentaho-server-manual/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,6 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-oss-licenses</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>pentaho</groupId>
<artifactId>oss-licenses</artifactId>
<version>${project.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${pentaho-server.directory}/licenses</outputDirectory>
<includes>PentahoServer_OSS_Licenses.html</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>unpack-manifest-file</id>
<phase>prepare-package</phase>
Expand Down
9 changes: 0 additions & 9 deletions assemblies/pentaho-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,6 @@
**/webapps/manager/**,
**/webapps/ROOT/**</excludes>
</artifactItem>
<artifactItem>
<groupId>pentaho</groupId>
<artifactId>oss-licenses</artifactId>
<version>${project.version}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${pentaho-server.directory}/licenses</outputDirectory>
<includes>PentahoServer_OSS_Licenses.html</includes>
</artifactItem>
<artifactItem>
<groupId>pentaho</groupId>
<artifactId>pentaho-solutions</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,19 @@
import org.pentaho.gwt.widgets.client.utils.string.StringUtils;
import org.pentaho.mantle.client.MantleApplication;
import org.pentaho.mantle.client.messages.Messages;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.TextResource;

import java.util.Date;

public class AboutCommand extends AbstractCommand {

interface MyTextResource extends ClientBundle {
@Source("org/pentaho/mantle/public/license.txt")
TextResource myText();
}

public AboutCommand() {
}

Expand Down Expand Up @@ -64,18 +72,29 @@ public void onResponseReceived( Request request, Response response ) {
}
}

public String readTextFile() {
MyTextResource resource = GWT.create(MyTextResource.class);
String text = resource.myText().getText();
text = text.replace("\t", "&emsp;");
text = "<pre>" + text + "</pre>";
return text;
}

private void showAboutDialog( String version ) {
@SuppressWarnings( "deprecation" )
String licenseInfo = Messages.getString( "licenseInfo", "" + ( ( new Date() ).getYear() + 1900 ) );
String releaseLabel = Messages.getString( "release" );
PromptDialogBox dialogBox =
new PromptDialogBox( Messages.getString( "aboutDialogTitle" ), Messages.getString( "ok" ), null, false, true ); //$NON-NLS-1$
new PromptDialogBox( null, Messages.getString( "ok" ), null, false, true ); //$NON-NLS-1$

VerticalPanel aboutContent = new VerticalPanel();
aboutContent.setBorderWidth(0);
String licenseText = readTextFile();
aboutContent.setStyleName( "about-splash" );
aboutContent.add( new Label( releaseLabel + " " + version ) );
aboutContent.add( new HTML( licenseInfo ) );

aboutContent.add( new HTML( licenseText ) );
dialogBox.setContent( aboutContent );
dialogBox.setPixelSize(700, 400);
dialogBox.center();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -893,3 +893,10 @@ code {
#pucTabsMenuBar{
display: none;
}

.about-splash {
background-image: url("images/aboutScreen.png");
padding-top: 70px;
padding-left: 285px;
font-size: 7px;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
Pentaho Developer Edition 10.2 Copyright 2024 Hitachi Vantara, LLC; licensed under the
Business Source License 1.1 (BSL). This project may include third party components that
are individually licensed per the terms indicated by their respective copyright owners
included in text file or in the source code.

License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
"Business Source License" is a trademark of MariaDB Corporation Ab.

Parameters

Licensor: Hitachi Vantara, LLC.
Licensed Work: Pentaho Developer Edition 10.2. The Licensed Work is (c) 2024
Hitachi Vantara, LLC.
Additional Use Grant: None
Change Date: Four years from the date the Licensed Work is published.
Change License: Apache 2.0

For information about alternative licensing arrangements for the Licensed Work,
please contact [email protected].

Notice

Business Source License 1.1

Terms

The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited production use.

Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.

If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.

All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.

You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.

Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.

This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.

0 comments on commit 3af58a6

Please sign in to comment.