[jboss-cvs] JBossAS SVN: r91913 - in trunk: tomcat and 1 other directory.

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

Author: pgier
Date: 2009-08-01 17:47:17 -0400 (Sat, 01 Aug 2009)
New Revision: 91913

Modified:
   trunk/server/pom.xml
   trunk/tomcat/pom.xml
Log:
[JBBUILD-539] Fix jar copy so that version number is not included in jar name.

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2009-08-01 19:24:57 UTC (rev 91912)
+++ trunk/server/pom.xml	2009-08-01 21:47:17 UTC (rev 91913)
@@ -223,10 +223,10 @@
                 </copy>
 
                 <!-- copy the service binding manager jars to their deployment --> 
-                <copy todir="target/etc/conf/all/bindingservice.beans">
-                  <fileset file="${maven.dependency.org.jboss.service.binding.jboss-service-binding-core.jar.path}"/>
-                  <fileset file="${maven.dependency.org.jboss.service.binding.jboss-service-binding-mgmt.jar.path}"/>
-                </copy>
+                <copy file="${maven.dependency.org.jboss.service.binding.jboss-service-binding-core.jar.path}"
+                      tofile="target/etc/conf/all/bindingservice.beans/jboss-service-binding-core.jar"/>
+                <copy file="${maven.dependency.org.jboss.service.binding.jboss-service-binding-mgmt.jar.path}"
+                      tofile="target/etc/conf/all/bindingservice.beans/jboss-service-binding-mgmt.jar"/>
             
                 <!-- SQLException Processor -->
                 <copy todir="target"

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2009-08-01 19:24:57 UTC (rev 91912)
+++ trunk/tomcat/pom.xml	2009-08-01 21:47:17 UTC (rev 91913)
@@ -112,12 +112,12 @@
                   todir="${output.deploy}/jbossweb.sar"/>
                 <copy file="${output.resources}/server.xml"
                   tofile="${output.deploy}/jbossweb.sar/server.xml"/>
-                <copy todir="${output.deploy}/jbossweb.sar">
-                  <fileset file="${maven.dependency.jboss.web.jasper-jdt.jar.path}"/>
-                  <fileset file="${maven.dependency.jboss.web.jbossweb.jar.path}"/>
-                </copy>
-                <copy todir="${output.deploy}/jbossweb.sar"
-                   file="${maven.dependency.javax.servlet.jstl.jar.path}" />        
+                <copy file="${maven.dependency.jboss.web.jasper-jdt.jar.path}"
+                  tofile="${output.deploy}/jbossweb.sar/jasper-jdt.jar"/>
+                <copy file="${maven.dependency.jboss.web.jbossweb.jar.path}"
+                  tofile="${output.deploy}/jbossweb.sar/jbossweb.jar"/>
+                <copy file="${maven.dependency.javax.servlet.jstl.jar.path}"
+                  tofile="${output.deploy}/jbossweb.sar/jstl.jar"/>        
                 <mkdir dir="${output.deploy}/jbossweb.sar/jsf-libs"/>
                 <copy todir="${output.deploy}/jbossweb.sar/jsf-libs">        
                   <fileset file="${maven.dependency.javax.faces.jsf-api.jar.path}"/>