Changeset 30196 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

Timestamp:

2015-09-03T20:59:30+12:00 (9 years ago)

Author:

ak19

Message:

Fixes to do with networked Derby: port and host number changes propagated from build.props to global.props are now at last picked up by DerbyWrapper.java by build.xml setting a system property (-Dgsdl3.writablehome), which is then used to force load Global.Properties if it's not loaded yet. It won't be loaded when launching the ant update-userdb cmd which runs ModifyUsersDB.java. Or if running ModifyUsersDB.java, txt2usersDB.java or usersDB2txt from the cmdline.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

@@ -35 +35 @@
 public class DerbyWrapper
 {
-    static final String PORT = GlobalProperties.getProperty("derby.server.port", "1527");
-    static final String DERBYSERVER = GlobalProperties.getProperty("derby.server", "localhost");
-    static final String PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527";
-    static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
+    static final String PORT;
+    static final String DERBYSERVER;
+    static final String PROTOCOL;   
+
+    // static code block to initialise the above
+    static {
+    // GlobalProperties won't be loaded at this point if running ant config-admin or ant config-user 
+    // from the command line (both of which call ant update-userdb which in turn calls ModifyUsersDB.java)
+    // In such a case, the ant command will have set the system property (-Dgsdl3_writablehome) 
+    // and passed this to ModifyUsersDB.java. Use that to load the GlobalProperties at this point
+
+    if(GlobalProperties.getGSDL3Home() == null) { // testing whether GlobalProperties is already loaded
+        String gsdl3_writablehome = System.getProperty("gsdl3.writablehome"); // set by 'ant update-userdb' cmd
+
+        //System.err.println("@@@@@ writablehome: " + gsdl3_writablehome);
+        GlobalProperties.loadGlobalProperties(gsdl3_writablehome);
+    }
+    
+    //System.err.println("@@@@@ GlobalProperties.getGSDL3Home(): " + GlobalProperties.getGSDL3Home()); //test
+    
+    // No more fallback values, use exactly what's propagated into global.properties from build.properties
+    PORT = GlobalProperties.getProperty("derby.server.port");//, "1527");
+    DERBYSERVER = GlobalProperties.getProperty("derby.server");//, "localhost");
+    PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527"; // by default
+    }
+   
+
+    static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
     static final String USERSDB = "usersDB";
     static final String USERS = "users";