Changeset 29977


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
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.properties.in

    r29903 r29977  
    1818# Default derby networked server portnumber is 1527, can change this here in case of conflict
    1919derby.server.port=1527
     20# The following is best left as it is, except if 'localhost' doesn't work on your machine,
     21# then try setting it to 127.0.0.1 or its IPv6 equivalent 0:0:0:0:0:0:0:1
     22derby.server=localhost
    2023
    2124## Collection building options

  • main/trunk/greenstone3/build.xml

    r29903 r29977  
    790790 
    791791  <target name="start-derby-java">
    792     <echo>Launching derby on ${derby.server.port}...</echo>
     792    <echo>Launching derby on ${derby.server}:${derby.server.port}...</echo>
    793793    <java classname="org.apache.derby.drda.NetworkServerControl" fork="true" spawn="true" clonevm="true">     
    794794      <arg value="start"/>
    … …  
    800800       See db-derby-10.1.2.1-bin/docs/html/adminguide/index.html -->
    801801  <target name="start-derby">
    802     <echo>About to launch derby on ${derby.server.port}</echo>
     802    <echo>About to launch derby on ${derby.server}:${derby.server.port}</echo>
    803803    <property name="derby.server.classpath.prop" refid="derby.server.classpath" />
    804804
    … …  
    12371237    <filter token="tomcat.server" value="${tomcat.server}"/>
    12381238    <filter token="tomcat.port" value="${tomcat.port}"/>
     1239    <filter token="derbyserver" value="${derby.server}"/>
    12391240    <filter token="derbyserver.port" value="${derby.server.port}"/>
    12401241    <filter token="perlpath" value="${escaped.perl.path}"/>
    … …  
    13891390    <filter token="privilegedattribute" value="${privileged.attribute}"/>
    13901391    <filter token="allowedIPs" value="${allowed.IPs}"/>
     1392    <filter token="derbyserver" value="${derby.server}"/>
    13911393    <filter token="derbyserverport" value="${derby.server.port}"/>
    13921394      </filterset>

  • main/trunk/greenstone3/resources/tomcat/greenstone3.xml.in

    r29903 r29977  
    1818    <Realm className="org.apache.catalina.realm.JDBCRealm"
    1919        driverName="org.apache.derby.jdbc.ClientDriver"
    20         connectionURL="jdbc:derby://localhost:@derbyserverport@/@gsdl3webhome@/etc/usersDB"
     20        connectionURL="jdbc:derby://@derbyserver@:@derbyserverport@/@gsdl3webhome@/etc/usersDB"
    2121        userTable="users" userNameCol="username" userCredCol="password"
    2222        userRoleTable="roles" roleNameCol="role"

  • main/trunk/greenstone3/resources/web/global.properties.in

    r29903 r29977  
    2020tomcat.context=greenstone3
    2121[email protected]@
     22derby.server=@derbyserver@
    2223
    2324## Proxy setup - set these if you are behind a firewall and you want services that access the internet

  • 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.