Changeset 28937 for main

Timestamp:

2014-03-20T11:00:27+13:00 (10 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:

• build.xml (modified) (2 diffs)
• resources/web (added)
• resources/web/global.properties.in (moved) (moved from main/trunk/greenstone3/resources/java/global.properties.in )
• resources/web/log4j.properties.in (moved) (moved from main/trunk/greenstone3/resources/java/log4j.properties.in )
• src/java/org/greenstone/server/Server3.java (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -955 +955 @@
     </if>
     <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg" overwrite="true"/>
-    <if><bool><available file="${basedir}/resources/java/global.properties"/></bool>
-    <copy file="${basedir}/resources/java/global.properties" tofile="${basedir}/resources/java/global.properties.backup" overwrite="true"/>
-    </if>
-    <copy file="${basedir}/resources/java/global.properties.in" tofile="${basedir}/resources/java/global.properties" overwrite="true"/>
-    <if><bool><available file="${basedir}/resources/java/log4j.properties"/></bool>
-    <copy file="${basedir}/resources/java/log4j.properties" tofile="${basedir}/resources/java/log4j.properties.backup" overwrite="true"/>
-    </if>
-    <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${basedir}/resources/java/log4j.properties" overwrite="true"/>
+    <if><bool><available file="${basedir}/resources/web/global.properties"/></bool>
+    <copy file="${basedir}/resources/web/global.properties" tofile="${basedir}/resources/web/global.properties.backup" overwrite="true"/>
+    </if>
+    <copy file="${basedir}/resources/web/global.properties.in" tofile="${basedir}/resources/web/global.properties" overwrite="true"/>
+    <if><bool><available file="${basedir}/resources/web/log4j.properties"/></bool>
+    <copy file="${basedir}/resources/web/log4j.properties" tofile="${basedir}/resources/web/log4j.properties.backup" overwrite="true"/>
+    </if>
+    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${basedir}/resources/web/log4j.properties" overwrite="true"/>
   </target>
   <!-- ========== Web app Targets ================================ -->
@@ -1192 +1192 @@
     <filter token="disable.collection.building" value="${disable.collection.building}"/>
     <copy file="${basedir}/resources/cgi/gsdl3site.cfg" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/>
-    <copy file="${basedir}/resources/java/global.properties" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/>
-    <copy file="${basedir}/resources/java/log4j.properties" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/resources/web/global.properties" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/resources/web/log4j.properties" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/>
     <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool>
       <!-- uncomment the writablehome properties -->

main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

@@ -100 +100 @@
     File propsFile = new File(propsFolder+"log4j.properties");
 
-    // create it from the template file GS3/resources/java/log4j.properties.in
+    // create it from the template file GS3/resources/web/log4j.properties
     // Always do this => helps make Greenstone3 portable
 
@@ -109 +109 @@
         
         // load the template log4j.properties.in file into logProps
-        FileInputStream infile = new FileInputStream(new File(gsdl_home+File.separator+"resources"+File.separator+"java"+File.separator+"log4j.properties.in"));
+        FileInputStream infile = new FileInputStream(new File(gsdl_home+File.separator+"resources"+File.separator+"web"+File.separator+"log4j.properties"));
         if(infile != null) {
             Properties logProps = new Properties();