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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Oct 13 05:35:51 EDT 2010 

Author: alessio.soldano at jboss.com
Date: 2010-10-13 05:35:50 -0400 (Wed, 13 Oct 2010)
New Revision: 108542

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
Log:
[JBAS-8506] Moving to JBossWS 3.4.0.CR1 / Apache CXF 2.3.0


Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-10-13 09:16:20 UTC (rev 108541)
+++ trunk/build/build.xml	2010-10-13 09:35:50 UTC (rev 108542)
@@ -1688,6 +1688,7 @@
       <fileset refid="org.jboss.ws.cxf:jbossws-cxf-server:jar"/>
       <fileset refid="org.jboss.ws.cxf:jbossws-cxf-client:jar"/>
       <fileset refid="org.jboss.ws.cxf:jbossws-cxf-factories:jar"/>
+      <fileset refid="org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar"/>
       <mapper refid="remove-versions" />
     </copy>
     <unzip src="${org.jboss.ws.cxf:jbossws-cxf-resources:jar}"
@@ -1942,7 +1943,6 @@
       <fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-management:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-transports-http:jar"/>
-      <fileset refid="org.apache.cxf:cxf-rt-transports-http-jetty:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-transports-jms:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-transports-local:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-ws-addr:jar"/>
@@ -1955,8 +1955,8 @@
       <fileset refid="org.apache.cxf:cxf-tools-wsdlto-core:jar"/>
       <fileset refid="org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:jar"/>
       <fileset refid="org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar"/>
-      <fileset refid="org.apache.cxf:cxf-xjc-dv:jar"/>
-      <fileset refid="org.apache.cxf:cxf-xjc-ts:jar"/>
+      <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-dv:jar"/>
+      <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-ts:jar"/>
       <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-boolean:jar"/>
       <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-bug671:jar"/>
       <fileset refid="org.apache.neethi:neethi:jar"/>
@@ -1965,11 +1965,11 @@
       <fileset refid="org.jboss.threads:jboss-threads:jar"/>
       <fileset refid="org.jboss.xnio:xnio-api:jar"/>
       <fileset refid="javax.jws:jsr181-api:jar"/>
-      <fileset refid="javax.xml:jaxrpc-api:jar"/>
       <fileset refid="org.jboss.ws:jbossws-common:jar"/>
       <fileset refid="org.jboss.ws:jbossws-framework:jar"/>
       <fileset refid="org.jboss.ws:jbossws-spi:jar"/>
       <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+      <fileset refid="org.jboss.ws.projects:jaxws-httpserver-httpspi:jar"/>
       <fileset refid="org.jboss.netty:netty:jar"/>
       <fileset refid="commons-beanutils:commons-beanutils:jar"/>
       <fileset refid="antlr:antlr:jar"/>
@@ -2010,6 +2010,7 @@
       <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+      <fileset refid="org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
       <fileset refid="org.jboss.naming:jnpserver:jar"/>
       <fileset refid="org.jboss.jbossts:jbossjts:jar"/>
@@ -2253,7 +2254,6 @@
       <fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-management:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-transports-http:jar"/>
-      <fileset refid="org.apache.cxf:cxf-rt-transports-http-jetty:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-transports-jms:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-transports-local:jar"/>
       <fileset refid="org.apache.cxf:cxf-rt-ws-addr:jar"/>
@@ -2266,8 +2266,8 @@
       <fileset refid="org.apache.cxf:cxf-tools-wsdlto-core:jar"/>
       <fileset refid="org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:jar"/>
       <fileset refid="org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar"/>
-      <fileset refid="org.apache.cxf:cxf-xjc-dv:jar"/>
-      <fileset refid="org.apache.cxf:cxf-xjc-ts:jar"/>
+      <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-dv:jar"/>
+      <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-ts:jar"/>
       <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-boolean:jar"/>
       <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-bug671:jar"/>
       <fileset refid="org.apache.neethi:neethi:jar"/>
@@ -2306,6 +2306,7 @@
       <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+      <fileset refid="org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
       <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
       <fileset refid="org.jboss.mx:jboss-j2se:jar"/>
       <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
@@ -2330,12 +2331,13 @@
       <fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
       <fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
       <fileset refid="javax.jws:jsr181-api:jar"/>
