Changeset 29977 for main/trunk/greenstone3/src/java
- Timestamp:
- 2015-06-09T19:23:24+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
r29903 r29977 13 13 14 14 static final String PORT = GlobalProperties.getProperty("derby.server.port");//, "1527"); 15 static final String PROTOCOL = "jdbc:derby://localhost:"+PORT+"/"; //"jdbc:derby:"; 15 static final String DERBYSERVER = GlobalProperties.getProperty("derby.server");//, "localhost"); 16 static final String PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527"; 16 17 static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver"; 17 18 static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.derby.DerbySQLServer.class.getName()); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java
r29903 r29977 36 36 { 37 37 static final String PORT = GlobalProperties.getProperty("derby.server.port");//, "1527"); 38 static final String PROTOCOL = "jdbc:derby://localhost:"+PORT+"/"; // "jdbc:derby:"; 38 static final String DERBYSERVER = GlobalProperties.getProperty("derby.server");//, "localhost"); 39 static final String PROTOCOL = "jdbc:derby://"+DERBYSERVER+":"+PORT+"/"; // "jdbc:derby://localhost:1527"; 39 40 static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver"; 40 41 static final String USERSDB = "usersDB";
Note:
See TracChangeset
for help on using the changeset viewer.