Changeset 29903 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.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/sql/derby/DerbySQLServer.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import java.sql.SQLException;
 
+import org.greenstone.util.GlobalProperties;
+
 public class DerbySQLServer implements SQLServer{
-    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 Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.derby.DerbySQLServer.class.getName());     
 
@@ -51 +55 @@
     public boolean disconnect(String databasePath){
     try{
-        String protocol_str = PROTOCOL + databasePath + ";shutdown=true"; 
-        DriverManager.getConnection(protocol_str);
+        // Only shutdown if using embedded derby, 
+        // not if it's a networked derby server, which is what we now use
+
+        if(DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+        String protocol_str = PROTOCOL + databasePath + ";shutdown=true";       
+        DriverManager.getConnection(protocol_str);
+        }
     }catch (SQLException se){
         String theError = (se).getSQLState();