Ignore:
Timestamp:
2015-06-09T19:23:24+12:00 (9 years ago)
Author:
ak19
Message:

Related to commits 29903 and 29923. Adding a property for the derbyserver, which will be localhost by default.

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  
    1313   
    1414    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";
    1617    static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
    1718    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  
    3636{
    3737    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";
    3940    static final String DRIVER = "org.apache.derby.jdbc.ClientDriver"; //"org.apache.derby.jdbc.EmbeddedDriver";
    4041    static final String USERSDB = "usersDB";
Note: See TracChangeset for help on using the changeset viewer.