Changeset 27827 for main

Timestamp:

2013-07-12T17:12:13+12:00 (11 years ago)

Author:

davidb

Message:

Code changes to help support Greenstone running off a read-only medium, such as a DVD

File:

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

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

@@ -15 +15 @@
 public class Server3 extends BaseServer
 {
+        String opt_ant_properties = null;
 
     public Server3(String gsdl3_src_home, String lang)
@@ -31 +32 @@
         STOP_CMD = "force-stop-tomcat";
 
+        String is_read_only = System.getProperty("gsdl3home.isreadonly","false");
+        if (is_read_only.equals("true")) {
+            String default_gsdl3_home = gsdl3_src_home + File.separatorChar + "web";
+            String gsdl3_writablehome = System.getProperty("gsdl3.writablehome",default_gsdl3_home);
+            opt_ant_properties = "-Dgsdl3home.isreadonly=true -Dgsdl3.writablehome="+gsdl3_writablehome;
+        }
+        
         autoStart();
     }
@@ -36 +44 @@
     protected int runTarget(String cmd)
     {
-        RunAnt runAnt = new RunAnt();
+        RunAnt runAnt = new RunAnt(opt_ant_properties);
         runAnt.setTargetCmd(cmd);
         runAnt.run();
@@ -84 +92 @@
         gsdl3_home = fallbackGSDL3Home();
     }
-    String propsFolder = gsdl3_home + File.separator + "WEB-INF" + File.separator + "classes" + File.separator;
+
+    String gsdl3_writablehome = System.getProperty("gsdl3.writablehome",gsdl3_home);
+
+    String propsFolder = gsdl3_writablehome + File.separator + "WEB-INF" + File.separator + "classes" + File.separator;
     File propsFile = new File(propsFolder+"log4j.properties");
 
     // create it from the template file GS3/resources/java/log4j.properties.in
-    if(!propsFile.exists()) {
+    // Always do this => helps make Greenstone3 portable
+
+
         try {
         // need to set gsdl3.home property's value to be gsdl_home/web,
@@ -102 +115 @@
             // set gsdl3.home to web home
             logProps.setProperty("gsdl3.home", gsdl3_home);
+            logProps.setProperty("gsdl3.writablehome", gsdl3_writablehome);
             
             // write the customised properties out to a custom log4j.properties file
@@ -116 +130 @@
         e.printStackTrace();
         }
-    }
 
     // now configure the logger with the custom log4j.properties file