[Yanel-commits] rev 39510 - public/yanel/trunk/src/build/targets/webapp

[michi at wyona.com]

Author: michi
Date: 2008-10-24 14:52:32 +0200 (Fri, 24 Oct 2008)
New Revision: 39510

Modified:
   public/yanel/trunk/src/build/targets/webapp/cluster.xml
Log:
quick-fix added

Modified: public/yanel/trunk/src/build/targets/webapp/cluster.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/cluster.xml	2008-10-23 21:12:12 UTC (rev 39509)
+++ public/yanel/trunk/src/build/targets/webapp/cluster.xml	2008-10-24 12:52:32 UTC (rev 39510)
@@ -19,6 +19,10 @@
     <touch file="${log4j.path}/log4j-cnode1.log"/>
 
     <antcall target="patch-tomcat-cluster-node-1-ssl-port"/>
+
+    <antcall target="remove-ambiguous-libs-from-tomcat-cluster-node">
+      <param name="tomcat-cluster-node-home-dir" value="${tomcat1.home.dir}/"/>
+    </antcall>
     
     <condition property="endorsed-xerces-at-node1-does-not-exist-yet">
       <not>
@@ -42,9 +46,26 @@
     <antcall target="ask-to-copy-endorsed-xalan-to-node1"/>
     
   </target>
+
+  <target name="remove-ambiguous-libs-from-tomcat-cluster-node">
+    <echo>INFO: Remove ambiguous libs from Tomcat cluster node: ${tomcat-cluster-node-home-dir}</echo>
+
+    <!-- TODO: The dependency manager should resolve these ambiguities! -->
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/commons-lang-2.1.jar"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/xalan-2.6.0.jar"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/xercesImpl-2.8.1.jar"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/icu4j-2.6.1.jar"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/jaxen-1.1-beta-10.jar"/>
+
+    <!-- TODO: The following should not be copied in the first place -->
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-cmdl.xml"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-core.xml"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-impl.xml"/>
+    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-webapp.xml"/>
+  </target>
   
   <target name="patch-tomcat-cluster-node-1-ssl-port" if="property-tomcat1-ssl-port-is-set">
-    <echo>ssl port for tomcat is set</echo>
+    <echo>SSL port for tomcat is set</echo>
     <xslt in="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml"
           out="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml.tmp"
           style="add-ssl-port.xsl">
@@ -303,4 +324,4 @@
     <move file="${tomcat2.home.dir}/conf/server.xml.ssl" tofile="${tomcat2.home.dir}/conf/server.xml"/>
   </target>
 
-</project>
\ No newline at end of file
+</project>