[jboss-cvs] JBossAS SVN: r109458 - in trunk: component-matrix and 1 other directories.

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

Author: pgier
Date: 2010-11-24 13:59:51 -0500 (Wed, 24 Nov 2010)
New Revision: 109458

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/depchain/pom.xml
Log:
[JBAS-8422] Remove use of ws-commons:policy because it has been replaced by Apache neethi

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-11-24 18:31:45 UTC (rev 109457)
+++ trunk/build/build.xml	2010-11-24 18:59:51 UTC (rev 109458)
@@ -1680,15 +1680,6 @@
       <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">
@@ -2460,14 +2451,6 @@
         <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"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-11-24 18:31:45 UTC (rev 109457)
+++ trunk/component-matrix/pom.xml	2010-11-24 18:59:51 UTC (rev 109458)
@@ -1482,6 +1482,10 @@
             <groupId>org.apache.ws.policy</groupId>
             <artifactId>wscommons-policy</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ws-commons</groupId>
+            <artifactId>policy</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       
@@ -3878,12 +3882,6 @@
       </dependency>
       
       <dependency>
-        <groupId>ws-commons</groupId>
-        <artifactId>policy</artifactId>
-        <version>1.0</version>
-      </dependency>
-      
-      <dependency>
         <groupId>wutka-dtdparser</groupId>
         <artifactId>dtdparser</artifactId>
         <version>1.21-brew</version>
@@ -4081,6 +4079,7 @@
                         <exclude>org.jboss.reloaded:jboss-reloaded-naming-deployers</exclude>
                         <exclude>quartz:quartz</exclude>
                         <exclude>jgroups:jgroups</exclude>
+                        <exclude>ws-commons:policy</exclude>
                       </excludes>
                       <includes>
                         <include>javax.xml.bind:jaxb-api:jar:2.1</include>

Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml	2010-11-24 18:31:45 UTC (rev 109457)
+++ trunk/depchain/pom.xml	2010-11-24 18:59:51 UTC (rev 109458)
@@ -1172,10 +1172,6 @@
       <artifactId>streambuffer</artifactId>
     </dependency>
     <dependency>
-      <groupId>ws-commons</groupId>
-      <artifactId>policy</artifactId>
-    </dependency>
-    <dependency>
       <groupId>com.sun.xml.ws</groupId>
       <artifactId>policy</artifactId>
     </dependency>