May 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r12364 - stack/native/trunk/modules/management/src/main/webapp.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-05-27 10:46:47 -0400 (Thu, 27 May 2010) New Revision: 12364 Modified: stack/native/trunk/modules/management/src/main/webapp/index.html Log: [JBAS-7764] Removing useless text Modified: stack/native/trunk/modules/management/src/main/webapp/index.html =================================================================== --- stack/native/trunk/modules/management/src/main/webapp/index.html 2010-05-27 14:45:26 UTC (rev 12363) +++ stack/native/trunk/modules/management/src/main/webapp/index.html 2010-05-27 14:46:47 UTC (rev 12364) @@ -8,12 +8,6 @@ <div class='pageHeader'>JBossWS</div> <div class="pageSection"> -<h2>Welcome to JBoss Web Services</h2> -JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS -compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc. -</div> - -<div class="pageSection"> <h3>Administration</h3> <fieldset>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12363 - in stack/metro/trunk/modules/management/src/main: webapp and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-05-27 10:45:26 -0400 (Thu, 27 May 2010) New Revision: 12363 Modified: stack/metro/trunk/modules/management/src/main/pclwebapp/index.html stack/metro/trunk/modules/management/src/main/webapp/index.html Log: [JBAS-7764] Removing useless text Modified: stack/metro/trunk/modules/management/src/main/pclwebapp/index.html =================================================================== --- stack/metro/trunk/modules/management/src/main/pclwebapp/index.html 2010-05-27 14:41:55 UTC (rev 12362) +++ stack/metro/trunk/modules/management/src/main/pclwebapp/index.html 2010-05-27 14:45:26 UTC (rev 12363) @@ -8,12 +8,6 @@ <div class='pageHeader'>JBossWS</div> <div class="pageSection"> -<h2>Welcome to JBoss Web Services</h2> -JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS -compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc. -</div> - -<div class="pageSection"> <h3>Administration</h3> <fieldset> Modified: stack/metro/trunk/modules/management/src/main/webapp/index.html =================================================================== --- stack/metro/trunk/modules/management/src/main/webapp/index.html 2010-05-27 14:41:55 UTC (rev 12362) +++ stack/metro/trunk/modules/management/src/main/webapp/index.html 2010-05-27 14:45:26 UTC (rev 12363) @@ -8,12 +8,6 @@ <div class='pageHeader'>JBossWS</div> <div class="pageSection"> -<h2>Welcome to JBoss Web Services</h2> -JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS -compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc. -</div> - -<div class="pageSection"> <h3>Administration</h3> <fieldset>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12362 - in stack/cxf/trunk/modules/management/src/main: webapp and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-05-27 10:41:55 -0400 (Thu, 27 May 2010) New Revision: 12362 Modified: stack/cxf/trunk/modules/management/src/main/pclwebapp/index.html stack/cxf/trunk/modules/management/src/main/webapp/index.html Log: [JBAS-7764] Removing useless text Modified: stack/cxf/trunk/modules/management/src/main/pclwebapp/index.html =================================================================== --- stack/cxf/trunk/modules/management/src/main/pclwebapp/index.html 2010-05-27 13:57:36 UTC (rev 12361) +++ stack/cxf/trunk/modules/management/src/main/pclwebapp/index.html 2010-05-27 14:41:55 UTC (rev 12362) @@ -8,12 +8,6 @@ <div class='pageHeader'>JBossWS</div> <div class="pageSection"> -<h2>Welcome to JBoss Web Services</h2> -JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS -compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc. -</div> - -<div class="pageSection"> <h3>Administration</h3> <fieldset> Modified: stack/cxf/trunk/modules/management/src/main/webapp/index.html =================================================================== --- stack/cxf/trunk/modules/management/src/main/webapp/index.html 2010-05-27 13:57:36 UTC (rev 12361) +++ stack/cxf/trunk/modules/management/src/main/webapp/index.html 2010-05-27 14:41:55 UTC (rev 12362) @@ -8,12 +8,6 @@ <div class='pageHeader'>JBossWS</div> <div class="pageSection"> -<h2>Welcome to JBoss Web Services</h2> -JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS -compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc. -</div> - -<div class="pageSection"> <h3>Administration</h3> <fieldset>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12361 - in stack/metro/trunk: modules/client and 4 other directories.

