Changeset 29903 for main/trunk/greenstone3/src/java
- Timestamp:
- 2015-05-20T17:19:33+12:00 (9 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.java
r20009 r29903 8 8 import java.sql.SQLException; 9 9 10 import org.greenstone.util.GlobalProperties; 11 10 12 public class DerbySQLServer implements SQLServer{ 11 static final String PROTOCOL = "jdbc:derby:"; 12 static final String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver"; 13 14 static final String PORT = GlobalProperties.getProperty("derby.server.port");//, "1527"); 15 static final String PROTOCOL = "jdbc:derby://localhost:"+PORT+"/"; //"jdbc:derby:"; 16 static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver"; 13 17 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.derby.DerbySQLServer.class.getName()); 14 18 … … 51 55 public boolean disconnect(String databasePath){ 52 56 try{ 53 String protocol_str = PROTOCOL + databasePath + ";shutdown=true"; 54 DriverManager.getConnection(protocol_str); 57 // Only shutdown if using embedded derby, 58 // not if it's a networked derby server, which is what we now use 59 60 if(DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) { 61 String protocol_str = PROTOCOL + databasePath + ";shutdown=true"; 62 DriverManager.getConnection(protocol_str); 63 } 55 64 }catch (SQLException se){ 56 65 String theError = (se).getSQLState(); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java
r28234 r29903 35 35 public class DerbyWrapper 36 36 { 37 static final String PROTOCOL = "jdbc:derby:"; 38 static final String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver"; 37 static final String PORT = GlobalProperties.getProperty("derby.server.port");//, "1527"); 38 static final String PROTOCOL = "jdbc:derby://localhost:"+PORT+"/"; // "jdbc:derby:"; 39 static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver"; 39 40 static final String USERSDB = "usersDB"; 40 41 static final String USERS = "users"; … … 134 135 { 135 136 // shutdown the whole server 137 // but not if we're a derby client using the derby network server 138 // only if we're using an embedded derby 139 if(DRIVER.equals("org.apache.derby.jdbc.EmbeddedDriver")) { 136 140 DriverManager.getConnection(PROTOCOL + ";shutdown=true"); 141 } 137 142 } 138 143 catch (SQLException se)
Note:
See TracChangeset
for help on using the changeset viewer.