Changeset 29977 for main/trunk/greenstone3/build.xml

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.

File:

• main/trunk/greenstone3/build.xml (modified) (4 diffs)

main/trunk/greenstone3/build.xml

@@ -790 +790 @@
   
   <target name="start-derby-java">
-    <echo>Launching derby on ${derby.server.port}...</echo>
+    <echo>Launching derby on ${derby.server}:${derby.server.port}...</echo>
     <java classname="org.apache.derby.drda.NetworkServerControl" fork="true" spawn="true" clonevm="true">      
       <arg value="start"/>
@@ -800 +800 @@
        See db-derby-10.1.2.1-bin/docs/html/adminguide/index.html -->
   <target name="start-derby">
-    <echo>About to launch derby on ${derby.server.port}</echo>
+    <echo>About to launch derby on ${derby.server}:${derby.server.port}</echo>
     <property name="derby.server.classpath.prop" refid="derby.server.classpath" />
 
@@ -1237 +1237 @@
     <filter token="tomcat.server" value="${tomcat.server}"/>
     <filter token="tomcat.port" value="${tomcat.port}"/>
+    <filter token="derbyserver" value="${derby.server}"/>
     <filter token="derbyserver.port" value="${derby.server.port}"/>
     <filter token="perlpath" value="${escaped.perl.path}"/>
@@ -1389 +1390 @@
     <filter token="privilegedattribute" value="${privileged.attribute}"/>
     <filter token="allowedIPs" value="${allowed.IPs}"/>
+    <filter token="derbyserver" value="${derby.server}"/>
     <filter token="derbyserverport" value="${derby.server.port}"/>
       </filterset>