Changeset 32153 for main

Timestamp:

2018-02-26T19:57:21+13:00 (6 years ago)

Author:

ak19

Message:

2 Bugfixes and tidying up errorhandling in JarTools. 1. Dr Bainbridge fixed issue surrounding env.Path rather than env.PATH being used on Windows, while the empty env.PATH was being concatenated as a variable name by build.xml. This resulted in a cyclical reference, noticed when running the GLI Web Start Application (converted from GLI Applet). Fix is in build.xml. 2. My bugfix to WebGatherer.java, the new GLI Web Start Application. The collectionDir wasn't set correctly until the Gatherer object was instantiated, but the collect dir needed to be known by other code beforehand. So shifted the Gatherer object instantiation up a bit. 3. Can't yet reproduce the Exception seen twice before when running GLI Web Start application. The exception was thrown in ZipTools.java. Tested by rerunning the applet repeatedly, but it hasn't struck again yet. Perhaps it's been fixed now because of the other changes?

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/GathererApplet.java (modified) (1 diff)
• gli/src/org/greenstone/gatherer/WebGatherer.java (modified) (2 diffs)
• gli/src/org/greenstone/gatherer/util/JarTools.java (modified) (2 diffs)
• greenstone3/build.xml (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -152 +152 @@
     }
     
+    // For WebGatherer.java, which uses Java Web Start over JNLP to run the repurposed "applet" as application,
+    // it turned out that for GS3, we need the collectionDirectoryPath set for the subsequent code to work.
+    // In WebGatherer.java, moved the instantiation of the Gatherer object here, but to avoid major changes to
+    // this GathererApplet.java class, just calling the relevant line in Gatherer() constructor at this stage:
+    Gatherer.setCollectDirectoryPath(Gatherer.getGLIUserDirectoryPath() + "collect" + File.separator);
+    
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
     if (!collect_directory.exists()) {

main/trunk/gli/src/org/greenstone/gatherer/WebGatherer.java

@@ -194 +194 @@
     }
     
+    // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
+    gatherer = new Gatherer(args); // Do this early as it will also call Gatherer.setCollectDirectoryPath(), because we need that to have been set hereafter.
+                
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
     if (!collect_directory.exists()) {
@@ -217 +220 @@
         unzipFromJar("metadata.zip", Gatherer.getGLIDirectoryPath());
     }
-
-    // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
-    gatherer = new Gatherer(args);
 
     gatherer.openGUI();

main/trunk/gli/src/org/greenstone/gatherer/util/JarTools.java

@@ -133 +133 @@
     static public boolean isInJar(String filename) 
     {
+    InputStream fis = null;
     try {
-        InputStream fis = root_class.getResourceAsStream("/" + filename);           
-        fis.close();
+        fis = root_class.getResourceAsStream("/" + filename);
+        if(fis == null) {
+            System.err.println("@@@ JarTools.isInJar(): file inputstream for file /"+filename+" is still null. Not in jar file.");
+            return false;
+        }
     }
     catch (Exception exception) {
@@ -141 +145 @@
         return false;
     }
+    finally {
+        if(!SafeProcess.closeResource(fis)) {
+            System.err.println("@@@ JarTools.isInJar(): Couldn't close file inputstream");
+            return false;
+        }
+    }
 
     return true;

main/trunk/greenstone3/build.xml

@@ -649 +649 @@
   </path>
 
-
-  <path id="local.tomcat.path">
-    <pathelement location="${basedir}/bin/script"/>
-    <pathelement location="${basedir}/bin"/>
-    <pathelement location="${lib.jni}"/>
-    <pathelement path="${env.PATH}"/>
-    <pathelement path="${env.Path}"/>
-    <pathelement path="${wn.home}/bin"/>
-  </path>
+  
+    <if><bool><isset property="env.PATH"/></bool>
+      <path id="local.tomcat.path">
+        <pathelement location="${basedir}/bin/script"/>
+        <pathelement location="${basedir}/bin"/>
+        <pathelement location="${lib.jni}"/>    
+        <pathelement path="${env.PATH}"/>
+        <pathelement path="${wn.home}/bin"/>
+      </path>
+      <!-- Windows can be case sensitive about env.PATH, preferring env.Path. See https://ant.apache.org/manual/Tasks/property.html  -->
+      <else><if><bool><isset property="env.Path"/></bool>
+        <path id="local.tomcat.path">
+          <pathelement location="${basedir}/bin/script"/>
+          <pathelement location="${basedir}/bin"/>
+          <pathelement location="${lib.jni}"/>
+          <pathelement path="${env.Path}"/>
+          <pathelement path="${wn.home}/bin"/>
+        </path>
+      <!-- else print error about no path set -->
+      <else>
+        <echo>No env.PATH (or env.Path) set. Unable to set local.tomcat.path property</echo>
+      </else></if></else>   
+    </if>   
 
   <target name="test-setup">
@@ -666 +680 @@
     <echo>is windows : ${current.os.iswindows}</echo>
     <echo>os.unix: ${os.unix}</echo>
+    <echo>env.PATH: ${env.PATH}</echo>
+    <echo>env.Path: ${env.Path}</echo>  
   </target>