Changeset 30231 for main/trunk/greenstone3

Timestamp:

2015-09-08T20:09:13+12:00 (9 years ago)

Author:

ak19

Message:

Admin passwords set during installer stopped working, probably because of the recent change to DerbyWrapper where the fallback values were removed. During the installer the values in build.properties may not have propagated to global.properties yet, so need the derby host and derby port fallback values.

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

@@ -56 +56 @@
     
     // 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");
+    // Fallback values are only for the installer to use
+    PORT = GlobalProperties.getProperty("derby.server.port", "1527");
+    DERBYSERVER = GlobalProperties.getProperty("derby.server", "localhost");
     PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527"; // by default
     }