Changeset 25717 for main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

Timestamp:

2012-05-30T15:34:25+12:00 (12 years ago)

Author:

sjm84

Message:

Added a BaseGreenstoneServlet servlet that the other servlets now inherit from so that we can be sure that GlobalProperties is properly initialised. There is also some reformatting and import cleaning

File:

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

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

@@ -32 +32 @@
 
     static Logger logger = Logger.getLogger(org.greenstone.util.GlobalProperties.class.getName());
-    private static Properties properties = null;
+    private static Properties properties = new Properties();
     private static String properties_filename = "global.properties";
     private static String gsdl3_home = null;
     private static String gsdl3_web_address = null;
-        private static String full_gsdl3_web_address = null;
-
-    // Note, that if the servlet is reloadable, then it is reloaded each time the file is changed.
-    static
-    {
-        //load in the properties
-        properties = new Properties();
-        reload();
-    }
+    private static String full_gsdl3_web_address = null;
 
     /** get the value of the property 'key'. returns null if not found */
@@ -76 +68 @@
     }
 
-        public static String getFullGSDL3WebAddress()
+    public static String getFullGSDL3WebAddress()
     {
         return full_gsdl3_web_address;
     }
 
-    public static void reload()
+    public static void loadGlobalProperties(String optionalGS3Home)
     {
         try
         {
-
             InputStream in = Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream(properties_filename);
             if (in != null)
@@ -97 +88 @@
                 logger.error("couldn't load global properties!");
             }
+
             gsdl3_home = properties.getProperty("gsdl3.home");
+            if ((gsdl3_home == null || gsdl3_home.length() > 0) && optionalGS3Home != null && optionalGS3Home.length() > 0)
+            {
+                gsdl3_home = optionalGS3Home;
+            }
+
             // make sure the path separators are correct
             File gs3_file = new File(gsdl3_home);