Changeset 30673

Show
Ignore:
Timestamp:
04.08.2016 13:27:15 (3 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r30614 r30673  
    13171317    <filter token="tomcat.server" value="${tomcat.server}"/> 
    13181318    <filter token="tomcat.port" value="${tomcat.port}"/> 
     1319    <filter token="greenstone.context" value="${greenstone.context}"/> 
    13191320    <filter token="derbyserver" value="${derby.server}"/> 
    13201321    <filter token="derbyserver.port" value="${derby.server.port}"/> 
     
    14801481 
    14811482    <!-- set up the greenstone3 context, it may have a custom name specified in build.properties --> 
    1482     <if><bool><not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not></bool> 
    1483         <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/${custom.context}.xml" overwrite="true"/> 
     1483    <if><bool><not><equals arg1="greenstone3" arg2="${greenstone.context}"></equals></not></bool> 
     1484        <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${basedir}/resources/tomcat/${greenstone.context}.xml" overwrite="true"/> 
    14841485    </if> 
    1485     <copy file="${basedir}/resources/tomcat/${custom.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${custom.context}.xml" overwrite="true"> 
     1486    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true"> 
    14861487      <filterset> 
    14871488        <filter token="gsdl3webhome" value="${web.home}"/> 
     
    14971498            <and> 
    14981499                <available file="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml"/> 
    1499                 <not><equals arg1="greenstone3" arg2="${custom.context}"></equals></not> 
     1500                <not><equals arg1="greenstone3" arg2="${greenstone.context}"></equals></not> 
    15001501            </and> 
    15011502        </bool>