Author: alessio.soldano(a)jboss.com Date: 2010-05-27 06:58:27 -0400 (Thu, 27 May 2010) New Revision: 12356 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2928] Use JBoss provided EE API with CXF stack too Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2010-05-27 10:51:12 UTC (rev 12355) +++ stack/cxf/trunk/modules/client/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) @@ -55,12 +55,6 @@ </dependency> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - </dependency> - - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-corba</artifactId> </dependency> @@ -211,7 +205,22 @@ <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> + </dependency> + <!-- jboss provided --> <dependency> <groupId>org.jboss</groupId> Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2010-05-27 10:51:12 UTC (rev 12355) +++ stack/cxf/trunk/modules/management/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) @@ -33,16 +33,46 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600M3</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- [JBWS-2505] --> <!-- START --> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-05-27 10:51:12 UTC (rev 12355) +++ stack/cxf/trunk/modules/server/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) @@ -213,16 +213,32 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> </dependency> <dependency> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> + </dependency> + <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <type>sar</type> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-05-27 10:51:12 UTC (rev 12355) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) @@ -338,6 +338,18 @@ <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -399,6 +411,20 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> @@ -455,6 +481,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-aspects</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> @@ -466,6 +498,14 @@ <artifactId>ejb3-persistence</artifactId> </exclusion> <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> @@ -481,6 +521,22 @@ <version>${jboss.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> </exclusion> @@ -550,6 +606,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-aspects</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> @@ -561,6 +623,14 @@ <artifactId>ejb3-persistence</artifactId> </exclusion> <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> @@ -579,6 +649,18 @@ <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -590,6 +672,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-system</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.hornetq</groupId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-05-27 10:51:12 UTC (rev 12355) +++ stack/cxf/trunk/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) @@ -64,10 +64,10 @@ <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>2.2.0.CR1</jboss.logging.version> <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version> - <jaxb.api.version>2.1</jaxb.api.version> - <jaxb.impl.version>2.1.12</jaxb.impl.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> - <jaxws.api.version>2.1-1</jaxws.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> <apache.scout.version>1.1.1</apache.scout.version> @@ -76,7 +76,7 @@ <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> <log4j.version>1.2.14</log4j.version> - <saaj.api.version>1.3</saaj.api.version> + <saaj.api.version>1.0.0.Beta1</saaj.api.version> <velocity.version>1.5</velocity.version> <xmlsec.version>1.4.3</xmlsec.version> <wstx.version>3.2.9</wstx.version> @@ -179,6 +179,12 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -186,6 +192,14 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.1_spec</artifactId> </exclusion> @@ -205,6 +219,10 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.1_spec</artifactId> </exclusion> @@ -240,6 +258,10 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.0_spec</artifactId> </exclusion> @@ -255,6 +277,10 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-activation_1.1_spec</artifactId> </exclusion> @@ -345,6 +371,14 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.1_spec</artifactId> </exclusion> @@ -356,6 +390,10 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jaxws_2.1_spec</artifactId> </exclusion> @@ -401,20 +439,14 @@ <version>${jaxrpc.api.version}</version> </dependency> <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> <version>${saaj.api.version}</version> </dependency> <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> <version>${jaxws.api.version}</version> - <exclusions> - <exclusion> - <groupId>javax.jws</groupId> - <artifactId>jsr181</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.sun.xml.fastinfoset</groupId> @@ -523,8 +555,8 @@ <version>${log4j.version}</version> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> <version>${jaxb.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-05-27 10:51:12 UTC (rev 12355) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-27 10:58:27 UTC (rev 12356) @@ -25,7 +25,6 @@ <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> <include>org.apache.cxf:cxf-*</include> <include>org.apache.cxf.xjcplugins:cxf-*</include> - <include>javax.xml.bind:jaxb-api:jar</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> @@ -33,7 +32,6 @@ <include>org.jboss.ws:jbossws-spi:jar</include> <include>junit:junit:jar</include> <include>org.apache.neethi:neethi:jar</include> - <include>javax.xml.soap:saaj-api:jar</include> <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include> <include>org.springframework:spring-aop:jar</include> <include>org.springframework:spring-asm:jar</include> @@ -56,7 +54,6 @@ <include>jboss.jaxbintros:jboss-jaxb-intros</include> <include>org.mortbay.jetty:jetty*</include> <include>stax:stax-api:jar</include> - <include>javax.xml.ws:jaxws-api:jar</include> <include>javax.jws:jsr181-api:jar</include> </includes> </dependencySet> @@ -67,6 +64,29 @@ <include>org.codehaus.woodstox:wstx-lgpl:jar</include> </includes> </dependencySet> + + <dependencySet> + <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>saaj-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include> + </includes> + </dependencySet> + </dependencySets> </binaries> </moduleSet>