[Yanel-commits] rev 31144 - public/yanel/trunk/src/build

[michi at wyona.com]

Author: michi
Date: 2008-02-02 22:03:20 +0100 (Sat, 02 Feb 2008)
New Revision: 31144

Modified:
   public/yanel/trunk/src/build/build.xml
Log:
also copy xalan into endorsed lib dir

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2008-02-02 20:49:18 UTC (rev 31143)
+++ public/yanel/trunk/src/build/build.xml	2008-02-02 21:03:20 UTC (rev 31144)
@@ -649,6 +649,13 @@
     </condition>
     <antcall target="ask-to-copy-endorsed-xml-apis-to-node1"/>
     
+    <condition property="endorsed-xalan-at-node1-does-not-exist-yet">
+      <not>
+        <available file="${tomcat1.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar"/>
+      </not>
+    </condition>
+    <antcall target="ask-to-copy-endorsed-xalan-to-node1"/>
+    
   </target>
   
   <target name="patch-tomcat-cluster-node-1-ssl-port" if="property-tomcat1-ssl-port-is-set">
@@ -702,6 +709,13 @@
       </not>
     </condition>
     <antcall target="ask-to-copy-endorsed-xml-apis-node2"/>
+
+    <condition property="endorsed-xalan-at-node2-does-not-exist-yet">
+      <not>
+        <available file="${tomcat2.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar"/>
+      </not>
+    </condition>
+    <antcall target="ask-to-copy-endorsed-xalan-to-node2"/>
   </target>
 
   <target name="ask-to-copy-endorsed-xerces-to-node1" if="endorsed-xerces-at-node1-does-not-exist-yet">
@@ -721,6 +735,24 @@
     </condition>
     <antcall target="do-copy-endorsed-xml-apis-to-node1"/>
   </target>
+
+  <target name="ask-to-copy-endorsed-xalan-to-node1" if="endorsed-xalan-at-node1-does-not-exist-yet">
+    <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xalan library at '${tomcat1.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
+    <input message="Endorsed lib is missing (${tomcat1.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
+    <condition property="do-not-copy-endorsed-xalan-to-node1">
+      <equals arg1="no" arg2="${answer}"/>
+    </condition>
+    <antcall target="do-copy-endorsed-xalan-to-node1"/>
+  </target>
+
+  <target name="ask-to-copy-endorsed-xalan-to-node2" if="endorsed-xalan-at-node2-does-not-exist-yet">
+    <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xalan library at '${tomcat2.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>
+    <input message="Endorsed lib is missing (${tomcat2.home.dir}/common/endorsed/${xalan.artifactId}-${xalan.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
+    <condition property="do-not-copy-endorsed-xalan-to-node2">
+      <equals arg1="no" arg2="${answer}"/>
+    </condition>
+    <antcall target="do-copy-endorsed-xalan-to-node2"/>
+  </target>
   
   <target name="do-copy-endorsed-xerces-to-node1" unless="do-not-copy-endorsed-xerces-to-node1">
     <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xerces.impl.artifactId}-${xerces.impl.version}.jar" todir="${tomcat1.home.dir}/common/endorsed" overwrite="false"/>
@@ -729,6 +761,14 @@
   <target name="do-copy-endorsed-xml-apis-to-node1" unless="do-not-copy-endorsed-xml-apis-to-node1">
     <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xml.apis.artifactId}-${xml.apis.version}.jar" todir="${tomcat1.home.dir}/common/endorsed" overwrite="false"/>
   </target>
+  
+  <target name="do-copy-endorsed-xalan-to-node1" unless="do-not-copy-endorsed-xalan-to-node1">
+    <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xalan.artifactId}-${xalan.version}.jar" todir="${tomcat1.home.dir}/common/endorsed" overwrite="false"/>
+  </target>
+  
+  <target name="do-copy-endorsed-xalan-to-node2" unless="do-not-copy-endorsed-xalan-to-node2">
+    <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xalan.artifactId}-${xalan.version}.jar" todir="${tomcat2.home.dir}/common/endorsed" overwrite="false"/>
+  </target>
 
   <target name="ask-to-copy-endorsed-xerces-node2" if="endorsed-xerces-at-node2-does-not-exist-yet">
     <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xerces library at '${tomcat2.home.dir}/common/endorsed/'. Please make sure to resolve any conflicts!</echo>