-      <fileset refid="javax.xml:jaxrpc-api:jar"/>
       <fileset refid="org.jboss.ws.cxf:jbossws-cxf-client:jar"/>
+      <fileset refid="org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar"/>
       <fileset refid="org.jboss.ws:jbossws-common:jar"/>
       <fileset refid="org.jboss.ws:jbossws-framework:jar"/>
       <fileset refid="org.jboss.ws:jbossws-spi:jar"/>
       <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+      <fileset refid="org.jboss.ws.projects:jaxws-httpserver-httpspi:jar"/>
       <fileset refid="jboss:jboss-serialization:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
       <fileset refid="javax.activation:activation:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-10-13 09:16:20 UTC (rev 108541)
+++ trunk/component-matrix/pom.xml	2010-10-13 09:35:50 UTC (rev 108542)
@@ -31,7 +31,7 @@
 
   <!-- Properties -->
   <properties>
-    <version.apache.cxf>2.2.10</version.apache.cxf>
+    <version.apache.cxf>2.3.0</version.apache.cxf>
     <version.apache.neethi>2.0.4</version.apache.neethi>
     <version.apache.felix.log>1.0.0</version.apache.felix.log>
     <version.apache.velocity>1.6.2</version.apache.velocity>
@@ -48,14 +48,14 @@
     <version.javassist>3.12.1.GA</version.javassist>
     <version.javax.faces>2.0.2-FCS</version.javax.faces>
     <version.javax.validation>1.0.0.GA</version.javax.validation>
-    <version.jaxrpc.api>1.1</version.jaxrpc.api>
+    <version.jaxws-httpserver-httpspi>1.0.0.GA</version.jaxws-httpserver-httpspi>
     <version.jboss.jaxr>2.0.1</version.jboss.jaxr>
     <version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
-    <version.jboss.jbossws-native>3.3.0.GA</version.jboss.jbossws-native>
-    <version.jboss.jbossws-cxf>3.4.0.Beta2</version.jboss.jbossws-cxf>
-    <version.jboss.jbossws-common>1.4.0.Beta2</version.jboss.jbossws-common>
-    <version.jboss.jbossws-framework>3.4.0.Beta2</version.jboss.jbossws-framework>
-    <version.jboss.jbossws-spi>1.4.0.Beta3</version.jboss.jbossws-spi>
+    <version.jboss.jbossws-native>3.4.0.CR1</version.jboss.jbossws-native>
+    <version.jboss.jbossws-cxf>3.4.0.CR1</version.jboss.jbossws-cxf>
+    <version.jboss.jbossws-common>1.4.0.CR1</version.jboss.jbossws-common>
+    <version.jboss.jbossws-framework>3.4.0.CR1</version.jboss.jbossws-framework>
+    <version.jboss.jbossws-spi>1.4.0.CR1</version.jboss.jbossws-spi>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.jsf-deployer>1.0.2</version.jboss.jsf-deployer>
     <version.jboss.web>3.0.0-beta-7</version.jboss.web>
@@ -621,12 +621,12 @@
         <version>${version.apache.cxf}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>org.apache.cxf.xjcplugins</groupId>
         <artifactId>cxf-xjc-dv</artifactId>
         <version>${version.apache.cxf}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.cxf</groupId>
+        <groupId>org.apache.cxf.xjcplugins</groupId>
         <artifactId>cxf-xjc-ts</artifactId>
         <version>${version.apache.cxf}</version>
       </dependency>
@@ -1465,6 +1465,12 @@
       </dependency>
       
       <dependency>
+        <groupId>org.jboss.ws.cxf</groupId>
+        <artifactId>jbossws-cxf-transports-httpserver</artifactId>
+        <version>${version.jboss.jbossws-cxf}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-common</artifactId>
         <version>${version.jboss.jbossws-common}</version>
@@ -1483,6 +1489,12 @@
       </dependency>
       
       <dependency>
+        <groupId>org.jboss.ws.projects</groupId>
+        <artifactId>jaxws-httpserver-httpspi</artifactId>
+        <version>${version.jaxws-httpserver-httpspi}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>jboss.jms-integration-tests</groupId>
         <artifactId>integration-mdb20</artifactId>
         <version>${version.jboss.jms-integration-tests}</version>

More information about the jboss-cvs-commits mailing list