Changeset 20290

Timestamp:

2009-08-17T10:02:26+12:00 (15 years ago)

Author:

oranfry

Message:

simplified the check for tomcat6

File:

• greenstone3/trunk/build.xml (modified) (1 diff)

greenstone3/trunk/build.xml

@@ -488 +488 @@
 
     <!--
-      the next block checks if tomcat is present in the 'packages' directory, and if so, figures
-      out its major version number (5, 6, etc.)
-      then it checks if your java is new enough to run that tomcat and if not fails with an explanation
+    the next block checks if the bundled tomcat is present in the 'packages' directory,
+    and checks for the lethal combination of tomcat 6 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
     -->
     <condition property="packages.tomcat.ispresent" value="true" else="false">
       <available file="packages/tomcat"/>
     </condition>
-
-    <if><bool><istrue value="${packages.tomcat.ispresent}"/></bool>
-      <exec os="${os.unix}" outputproperty="packages.tomcat.detected.version" errorproperty="packages.tomcat.detection.errors" dir="packages/tomcat/bin" executable="sh">
-        <arg value="-c"/>
-        <arg value="./catalina.sh version | grep '^Server version: ' | sed 's@[^0-9]*\([0-9]\).*@\1@g'"/>
-      </exec>
-      <!--
-      totally untested, so commented out for now
-      <exec os="${os.windows}" outputproperty="packages.tomcat.detected.version" dir="packages/tomcat/bin" executable="cmd.exe">
-        <arg value="/c"/>
-        <arg value="catalina.bat version | grep '^Server version: ' | sed 's@[^0-9]*\([0-9]\).*@\1@g'"/>
-      </exec>
-      -->
-      <property name="packages.tomcat.detected.version" value="unknown"/>
-    </if>
-
-    <echo>packages.tomcat.ispresent: ${packages.tomcat.ispresent}</echo>
-    <echo>packages.tomcat.detected.version: ${packages.tomcat.detected.version}</echo>
-    <echo>packages.tomcat.detection.error: ${packages.tomcat.detection.errors}</echo>
-
-
+    <condition property="packages.tomcat.istomcat6" value="true" else="false">
+      <available file="packages/tomcat/tomcat6.txt"/>
+    </condition>
     <if>
       <bool>
-        <or>
-          <and>
-            <istrue value="${packages.tomcat.ispresent}"/>
-            <equals arg1="${packages.tomcat.detected.version}" arg2="6"/>
-            <equals arg1="1.4" arg2="${ant.java.version}"/>
-          </and>
-          <and>
-            <isset property="packages.tomcat.detection.errors"/>
-            <not><equals arg1="${packages.tomcat.detection.errors}" arg2=""/></not>
-         </and>
-        </or>
+        <and>
+          <istrue value="${packages.tomcat.ispresent}"/>
+          <istrue value="${packages.tomcat.istomcat6}"/>
+          <equals arg1="1.4" arg2="${ant.java.version}"/>
+        </and>
       </bool>
-      <fail>Your java version (1.4) is too old to work with the bundled version of Apache Tomcat. Please upgrade your java to version 1.5 or greater. Alternatively, you may remove the bundled Apache Tomcat from the 'packages' folder and then run 'ant prepare-tomcat'.</fail>
+      <fail>Your Java (version 1.4) is too old to work with the bundled Apache Tomcat (version 6). Please upgrade to Java version 1.5 or greater. Alternatively, you may remove the bundled Apache Tomcat from the 'packages' folder and then run 'ant prepare-tomcat'.</fail>
     </if>