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

[michi at wyona.com]

Author: michi
Date: 2009-02-20 09:21:21 +0100 (Fri, 20 Feb 2009)
New Revision: 41655

Modified:
   public/yanel/trunk/src/build/targets/webapp/webapp.xml
Log:
duplicated libs refactored

Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-02-20 08:21:07 UTC (rev 41654)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-02-20 08:21:21 UTC (rev 41655)
@@ -214,15 +214,13 @@
     </xslt>
   </target>
 
-  <target name="remove-ambiguous-libs">
-    <echo>INFO: Remove ambiguous libs</echo>
+  <target name="remove-ambiguous-libs" depends="init">
+    <echo>INFO: Remove ambiguous libs (${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/): ${duplicated.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"/>
+    <delete>
+      <fileset dir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/" includes="${duplicated.libs}"/>
+    </delete>
 
     <!-- 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"/>