Changeset 13814

Timestamp:

2007-01-26T11:20:30+13:00 (17 years ago)

Author:

kjdon

Message:

added in some targets for changing the java version that the installation has been set up for - a few jar files need to be there for 1.5 and not 1.4, tomcat needs a compat package for 1.4 but not 1.5

File:

• trunk/gsdl3/build.xml (modified) (2 diffs)

trunk/gsdl3/build.xml

@@ -408 +408 @@
       <equals arg1="1.5" arg2="${ant.java.version}"/>
     </condition>
-    <antcall target="rename-xml-jars"/>
-  </target>
-  
-  <target name="rename-xml-jars" if="need.xml.jars">
+    <antcall target="activate-xml-jars"/>
+    <antcall target="deactivate-xml-jars"/>
+  </target>
+  
+  <target name="update-java-version" depends="init"
+    description="Run this target if you have changed the default version of java since installing greenstone3">
+    <condition property="need.xml.jars">
+      <equals arg1="1.5" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="activate-xml-jars"/>
+    <antcall target="deactivate-xml-jars"/>
+    <condition property="need.tomcat.compat">
+      <equals arg1="1.4" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="install-tomcat-compat"/>
+    <antcall target="uninstall-tomcat-compat"/>
+  </target>
+  
+  <target name="activate-xml-jars" if="need.xml.jars">
     <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
     <copy file="${web.lib}/xercesImpl.jar.tmp" tofile="${web.lib}/xercesImpl.jar"/>
+  </target>
+  
+  <target name="deactivate-xml-jars" unless="need.xml.jars">
+    <delete file="${web.lib}/xalan.jar"/>
+    <delete file="${web.lib}/xercesImpl.jar"/>
   </target>
 
@@ -539 +559 @@
     <copy file="${packages.home}/tomcat-compat/bin/jmx.jar"
       tofile="${packages.home}/tomcat/bin/jmx.jar"/>
+  </target>
+  <target name="uninstall-tomcat-compat" unless="need.tomcat.compat">
+    <delete file="${web.applet}/xml-apis.jar"/>
+    <delete file="${packages.home}/tomcat/common/endorsed/xml-apis.jar"/>    
+    <delete file="${web.applet}/xercesImpl.jar"/>
+    <delete file="${packages.home}/tomcat/common/endorsed/xercesImpl.jar"/>
+    <delete file="${packages.home}/tomcat/bin/jmx.jar"/>
   </target>