Changeset 28297

Show
Ignore:
Timestamp:
19.09.2013 17:50:40 (6 years ago)
Author:
jlwhisler
Message:

Allowing the user to customise the context name of GS3.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r28259 r28297  
    3030# default servlet to start with 
    3131server.default.servlet=/library 
     32 
     33# The context name of your GS3 digital library. By default this will be "greenstone3".  
     34# Ensure this has a value. If you change this multiple times, you need to remove the old versions 
     35# of <custom.context>.xml from GS3/packages/tomcat/conf/Catalina/localhost 
     36# does not contain previous  
     37custom.context=greenstone3 
    3238 
    3339##Browser setup 
  • main/trunk/greenstone3/build.xml

    r28259 r28297  
    12851285      </filterset> 
    12861286    </copy> 
    1287     <!-- set up the greenstone3 context --> 
    1288     <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"> 
     1287    <!-- set up the greenstone3 context, it may have a custom name specified in build.properties --> 
     1288    <if><bool><not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not></bool> 
     1289        <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/${custom.context}.xml" overwrite="true"/> 
     1290    </if> 
     1291    <copy file="${basedir}/resources/tomcat/${custom.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${custom.context}.xml" overwrite="true"> 
    12891292      <filterset> 
    12901293        <filter token="gsdl3webhome" value="${web.home}"/> 
     
    12931296      </filterset> 
    12941297    </copy> 
     1298    <if> 
     1299        <bool> 
     1300            <and> 
     1301                <available file="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml"/> 
     1302                <not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not> 
     1303            </and> 
     1304        </bool> 
     1305        <delete file="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml"/> 
     1306    </if> 
    12951307     
    12961308    <!-- set up the greenstone3 web.xml file --> 
     
    13011313    </copy> 
    13021314  </target> 
    1303  
     1315  
    13041316  <target name="configure-tomcat-external" depends="init" unless="tomcat.islocal"> 
    13051317    <!-- re-setup the server.xml file -->