Changeset 28908

Show
Ignore:
Timestamp:
17.03.2014 12:22:43 (6 years ago)
Author:
kjdon
Message:

added in a copy step for global.properties.in and log4j.properties.in - copy then to a .properties file (without .in) in resources/java. these can be edited by user, then the .properties files are copied and filtered into web folder

Files:
1 modified

Legend:

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

    r28907 r28908  
    955955    </if> 
    956956    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg" overwrite="true"/> 
    957  
     957    <if><bool><available file="${basedir}/resources/java/global.properties"/></bool> 
     958    <copy file="${basedir}/resources/java/global.properties" tofile="${basedir}/resources/java/global.properties.backup" overwrite="true"/> 
     959    </if> 
     960    <copy file="${basedir}/resources/java/global.properties.in" tofile="${basedir}/resources/java/global.properties" overwrite="true"/> 
     961    <if><bool><available file="${basedir}/resources/java/log4j.properties"/></bool> 
     962    <copy file="${basedir}/resources/java/log4j.properties" tofile="${basedir}/resources/java/log4j.properties.backup" overwrite="true"/> 
     963    </if> 
     964    <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${basedir}/resources/java/log4j.properties" overwrite="true"/> 
    958965  </target> 
    959966  <!-- ========== Web app Targets ================================ --> 
     
    11851192    <filter token="disable.collection.building" value="${disable.collection.building}"/> 
    11861193    <copy file="${basedir}/resources/cgi/gsdl3site.cfg" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/> 
    1187     <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 
    1188     <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 
     1194    <copy file="${basedir}/resources/java/global.properties" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 
     1195    <copy file="${basedir}/resources/java/log4j.properties" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 
    11891196    <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool> 
    11901197      <!-- uncomment the writablehome properties -->