Changeset 37674

Timestamp:

2023-04-18T18:27:39+12:00 (12 months ago)

Author:

anupama

Message:

Finally adding in what Dr Bainbridge explained: we should be able to run the Greenstone installer with -Dderby.server.port=xxxx and that's the port number that should be preferred when the installer briefly connects to set the admin pwd to some custom value. This code has not been tested with the installer yet, as it needs to be committed in order to regenerate the installer with this new code.

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

@@ -63 +63 @@
     String port = GlobalProperties.getProperty("derby.server.port");//, "8327"); GS' default derby port.
     if(port.indexOf("@") == -1) { // if there are still @placeholders@ in global.properties, then use fallback values
-        PORT = port;
         DERBYSERVER = GlobalProperties.getProperty("derby.server");//, "localhost");
     } else {
-        PORT = "8327"; // This setting is used by installer. 8327 is GS default derby port. Note: Out-of-box derby defaults to port 1527
+        port = "8327"; // This setting is used by installer. 8327 is GS default derby port. Note: Out-of-box derby defaults to port 1527
         DERBYSERVER = "localhost";
     }
+    
+    // Check any -D JVM properties passed to GS3 jarfile and, iff set, use it in preference to any PORT already found
+    // See https://stackoverflow.com/questions/5045608/proper-usage-of-java-d-command-line-parameters
+    PORT = System.getProperty("derby.server.port", port);
+    
     PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:8327"; // by default
     //System.out.println("@@@ PROTOCOL:" + PROTOCOL); //check in installer