Changeset 37610

Timestamp:

2023-04-06T14:17:39+12:00 (13 months ago)

Author:

anupama

Message:

Changing derby fallback port to GS default derby port 8327 instead of derby out-of-box default 1527. When installing GS in textonly mode, I noticed the derby server said was started on 8327 but when the admin password failed to set as it couldn't connect to the running derby server mentioning port 1527. So this may explain why the installer had a connection exception when connecting to the server in its attempt to set the admin password. Hopefully this fixes it.

Location:

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

Files:

• sql/derby/DerbySQLServer.java (modified) (1 diff)
• util/DerbyWrapper.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.java

@@ -12 +12 @@
 public class DerbySQLServer implements SQLServer{
    
-    static final String PORT = GlobalProperties.getProperty("derby.server.port", "1527");
+    static final String PORT = GlobalProperties.getProperty("derby.server.port", "8327"); // GS default derby port is 8327 vs derby out-of-box default 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 PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:8327";
     static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.derby.DerbySQLServer.class.getName());     

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

@@ -61 +61 @@
     
     // No more fallback values, use exactly what's propagated into global.properties from build.properties
-    String port = GlobalProperties.getProperty("derby.server.port");//, "1527");
+    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 = "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";
     }
-    PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527"; // by default
+    PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:8327"; // by default
     //System.out.println("@@@ PROTOCOL:" + PROTOCOL); //check in installer
     }