Changeset 30673

Timestamp:

2016-08-04T13:27:15+12:00 (7 years ago)

Author:

kjdon

Message:

custom.context renamed to greenstone.context. And now global.properties uses this variable, so add it to the list of filters

File:

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

main/trunk/greenstone3/build.xml

@@ -1317 +1317 @@
     <filter token="tomcat.server" value="${tomcat.server}"/>
     <filter token="tomcat.port" value="${tomcat.port}"/>
+    <filter token="greenstone.context" value="${greenstone.context}"/>
     <filter token="derbyserver" value="${derby.server}"/>
     <filter token="derbyserver.port" value="${derby.server.port}"/>
@@ -1480 +1481 @@
 
     <!-- set up the greenstone3 context, it may have a custom name specified in build.properties -->
-    <if><bool><not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not></bool>
-        <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/${custom.context}.xml" overwrite="true"/>
+    <if><bool><not><equals arg1="greenstone3" arg2="${greenstone.context}"></equals></not></bool>
+        <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/${greenstone.context}.xml" overwrite="true"/>
     </if>
-    <copy file="${basedir}/resources/tomcat/${custom.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${custom.context}.xml" overwrite="true">
+    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true">
       <filterset>
         <filter token="gsdl3webhome" value="${web.home}"/>
@@ -1497 +1498 @@
             <and>
                 <available file="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml"/>
-                <not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not>
+                <not><equals arg1="greenstone3" arg2="${greenstone.context}"></equals></not>
             </and>
         </bool>