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

Timestamp:

2015-05-20T17:19:33+12:00 (9 years ago)

Author:

ak19

Message:

Changing over from embedded derby db to networked derby server. Not yet tested on windows.

File:

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

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

@@ -35 +35 @@
 public class DerbyWrapper
 {
-    static final String PROTOCOL = "jdbc:derby:";
-    static final String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
+    static final String PORT = GlobalProperties.getProperty("derby.server.port");//, "1527");
+    static final String PROTOCOL = "jdbc:derby://localhost:"+PORT+"/"; // "jdbc:derby:";
+    static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
     static final String USERSDB = "usersDB";
     static final String USERS = "users";
@@ -134 +135 @@
         {
             //  shutdown the whole server
+            // but not if we're a derby client using the derby network server 
+            // only if we're using an embedded derby
+            if(DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
             DriverManager.getConnection(PROTOCOL + ";shutdown=true");
+            }
         }
         catch (SQLException se)