Changeset 25951

Timestamp:

2012-07-16T17:47:34+12:00 (11 years ago)

Author:

ak19

Message:

gsdl3.home no longer exists as a property in global.properties. This had broken gs3-server.sh, but now it defaults to the usual GSDL3SRCHOME/web folder if there is no gsdl3.home property.

Location:

main/trunk/greenstone3/src/java/org/greenstone

Files:

• server/Server3.java (modified) (2 diffs)
• server/Server3Settings.java (modified) (1 diff)
• util/GlobalProperties.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

@@ -14 +14 @@
     public Server3(String gsdl3_src_home, String lang)
     {
-        super(gsdl3_src_home, lang, gsdl3_src_home + File.separatorChar + "build.properties", "logs");
+        super(gsdl3_src_home, lang, gsdl3_src_home + File.separatorChar + "build.properties", "web"+File.separator+"logs");
 
         Property = new Server3Property();
@@ -45 +45 @@
     public void reload()
     {
-        GlobalProperties.loadGlobalProperties(null); // properties file may have changed, so reload it
+        String fallback_gsdl3_home = System.getenv("GSDL3SRCHOME") + File.separator + "web";
+        GlobalProperties.loadGlobalProperties(fallback_gsdl3_home); // properties file may have changed, so reload it
     }
 

main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java

@@ -39 +39 @@
     servlet_combobox.setBackground(bg_color);
 
-    File web_xml = new File(GlobalProperties.getProperty(BaseServer.Property.GSDL_HOME) + File.separator + "WEB-INF" + File.separator + "web.xml");
+    File web_xml = new File(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "web.xml");
     XMLConverter converter = new XMLConverter();
     Document web_config = converter.getDOM(web_xml);

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

@@ -95 +95 @@
             }
 
+            // if gsdl3_home is still null, fall back to default: gsdl3srchome/web
+            if (gsdl3_home == null) { 
+                gsdl3_home = System.getenv("GSDL3SRCHOME") + File.separator + "web";
+                logger.warn("** Note: falling back to using GSDL3SRCHOME to set gsdl3.home to: " + gsdl3_home);
+            }
+
             // make sure the path separators are correct
             // gsdl3_home may be null, eg when we are loading properties from Server3