Changeset 27868 for main

Timestamp:

2013-07-15T23:25:48+12:00 (11 years ago)

Author:

davidb

Message:

Additional fallback code added that tries to use System property gsdl3.writablehome to locate global.properties

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

@@ -21 +21 @@
 import java.io.File;
 import java.io.InputStream;
+import java.io.FileInputStream;
 import java.util.Properties;
 
@@ -71 +72 @@
     public static String getGSDL3WebAddress()
     {
+                logger.info("**** Asked for Web Address");
         return gsdl3_web_address;
     }
@@ -76 +78 @@
     public static String getFullGSDL3WebAddress()
     {
+                logger.info("**** Asked for FULL Web Address");
         return full_gsdl3_web_address;
     }
@@ -84 +87 @@
         {
             InputStream in = Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream(properties_filename);
+
+            if (in==null)
+            {
+                    // Try to find it through gsdl3.writablehome
+                    logger.info("Couldn't find '" + properties_filename + "' through ClassLoader");
+                    logger.info("Trying alternative path through System property gsdl3.writablehome");
+                gsdl3_writablehome = System.getProperty("gsdl3.writablehome");
+                if (gsdl3_writablehome!=null) {
+
+                    String gp_full_filename = gsdl3_writablehome + File.separator + "WEB-INF"
+                    + File.separator + "classes" 
+                    + File.separator + properties_filename; 
+
+                    try {
+                    in = new FileInputStream(gp_full_filename);
+                    logger.info("Found '" + properties_filename + "'");
+                    }
+                    catch (Exception e) {
+                    logger.info("Unable to locate '" + gp_full_filename + "'");
+                    }
+                }
+                else {
+                    logger.info("Java property gsdl3.writablehome was not set");
+                }
+            }
+
             if (in != null)
             {
@@ -90 +119 @@
                 in.close();
             }
-            else
-            {
-                logger.error("Couldn't load global properties: " + properties_filename);
-            }
+            else {
+                    logger.error("Failed to find '" + properties_filename + "'");
+            }    
 
             gsdl3_home = properties.getProperty("gsdl3.home");