Changeset 28937

Show
Ignore:
Timestamp:
20.03.2014 11:00:27 (6 years ago)
Author:
kjdon
Message:

moved global.properties.in and log4j.properties.in to resources/web - they didn't really fit in with the other things in the old java folder, which are used from this place by java apps. These are copied and filtered into the web folder.

Location:
main/trunk/greenstone3
Files:
1 added
2 modified
2 moved

Legend:

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

    r28908 r28937  
    955955    </if> 
    956956    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg" overwrite="true"/> 
    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"/> 
     957    <if><bool><available file="${basedir}/resources/web/global.properties"/></bool> 
     958    <copy file="${basedir}/resources/web/global.properties" tofile="${basedir}/resources/web/global.properties.backup" overwrite="true"/> 
     959    </if> 
     960    <copy file="${basedir}/resources/web/global.properties.in" tofile="${basedir}/resources/web/global.properties" overwrite="true"/> 
     961    <if><bool><available file="${basedir}/resources/web/log4j.properties"/></bool> 
     962    <copy file="${basedir}/resources/web/log4j.properties" tofile="${basedir}/resources/web/log4j.properties.backup" overwrite="true"/> 
     963    </if> 
     964    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${basedir}/resources/web/log4j.properties" overwrite="true"/> 
    965965  </target> 
    966966  <!-- ========== Web app Targets ================================ --> 
     
    11921192    <filter token="disable.collection.building" value="${disable.collection.building}"/> 
    11931193    <copy file="${basedir}/resources/cgi/gsdl3site.cfg" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" 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"/> 
     1194    <copy file="${basedir}/resources/web/global.properties" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/> 
     1195    <copy file="${basedir}/resources/web/log4j.properties" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/> 
    11961196    <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool> 
    11971197      <!-- uncomment the writablehome properties --> 
  • main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

    r27836 r28937  
    100100    File propsFile = new File(propsFolder+"log4j.properties"); 
    101101 
    102     // create it from the template file GS3/resources/java/log4j.properties.in 
     102    // create it from the template file GS3/resources/web/log4j.properties 
    103103    // Always do this => helps make Greenstone3 portable 
    104104 
     
    109109         
    110110        // load the template log4j.properties.in file into logProps 
    111         FileInputStream infile = new FileInputStream(new File(gsdl_home+File.separator+"resources"+File.separator+"java"+File.separator+"log4j.properties.in")); 
     111        FileInputStream infile = new FileInputStream(new File(gsdl_home+File.separator+"resources"+File.separator+"web"+File.separator+"log4j.properties")); 
    112112        if(infile != null) { 
    113113            Properties logProps = new Properties();