Changeset 28907 for main

Timestamp:

2014-03-17T12:16:01+13:00 (10 years ago)

Author:

kjdon

Message:

moved gsdl3site.cfg.in file to resources/cgi. On prepare it's copied to resources/cgi/gsdl3site.cfg, then on tomcat start its copied with filtering to web/WEB_INF/cgi

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (2 diffs)
• resources/cgi (added)
• resources/cgi/gsdl3site.cfg.in (moved) (moved from main/trunk/greenstone3/web/WEB-INF/cgi/gsdl3site.cfg.in )

main/trunk/greenstone3/build.xml

@@ -951 +951 @@
     </if>
     <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig.xml"  overwrite="true"/>
+    <if><bool><available file="${basedir}/resources/cgi/gsdl3site.cfg"/></bool>
+      <copy file="${basedir}/resources/cgi/gsdl3site.cfg" tofile="${basedir}/resources/cgi/gsdl3site.cfg.backup" overwrite="true"/>
+    </if>
+    <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${basedir}/resources/cgi/gsdl3site.cfg" overwrite="true"/>
 
   </target>
@@ -1180 +1184 @@
     <filter token="perlpath" value="${escaped.perl.path}"/>
     <filter token="disable.collection.building" value="${disable.collection.building}"/>
-    <copy file="${web.home}/WEB-INF/cgi/gsdl3site.cfg.in" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/>
-
+    <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.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/>
     <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/>