Changeset 32697

Timestamp:

2018-12-16T21:48:31+13:00 (5 years ago)

Author:

davidb

Message:

Updated to work with apache-tomcat-8.x

File:

• main/trunk/greenstone3/build.xml (modified) (8 diffs)

main/trunk/greenstone3/build.xml

@@ -295 +295 @@
   <!-- version properties for external packages -->
   <!-- for Java versions < 1.4, we print out the message that Java is too old.
-    For Java 1.4, we use Tomcat 5.5, for Java5 and higher, we use Tomcat 7.0-->
-  <condition property="tomcat.version" value="apache-tomcat-5.5.25" else="apache-tomcat-7.0.57"> 
+    For Java 1.4, we use Tomcat 5.5, for Java5 and higher, we use Tomcat 8.x-->
+  <condition property="tomcat.version" value="apache-tomcat-5.5.25" else="apache-tomcat-8.5.35"> 
     <equals arg1="1.4" arg2="${ant.java.version}"/>
   </condition>
-  <condition property="tomcat.version.major" value="5" else="7"> 
+  <condition property="tomcat.version.major" value="5" else="8"> 
     <equals arg1="1.4" arg2="${ant.java.version}"/>
   </condition>
   <condition property="privileged.attribute" value="privileged='true'" else=""> 
-    <equals arg1="7" arg2="${tomcat.version.major}"/>
+    <equals arg1="8" arg2="${tomcat.version.major}"/>
   </condition>
 
@@ -777 +777 @@
   
   <!-- All elements that Tomcat 7 exposes to applications -->
-  <path id="tomcat7">
+  <path id="tomcat8">
     <fileset dir="${catalina.home}/lib">
       <include name="*.jar"/>
@@ -1254 +1254 @@
     <!--
     the next block checks if the bundled tomcat is present in the 'packages' directory,
-    and checks for the lethal combination of tomcat 7 and java 1.4. Test for
+    and checks for the lethal combination of tomcat 8 and java 1.4. Test for
     tomcat6 is based on the presence of a file inserted by greenstone into the tomcat6
     download, as there is no other surefire way to check tomcat version under java 1.4
@@ -1261 +1261 @@
       <available file="packages/tomcat"/>
     </condition>
-    <condition property="packages.tomcat.istomcat7" value="true" else="false">
-      <available file="packages/tomcat/tomcat7.txt"/>
+    <condition property="packages.tomcat.istomcat8" value="true" else="false">
+      <available file="packages/tomcat/tomcat8.txt"/>
     </condition>
     <if>
@@ -1268 +1268 @@
         <and>
           <istrue value="${packages.tomcat.ispresent}"/>
-          <istrue value="${packages.tomcat.istomcat7}"/>
+          <istrue value="${packages.tomcat.istomcat8}"/>
           <equals arg1="1.4" arg2="${ant.java.version}"/>
         </and>
@@ -1303 +1303 @@
       <copy file="${basedir}/resources/tomcat/server_tomcat7.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat7.xml.in.backup"  overwrite="true"/>
     </if>
-    <copy file="${basedir}/resources/tomcat/server_tomcat7.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat7.xml.in" overwrite="true"/>
-    <if><bool><available file="${basedir}/resources/tomcat/web.xml.in"/></bool>
-      <copy file="${basedir}/resources/tomcat/web.xml.in" tofile="${basedir}/resources/tomcat/web.xml.in.backup"  overwrite="true"/>
-    </if>
-    <copy file="${basedir}/resources/tomcat/web.xml.svn" tofile="${basedir}/resources/tomcat/web.xml.in"  overwrite="true"/>
+    <copy file="${basedir}/resources/tomcat/server_tomcat8.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat8.xml.in" overwrite="true"/>
+    <if><bool><available file="${basedir}/resources/tomcat/server_tomcat8.xml.in"/></bool>
+      <copy file="${basedir}/resources/tomcat/server_tomcat8.xml.in" tofile="${basedir}/resources/tomcat/server_tomcat8.xml.in.backup"  overwrite="true"/>
+    </if>
+    <copy file="${basedir}/resources/tomcat/server_tomcat8.xml.svn" tofile="${basedir}/resources/tomcat/server_tomcat8.xml.in" overwrite="true"/>
+    <if><bool><available file="${basedir}/resources/tomcat/web8.xml.in"/></bool>
+      <copy file="${basedir}/resources/tomcat/web8.xml.in" tofile="${basedir}/resources/tomcat/web8.xml.in.backup"  overwrite="true"/>
+    </if>
+    <copy file="${basedir}/resources/tomcat/web8.xml.svn" tofile="${basedir}/resources/tomcat/web8.xml.in"  overwrite="true"/>
     <if><bool><available file="${basedir}/resources/oai/OAIConfig.xml.in"/></bool>
     <copy file="${basedir}/resources/oai/OAIConfig.xml.in" tofile="${basedir}/resources/oai/OAIConfig.xml.in.backup"  overwrite="true"/>
@@ -2258 +2262 @@
     
     <!-- set up the greenstone3 web.xml file -->
-    <copy file="${basedir}/resources/tomcat/web.xml.in" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true">
+    <copy file="${basedir}/resources/tomcat/web8.xml.in" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true">
       <filterset>
     <filter token="perlpath" value="${perl.path}"/>
@@ -4120 +4124 @@
   </target>
     
-  <target name="run-collection-tests">
+    <target name="run-collection-tests">
         <if><bool><not><available file="${basedir}/ext/testing" type="dir"/></not></bool>
             <fail>The testing extension is not available. This is required to perform the tests. It can be acquired from SVN by running the command "svn co http://svn.greenstone.org/gs3-extensions/testing/trunk/src testing" in the ext directory of your Greenstone 3 installation. </fail>