Restore welcome page

HiromuHota · Feb 27, 2017 · 5d5ff3a · 5d5ff3a
1 parent c770e56
commit 5d5ff3a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/ui/WEB-INF/web.xml b/ui/WEB-INF/web.xml
@@ -22,4 +22,13 @@
     <servlet-name>rwtServlet</servlet-name>
     <url-pattern></url-pattern>
   </servlet-mapping>
+
+  <servlet>
+    <servlet-name>welcome</servlet-name>
+    <jsp-file>/docs/English/welcome/index.html</jsp-file>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>welcome</servlet-name>
+    <url-pattern>/docs/English/welcome/index.html</url-pattern>
+  </servlet-mapping>
 </web-app>
diff --git a/ui/build.xml b/ui/build.xml
@@ -78,6 +78,7 @@
       </lib>
       <classes dir="${classes.dir}"/>
       <fileset file="OSS_Licenses.html"/>
+      <zipfileset dir="docs" prefix="docs"/>
     </war>
   </target>
 

diff --git a/ui/ivy.xml b/ui/ivy.xml
@@ -213,6 +213,9 @@
     <!-- Manually include dependencies to align with the official distribution -->
     <dependency org="stax" name="stax-api" rev="1.0.1" transitive="false"/>
 
+    <!-- For welcome page -->
+    <dependency org="org.eclipse.jetty" name="jetty-jsp" rev="8.1.15.v20140411"/>
+
     <!-- Exclude some modules that were replaced by rap -->
     <exclude module="swt-linux-x86_64"/>
     <exclude module="jface"/>

diff --git a/ui/src/org/pentaho/di/ui/spoon/Spoon.java b/ui/src/org/pentaho/di/ui/spoon/Spoon.java
@@ -1673,7 +1673,6 @@ public void copyJob() {
   }
 
   public void showWelcomePage() {
-    try {
       LocationListener listener = new LocationListener() {
         public void changing( LocationEvent event ) {
           if ( event.location.endsWith( ".pdf" ) ) {
@@ -1703,22 +1702,7 @@ public void changed( LocationEvent event ) {
         }
       };
 
-      // see if we are in webstart mode
-      String webstartRoot = System.getProperty( "spoon.webstartroot" );
-      if ( webstartRoot != null ) {
-        URL url = new URL( webstartRoot + '/' + FILE_WELCOME_PAGE );
-        addSpoonBrowser( STRING_WELCOME_TAB_NAME, url.toString(), listener ); // ./docs/English/tips/index.htm
-      } else {
-        // see if we can find the welcome file on the file system
-        File file = new File( FILE_WELCOME_PAGE );
-        if ( file.exists() ) {
-          // ./docs/English/tips/index.htm
-          addSpoonBrowser( STRING_WELCOME_TAB_NAME, file.toURI().toURL().toString(), listener );
-        }
-      }
-    } catch ( MalformedURLException e1 ) {
-      log.logError( Const.getStackTracker( e1 ) );
-    }
+      addSpoonBrowser( STRING_WELCOME_TAB_NAME, FILE_WELCOME_PAGE, listener ); // ./docs/English/tips/index.htm
   }
 
   public void showDocumentMap() {