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

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

Author: richard.opalka at jboss.com
Date: 2010-05-04 04:04:06 -0400 (Tue, 04 May 2010)
New Revision: 104421

Modified:
   trunk/build/build.xml
Log:
[JBAS-7989] renaming ws-commons:policy:jar to wscommons-policy.jar in AS distro to prevent collision with com.sun.xml.ws:policy:jar

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-05-04 07:25:33 UTC (rev 104420)
+++ trunk/build/build.xml	2010-05-04 08:04:06 UTC (rev 104421)
@@ -1675,11 +1675,19 @@
       <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
       <fileset refid="org.codehaus.jettison:jettison:jar"/>
       <fileset refid="org.jboss.netty:netty:jar"/>
-      <fileset refid="ws-commons:policy:jar"/>
       <fileset refid="wsdl4j:wsdl4j:jar"/>
       <fileset refid="org.apache:xmlsec:jar"/>
       <mapper refid="remove-versions" />
     </copy>
+
+    <!-- Install wscommons-policy.jar (preventing naming collision with com.sun.xml.ws:policy:jar) -->
+    <copy todir="${install.common.lib}" filtering="no">
+      <fileset refid="ws-commons:policy:jar"/>
+      <chainedmapper>
+        <mapper refid="remove-versions" />
+        <globmapper from="*.jar" to="wscommons-*.jar"/>
+      </chainedmapper>
+    </copy>
   </target>
 
   <target name="install-jbossws-to-endorsed">
@@ -2260,7 +2268,6 @@
       <fileset refid="com.sun.xml.stream.buffer:streambuffer:jar"/>
       <fileset refid="trove:trove:jar"/>
       <fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
-      <fileset refid="ws-commons:policy:jar"/>
       <fileset refid="com.sun.xml.ws:policy:jar"/>
       <fileset refid="org.hibernate:hibernate-core:jar"/>
       <fileset refid="org.hibernate:hibernate-annotations:jar"/>
@@ -2277,7 +2284,7 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar:client"/>
-	  <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
+      <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
       <fileset refid="log4j:log4j:jar"/>
       <fileset refid="gnu-getopt:getopt:jar"/>
       <fileset refid="oswego-concurrent:concurrent:jar"/>
@@ -2297,7 +2304,7 @@
       <fileset refid="org.jboss:jbossxb:jar"/>
       <mapper refid="remove-versions" />
     </copy>
-    <!-- Install jboss-remoting 3.x as jboss-remoting-3.jar --> 
+    <!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
     <copy todir="${install.client}" filtering="no">
       <fileset refid="org.jboss.remoting3:jboss-remoting:jar"/>
       <chainedmapper>
@@ -2305,6 +2312,14 @@
         <globmapper from="*.jar" to="*-3.jar"/>
       </chainedmapper>
     </copy>
+    <!-- Install wscommons-policy.jar (preventing naming collision with com.sun.xml.ws:policy:jar) -->
+    <copy todir="${install.client}" filtering="no">
+      <fileset refid="ws-commons:policy:jar"/>
+      <chainedmapper>
+        <mapper refid="remove-versions" />
+        <globmapper from="*.jar" to="wscommons-*.jar"/>
+      </chainedmapper>
+    </copy>
 
     <!-- Copy thirdparty code to lib/endorsed -->
     <mkdir dir="${install.lib}/endorsed"/>