[jbossws-commits] JBossWS SVN: r12997 - in stack/cxf/trunk: modules/client and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2010-09-20 12:58:46 -0400 (Mon, 20 Sep 2010)
New Revision: 12997

Modified:
   stack/cxf/trunk/modules/client/pom.xml
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/pom.xml
   stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2928] Using org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec artifact


Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml	2010-09-20 15:48:25 UTC (rev 12996)
+++ stack/cxf/trunk/modules/client/pom.xml	2010-09-20 16:58:46 UTC (rev 12997)
@@ -185,8 +185,8 @@
     http://jira.codehaus.org/browse/MASSEMBLY-317
     -->
     <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
+      <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+      <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
     </dependency>
     
     <dependency>

Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml	2010-09-20 15:48:25 UTC (rev 12996)
+++ stack/cxf/trunk/modules/server/pom.xml	2010-09-20 16:58:46 UTC (rev 12997)
@@ -138,8 +138,8 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
+      <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+      <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>stax</groupId>

Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml	2010-09-20 15:48:25 UTC (rev 12996)
+++ stack/cxf/trunk/pom.xml	2010-09-20 16:58:46 UTC (rev 12997)
@@ -71,7 +71,7 @@
     <jaxws-httpserver-httpspi.version>1.0.0-SNAPSHOT</jaxws-httpserver-httpspi.version>
     <jaxb.api.version>1.0.0.Beta1</jaxb.api.version>
     <jaxb.impl.version>2.2</jaxb.impl.version>
-    <jaxrpc.api.version>1.1</jaxrpc.api.version>
+    <jaxrpc.api.version>1.0.0.Beta1</jaxrpc.api.version>
     <jaxws.api.version>1.0.0.Beta1</jaxws.api.version>
     <jboss.jaxr.version>2.0.1</jboss.jaxr.version>
     <jsr181.api.version>1.0-MR1</jsr181.api.version>
@@ -937,8 +937,8 @@
       </dependency>
 
       <dependency>
-        <groupId>javax.xml</groupId>
-        <artifactId>jaxrpc-api</artifactId>
+        <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+        <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
         <version>${jaxrpc.api.version}</version>
       </dependency>
       <dependency>

Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2010-09-20 15:48:25 UTC (rev 12996)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2010-09-20 16:58:46 UTC (rev 12997)
@@ -29,7 +29,6 @@
               <include>org.apache.cxf.xjcplugins:cxf-*</include>
               <include>com.sun.xml.bind:jaxb-impl:jar</include>
               <include>com.sun.xml.bind:jaxb-xjc:jar</include>
-              <include>javax.xml:jaxrpc-api:jar</include>
               <include>org.jboss.ws:jbossws-common:jar</include>
               <include>org.jboss.ws:jbossws-spi:jar</include>
               <include>junit:junit:jar</include>
@@ -70,6 +69,13 @@
               <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
             </includes>
           </dependencySet>
+          <dependencySet>
+            <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+              <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
+            </includes>
+          </dependencySet>
         </dependencySets>
       </binaries>
     </moduleSet>