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

[michi at wyona.com]

Author: michi
Date: 2008-10-24 15:24:43 +0200 (Fri, 24 Oct 2008)
New Revision: 39511

Modified:
   public/yanel/trunk/src/build/targets/webapp/cluster.xml
   public/yanel/trunk/src/build/targets/webapp/webapp.xml
Log:
deleting of ambiguous libs moved one level up

Modified: public/yanel/trunk/src/build/targets/webapp/cluster.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/cluster.xml	2008-10-24 12:52:32 UTC (rev 39510)
+++ public/yanel/trunk/src/build/targets/webapp/cluster.xml	2008-10-24 13:24:43 UTC (rev 39511)
@@ -20,9 +20,11 @@
 
     <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>
@@ -47,22 +49,22 @@
     
   </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>

Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml	2008-10-24 12:52:32 UTC (rev 39510)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml	2008-10-24 13:24:43 UTC (rev 39511)
@@ -135,6 +135,8 @@
     <ant antfile="${yanel.source.home}/build/build-resource-types.xml" target="copy-resources-dependencies"/>
 
     <antcall target="deploy-libs-of-realms"/>
+
+    <antcall target="remove-ambiguous-libs"/>
   </target>
 
   <target name="war" description="Build war file" depends="init, webapp">
@@ -209,6 +211,22 @@
       <param name="yanel.version" expression="${yanel.version}"/>
     </xslt>
   </target>
-  
 
+  <target name="remove-ambiguous-libs">
+    <echo>INFO: Remove ambiguous libs</echo>
+
+    <!-- TODO: The dependency manager should resolve these ambiguities! -->
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/commons-lang-2.1.jar"/>
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/xalan-2.6.0.jar"/>
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/xercesImpl-2.8.1.jar"/>
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/icu4j-2.6.1.jar"/>
+    <delete file="${build.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="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-cmdl.xml"/>
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-core.xml"/>
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-impl.xml"/>
+    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-webapp.xml"/>
+  </target>
+
 </project>