Changeset 28297

Timestamp:

2013-09-19T17:50:40+12:00 (11 years ago)

Author:

jlwhisler

Message:

Allowing the user to customise the context name of GS3.

Location:

main/trunk/greenstone3

Files:

• build.properties.in (modified) (1 diff)
• build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.properties.in

@@ -30 +30 @@
 # default servlet to start with
 server.default.servlet=/library
+
+# The context name of your GS3 digital library. By default this will be "greenstone3". 
+# Ensure this has a value. If you change this multiple times, you need to remove the old versions
+# of <custom.context>.xml from GS3/packages/tomcat/conf/Catalina/localhost
+# does not contain previous 
+custom.context=greenstone3
 
 ##Browser setup

main/trunk/greenstone3/build.xml

@@ -1285 +1285 @@
       </filterset>
     </copy>
-    <!-- set up the greenstone3 context -->
-    <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true">
+    <!-- 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>
+    <copy file="${basedir}/resources/tomcat/${custom.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${custom.context}.xml" overwrite="true">
       <filterset>
         <filter token="gsdl3webhome" value="${web.home}"/>
@@ -1293 +1296 @@
       </filterset>
     </copy>
+    <if>
+        <bool>
+            <and>
+                <available file="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml"/>
+                <not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not>
+            </and>
+        </bool>
+        <delete file="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml"/>
+    </if>
     
     <!-- set up the greenstone3 web.xml file -->
@@ -1301 +1313 @@
     </copy>
   </target>
-
+ 
   <target name="configure-tomcat-external" depends="init" unless="tomcat.islocal">
     <!-- re-setup the server.xml file -->