Changeset 25570

Timestamp:

2012-05-10T16:56:37+12:00 (12 years ago)

Author:

sjm84

Message:

CGI capabilities are now on by default. The build.xml file will insert the necessary perl path into the web.xml file

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (4 diffs)
• resources/tomcat/web.xml (added)

main/trunk/greenstone3/build.xml

@@ -912 +912 @@
     <filter token="tomcat.port" value="${tomcat.port}"/>
     <filter token="perlpath" value="${escaped.perl.path}"/>
+    <filter token="disable.collection.building" value="${disable.collection.building}"/>
     <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/>
     <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.classes}/log4j.properties" filtering="true" overwrite="true"/>
@@ -1035 +1036 @@
   <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/>
   
-  <target name="configure-tomcat-local" depends="init" if="tomcat.islocal">
+  <target name="configure-tomcat-local" depends="init,perl-for-building" if="tomcat.islocal">
     <!-- re-setup the server.xml file -->
     <copy file="${basedir}/resources/tomcat/server_tomcat${tomcat.version.major}.xml"
@@ -1051 +1052 @@
       </filterset>
     </copy>
+    
+    <!-- set up the greenstone3 web.xml file -->
+    <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true">
+        <filterset>
+            <filter token="perlpath" value="${perl.path}"/>
+        </filterset>
+    </copy>
   </target>
 
@@ -1976 +1984 @@
       <arg value="export"/>
       <arg value="-r"/><arg value="${branch.revision}"/>
-      <arg value="${svn.root}/main/${branch.path}/greenstone2/cgi-bin/gliserver.pl"/>
+      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gliserver.pl"/>
     </exec>
     <exec executable="svn" dir="web/WEB-INF/cgi">
       <arg value="export"/>
       <arg value="-r"/><arg value="${branch.revision}"/>
-      <arg value="${svn.root}/main/${branch.path}/greenstone2/cgi-bin/gsdlCGI.pm"/>
+      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gsdlCGI.pm"/>
     </exec>