Changeset 20233 for greenstone3

Timestamp:

2009-08-12T13:25:22+12:00 (15 years ago)

Author:

oranfry

Message:

• build.xml: fail if user tries to combine tomcat6 and java1.4
• gs3-setup.sh: if search4j not present, warn they may need java 1.5

Location:

greenstone3/trunk

Files:

• build.xml (modified) (1 diff)
• gs3-setup.sh (modified) (2 diffs)

greenstone3/trunk/build.xml

@@ -85 +85 @@
     <equals arg1="1.4" arg2="${ant.java.version}"/>
   </condition>
+
+  <!--
+    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
+  -->
+  <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" 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>
+
+  <if>
+    <bool>
+      <and>
+        <istrue value="${packages.tomcat.ispresent}"/>
+        <equals arg1="${packages.tomcat.detected.version}" arg2="6"/>
+        <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>
+  </if>
+
+
   <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/>
   <property name="axis.dir.version" value="axis-1_2_1"/>

greenstone3/trunk/gs3-setup.sh

@@ -90 +90 @@
  
   #CLASSPATH
+  addtopath CLASSPATH "."
   addtopath CLASSPATH "$GSDL3HOME/WEB-INF/classes"
   addtopath CLASSPATH "$GSDL3SRCHOME/resources/java"
@@ -164 +165 @@
   elif [ "$JAVA_HOME" != "" ] && [ "`which java`" == "$JAVA_HOME/bin/java" ]; then
     echo "  - Using java at $JAVA_HOME"
+    echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+    echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+    echo "             (SVN users may still use java 1.4)"
   elif [ "$JRE_HOME" != "" ] && [ "`which java`" == "$JRE_HOME/bin/java" ]; then
     echo "  - Using java at $JRE_HOME"
+    echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+    echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+    echo "             (SVN users may still use java 1.4)"
+
   #failing all that, print a warning
   else