by jbossws-commits＠lists.jboss.org

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 @@  <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>   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 @@  <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 @@  <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>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12360 - common/trunk/src/main/java/org/jboss/ws.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-27 08:46:43 -0400 (Thu, 27 May 2010) New Revision: 12360 Modified: common/trunk/src/main/java/org/jboss/ws/Constants.java Log: [JBWS-3041] introducing new EPR related constant Modified: common/trunk/src/main/java/org/jboss/ws/Constants.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/Constants.java 2010-05-27 12:44:05 UTC (rev 12359) +++ common/trunk/src/main/java/org/jboss/ws/Constants.java 2010-05-27 12:46:43 UTC (rev 12360) @@ -279,6 +279,7 @@ static final String WSDL_PROPERTY_EVENTSOURCE = "http://www.jboss.org/jbossws/wse/isEventSource"; + static final String WSDL_ELEMENT_EPR = "http://www.jboss.org/jbossws/epr"; static final String WSDL_ELEMENT_POLICY = "http://www.jboss.org/jbossws/wsp/policy"; static final String WSDL_PROPERTY_POLICYURIS = "http://www.jboss.org/jbossws/wsp/policyURIs"; static final String WSDL_ELEMENT_POLICYREFERENCE = "http://www.jboss.org/jbossws/wsp/policyReference";

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12359 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: jbws2991/service and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-27 08:44:05 -0400 (Thu, 27 May 2010) New Revision: 12359 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2985/service/AddNumbersImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl1.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl2.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl3.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl4.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3027/service/AddNumbersImpl.java Log: fixing tests - wsdl have to be generated at deploy time Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2985/service/AddNumbersImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2985/service/AddNumbersImpl.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2985/service/AddNumbersImpl.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -31,7 +31,7 @@ import javax.xml.ws.soap.SOAPBinding; @HandlerChain(name = "", file = "server-handler.xml") -@WebService(name = "AddNumbers", portName = "AddNumbersPort", targetNamespace = "http://foobar.org/", serviceName = "AddNumbersService", wsdlLocation = "WEB-INF/wsdl/AddNumbersService.wsdl") +@WebService(name = "AddNumbers", portName = "AddNumbersPort", targetNamespace = "http://foobar.org/", serviceName = "AddNumbersService") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) @Addressing public class AddNumbersImpl Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl1.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl1.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl1.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -30,7 +30,7 @@ import javax.xml.ws.Action; import javax.xml.ws.soap.Addressing; -@WebService(name = "AddressingFeatureTest1", portName = "AddressingFeatureTest1Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest1Service", wsdlLocation = "WEB-INF/wsdl/AddressingFeatureTest1Service.wsdl") +@WebService(name = "AddressingFeatureTest1", portName = "AddressingFeatureTest1Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest1Service") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) @Addressing(enabled = true, required = false) @HandlerChain(name = "", file = "server-handler.xml") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl2.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl2.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl2.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -30,7 +30,7 @@ import javax.xml.ws.Action; import javax.xml.ws.soap.Addressing; -@WebService(name = "AddressingFeatureTest2", portName = "AddressingFeatureTest2Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest2Service", wsdlLocation = "WEB-INF/wsdl/AddressingFeatureTest2Service.wsdl") +@WebService(name = "AddressingFeatureTest2", portName = "AddressingFeatureTest2Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest2Service") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) @Addressing(enabled = true, required = true) @HandlerChain(name = "", file = "server-handler.xml") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl3.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl3.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl3.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -30,7 +30,7 @@ import javax.xml.ws.Action; import javax.xml.ws.soap.Addressing; -@WebService(name = "AddressingFeatureTest3", portName = "AddressingFeatureTest3Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest3Service", wsdlLocation = "WEB-INF/wsdl/AddressingFeatureTest3Service.wsdl") +@WebService(name = "AddressingFeatureTest3", portName = "AddressingFeatureTest3Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest3Service") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) @Addressing @HandlerChain(name = "", file = "server-handler.xml") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl4.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl4.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2991/service/AddressingFeatureTestImpl4.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -29,7 +29,7 @@ import javax.xml.ws.Holder; import javax.xml.ws.soap.Addressing; -@WebService(name = "AddressingFeatureTest4", portName = "AddressingFeatureTest4Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest4Service", wsdlLocation = "WEB-INF/wsdl/AddressingFeatureTest4Service.wsdl") +@WebService(name = "AddressingFeatureTest4", portName = "AddressingFeatureTest4Port", targetNamespace = "http://addressingfeatureservice.org/wsdl", serviceName = "AddressingFeatureTest4Service") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) @Addressing(enabled = false) @HandlerChain(name = "", file = "server-handler.xml") Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -29,7 +29,7 @@ import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; -@WebService(name = "AddNumbers", portName = "AddNumbersPort", targetNamespace = "http://foobar.org/", serviceName = "AddNumbersService", wsdlLocation="WEB-INF/wsdl/AddNumbersService.wsdl") +@WebService(name = "AddNumbers", portName = "AddNumbersPort", targetNamespace = "http://foobar.org/", serviceName = "AddNumbersService") @BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) @Addressing(enabled = true, required = true) public class AddNumbersImpl Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl3.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -29,7 +29,7 @@ import javax.xml.ws.soap.Addressing; import javax.xml.ws.soap.AddressingFeature; -@WebService(name = "AddNumbersPortType3", portName = "AddNumbersPort3", serviceName = "AddNumbersService3", targetNamespace = "http://example.com/", wsdlLocation="WEB-INF/wsdl/AddNumbersService3.wsdl") +@WebService(name = "AddNumbersPortType3", portName = "AddNumbersPort3", serviceName = "AddNumbersService3", targetNamespace = "http://example.com/") @Addressing(enabled = true, required = true, responses = AddressingFeature.Responses.ANONYMOUS) @HandlerChain(name = "", file = "server-handler.xml") public class AddNumbersImpl3 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3022/service/AddNumbersImpl4.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -29,7 +29,7 @@ import javax.xml.ws.soap.Addressing; import javax.xml.ws.soap.AddressingFeature; -@WebService(name = "AddNumbersPortType4", portName = "AddNumbersPort4", serviceName = "AddNumbersService4", targetNamespace = "http://example.com/", wsdlLocation="WEB-INF/wsdl/AddNumbersService4.wsdl") +@WebService(name = "AddNumbersPortType4", portName = "AddNumbersPort4", serviceName = "AddNumbersService4", targetNamespace = "http://example.com/") @Addressing(enabled = true, required = true, responses = AddressingFeature.Responses.NON_ANONYMOUS) @HandlerChain(name = "", file = "server-handler.xml") public class AddNumbersImpl4 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3027/service/AddNumbersImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3027/service/AddNumbersImpl.java 2010-05-27 12:24:02 UTC (rev 12358) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3027/service/AddNumbersImpl.java 2010-05-27 12:44:05 UTC (rev 12359) @@ -29,7 +29,7 @@ import org.jboss.test.ws.jaxws.common.AddressingHeaderException; -@WebService(name = "AddNumbersPortType", portName = "AddNumbersPort", serviceName = "AddNumbersService", targetNamespace = "http://example.com", wsdlLocation = "WEB-INF/wsdl/AddNumbersService.wsdl") +@WebService(name = "AddNumbersPortType", portName = "AddNumbersPort", serviceName = "AddNumbersService", targetNamespace = "http://example.com") @HandlerChain(file = "server-handler.xml") @Addressing(enabled = true, required = true) public class AddNumbersImpl

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12358 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-05-27 08:24:02 -0400 (Thu, 27 May 2010) New Revision: 12358 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: [JBWS-3041] final optimization - use NativeEndpointReference Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2010-05-27 11:00:05 UTC (rev 12357) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2010-05-27 12:24:02 UTC (rev 12358) @@ -24,7 +24,6 @@ import java.util.Observable; import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceException; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-05-27 11:00:05 UTC (rev 12357) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2010-05-27 12:24:02 UTC (rev 12358) @@ -31,13 +31,12 @@ import javax.xml.namespace.QName; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.BindingType; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReference; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; +import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -137,9 +136,12 @@ throw new IllegalStateException("Only one EPR can be specified on port"); Element eprElement = portEPRs.get(0).getElement(); + + // construct Native EPR DOMSource eprInfoset = new DOMSource(eprElement); - EndpointReference epr = W3CEndpointReference.readFrom(eprInfoset); - endpointMD.setEndpointReference(epr); + NativeEndpointReference nativeEPR = (NativeEndpointReference)NativeEndpointReference.readFrom(eprInfoset); + nativeEPR.setAddress(endpointMD.getEndpointAddress()); + endpointMD.setEndpointReference(nativeEPR); } } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2010-05-27 11:00:05 UTC (rev 12357) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2010-05-27 12:24:02 UTC (rev 12358) @@ -43,7 +43,6 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.EndpointReference; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.Service.Mode; @@ -62,6 +61,7 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; +import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.extensions.wsrm.config.RMConfig; @@ -149,7 +149,7 @@ // The documentation edfined through the @Documentation annotation private String documentation; - private EndpointReference epr; + private NativeEndpointReference epr; private ConfigObservable configObservable = new ConfigObservable(); @@ -185,12 +185,12 @@ this.portName = portName; } - public EndpointReference getEndpointReference() + public NativeEndpointReference getEndpointReference() { return epr; } - public void setEndpointReference(final EndpointReference epr) + public void setEndpointReference(final NativeEndpointReference epr) { this.epr = epr; }

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12357 - in stack/cxf/trunk/modules: server and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-05-27 07:00:05 -0400 (Thu, 27 May 2010) New Revision: 12357 Modified: stack/cxf/trunk/modules/endorsed/pom.xml stack/cxf/trunk/modules/server/pom.xml Log: Minor change to module's names Modified: stack/cxf/trunk/modules/endorsed/pom.xml =================================================================== --- stack/cxf/trunk/modules/endorsed/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) +++ stack/cxf/trunk/modules/endorsed/pom.xml 2010-05-27 11:00:05 UTC (rev 12357) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - Endorsed JAX-WS factories</name> + <name>JBoss Web Services - Endorsed factories</name> <artifactId>jbossws-cxf-factories</artifactId> <packaging>jar</packaging> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-05-27 10:58:27 UTC (rev 12356) +++ stack/cxf/trunk/modules/server/pom.xml 2010-05-27 11:00:05 UTC (rev 12357) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - CXF Server</name> + <name>JBoss Web Services - Stack CXF Server</name> <artifactId>jbossws-cxf-server</artifactId> <packaging>jar</packaging>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12356 - in stack/cxf/trunk: modules/client and 4 other directories.

by jbossws-commits＠lists.jboss.org

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> +  <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>   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>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r12355 - stack/cxf/trunk/modules/endorsed.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-05-27 06:51:12 -0400 (Thu, 27 May 2010) New Revision: 12355 Modified: stack/cxf/trunk/modules/endorsed/ Log: Adding svn:ignore on target dir Property changes on: stack/cxf/trunk/modules/endorsed ___________________________________________________________________ Name: svn:ignore + target

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2010