Changeset 25951 for main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

Timestamp:

2012-07-16T17:47:34+12:00 (12 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.

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java (modified) (2 diffs)

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
     }