[jboss-cvs] JBossAS SVN: r67385 - trunk/build.

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2007-11-22 16:38:56 -0500 (Thu, 22 Nov 2007)
New Revision: 67385

Modified:
   trunk/build/build-distr.xml
Log:
Do not duplicate el-api.jar, jsp-api.jar and servlet-api.jar in the web.deployer directory. Store one copy in server/default|all/lib and use the original name (like in 4.2.x)

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-11-22 21:38:42 UTC (rev 67384)
+++ trunk/build/build-distr.xml	2007-11-22 21:38:56 UTC (rev 67385)
@@ -1286,9 +1286,13 @@
 
     <!-- Copy the thirdparty libraries -->
     <mkdir dir="${install.all.lib}"/>
-    <copy tofile="${install.all.lib}/javax.servlet.jar" file="${jboss.web.lib}/servlet-api.jar"/>
-    <copy tofile="${install.all.lib}/javax.servlet.jsp.jar" file="${jboss.web.lib}/jsp-api.jar"/>
-    <copy tofile="${install.all.lib}/javax.el.jar" file="${jboss.web.lib}/el-api.jar"/>
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${jboss.web.lib}">
+        <include name="el-api.jar"/>
+        <include name="jsp-api.jar"/>
+        <include name="servlet-api.jar"/>
+      </fileset>
+    </copy>
 
     <!-- Copy the deployables -->
     <mkdir dir="${install.server}/all/deployers/jbossweb.deployer"/>
@@ -1300,7 +1304,7 @@
       file="${project.root}/${_module.name}/src/resources/war-deployers-all-beans.xml" overwrite="true"/>
 
     <!-- Copy the ROOT.war -->
-    <copy todir="${install.server}/all/deploy">
+    <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/deploy">
         <include name="ROOT.war/**"/>
       </fileset>