Author: alessio.soldano(a)jboss.com Date: 2010-05-27 09:57:36 -0400 (Thu, 27 May 2010) New Revision: 12361 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/pom.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2928] Use JBoss provided EE API with Metro stack too Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2010-05-27 12:46:43 UTC (rev 12360) +++ stack/metro/trunk/modules/client/pom.xml 2010-05-27 13:57:36 UTC (rev 12361) @@ -79,6 +79,18 @@ <!-- transitive dependencies --> <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> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> </dependency> Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2010-05-27 12:46:43 UTC (rev 12360) +++ stack/metro/trunk/modules/management/pom.xml 2010-05-27 13:57:36 UTC (rev 12361) @@ -33,16 +33,34 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <scope>provided</scope> + <exclusions> + <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>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>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- [JBWS-2505] --> <!-- START --> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2010-05-27 12:46:43 UTC (rev 12360) +++ stack/metro/trunk/modules/server/pom.xml 2010-05-27 13:57:36 UTC (rev 12361) @@ -88,6 +88,18 @@ <!-- transitive dependencies --> <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> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </dependency> @@ -96,10 +108,6 @@ <artifactId>jaxb-xjc</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <type>sar</type> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2010-05-27 12:46:43 UTC (rev 12360) +++ stack/metro/trunk/modules/testsuite/pom.xml 2010-05-27 13:57:36 UTC (rev 12361) @@ -348,6 +348,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> @@ -413,6 +425,22 @@ <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</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> @@ -473,6 +501,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> @@ -484,6 +518,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> @@ -499,6 +541,26 @@ <version>${jboss.version}</version> <exclusions> <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</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>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + <exclusion> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> </exclusion> @@ -522,6 +584,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> </dependencies> <build> @@ -571,6 +639,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> @@ -582,6 +656,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> @@ -601,6 +683,18 @@ <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> + <exclusion> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> </exclusion> @@ -620,6 +714,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> </dependencies> <build> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2010-05-27 12:46:43 UTC (rev 12360) +++ stack/metro/trunk/pom.xml 2010-05-27 13:57:36 UTC (rev 12361) @@ -60,7 +60,9 @@ <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>2.2.0.CR1</jboss.logging.version> <commons.logging.version>1.1.1</commons.logging.version> - <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.api.version>1.0.0.Beta1</jaxb.api.version> + <jaxws.api.version>1.0.0.Beta1</jaxws.api.version> + <saaj.api.version>1.0.0.Beta1</saaj.api.version> <jaxb.impl.version>2.1.12</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <jboss.jaxr.version>2.0.1</jboss.jaxr.version> @@ -208,6 +210,14 @@ <groupId>com.sun.xml.stream</groupId> <artifactId>sjsxp</artifactId> </exclusion> + <exclusion> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -266,14 +276,30 @@ <!-- transitive dependencies --> <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> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>${jaxws.api.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> + <version>${saaj.api.version}</version> + </dependency> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.impl.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> @@ -316,18 +342,16 @@ <artifactId>jboss-logging-spi</artifactId> <version>${jboss.logging.version}</version> </dependency> - - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>${jsr181.version}</version> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>${jsr250.version}</version> - </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>${jsr181.version}</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>${jsr250.version}</version> + </dependency> </dependencies> </dependencyManagement> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-27 12:46:43 UTC (rev 12360) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-27 13:57:36 UTC (rev 12361) @@ -24,11 +24,9 @@ <includes> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>com.sun.xml.ws:http:jar</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> - <include>javax.xml.ws:jaxws-api:jar</include> <include>com.sun.xml.ws:jaxws-local-transport:jar</include> <include>com.sun.xml.ws:jaxws-rt:jar</include> <include>com.sun.xml.ws:jaxws-tools:jar</include> @@ -39,7 +37,6 @@ <include>javax.annotation:jsr250-api:jar</include> <include>org.jvnet:mimepull:jar</include> <include>com.sun.org.apache.xml.internal:resolver:jar</include> - <include>javax.xml.soap:saaj-api:jar</include> <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include> <include>stax:stax-api:jar</include> <include>org.jvnet.staxex:stax-ex:jar</include> @@ -58,6 +55,27 @@ <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>