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

[michi at wyona.com]

Author: michi
Date: 2008-01-28 10:57:13 +0100 (Mon, 28 Jan 2008)
New Revision: 30846

Modified:
   public/yanel/trunk/src/build/build.xml
Log:
targets renamed to make things clearer

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2008-01-28 09:54:54 UTC (rev 30845)
+++ public/yanel/trunk/src/build/build.xml	2008-01-28 09:57:13 UTC (rev 30846)
@@ -621,7 +621,7 @@
 
     <antcall target="patch-tomcat-cluster-node-1-ssl-port"/>
     
-    <condition property="ask-to-copy-endorsed-xerces-to-node1">
+    <condition property="endorsed-xerces-at-node1-does-not-exist-yet">
       <not>
         <available file="${tomcat1.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar"/>
       </not>
@@ -675,7 +675,7 @@
 
     <antcall target="patch-tomcat-cluster-node-2-ssl-port"/>
 
-    <condition property="ask-to-copy-endorsed-xerces-node2">
+    <condition property="endorsed-xerces-at-node2-does-not-exist-yet">
       <not>
         <available file="${tomcat2.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar"/>
       </not>
@@ -690,7 +690,7 @@
     <antcall target="ask-to-copy-endorsed-xml-apis-node2"/>
   </target>
 
-  <target name="ask-to-copy-endorsed-xerces-to-node1" if="ask-to-copy-endorsed-xerces-to-node1">
+  <target name="ask-to-copy-endorsed-xerces-to-node1" if="endorsed-xerces-at-node1-does-not-exist-yet">
     <echo>IMPORTANT: Please note that your Tomcat might already contain an endorsed xerces 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/${xerces.impl.artifactId}-${xerces.impl.version}.jar). Do you want it to be added? (YES/no):" addproperty="answer"/>
     <condition property="do-not-copy-endorsed-xerces-to-node1">
@@ -716,7 +716,7 @@
     <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="ask-to-copy-endorsed-xerces-node2" if="ask-to-copy-endorsed-xerces-node2">
+  <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>
     <input message="Endorsed lib is missing (${tomcat2.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar). Do you want it to be added? (yes/NO):" addproperty="answer"/>
     <condition property="yes-do-copy-endorsed-xerces-node2">
@@ -727,6 +727,7 @@
   
   <target name="do-copy-endorsed-xerces-node2" if="yes-do-copy-endorsed-xerces-node2">
     <copy file="${yanel.home.dir}/build/webapps/${servlet.context.prefix}/WEB-INF/lib/${xerces.impl.artifactId}-${xerces.impl.version}.jar" todir="${tomcat2.home.dir}/common/endorsed" overwrite="false"/>
+    <echo>INFO: ${xerces.impl.artifactId}-${xerces.impl.version}.jar has been copied</echo>
   </target>
 
   <target name="ask-to-copy-endorsed-xml-apis-node2" if="ask-to-copy-endorsed-xml-apis-node2">