[jboss-cvs] JBossAS SVN: r105488 - in trunk: component-matrix and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 1 11:49:16 EDT 2010
Author: alessio.soldano at jboss.com
Date: 2010-06-01 11:49:15 -0400 (Tue, 01 Jun 2010)
New Revision: 105488
Removed:
trunk/testsuite/src/main/org/jboss/test/webservice/endpoint/
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/Echo.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/package-info.java
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/depchain/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/webservice.xml
trunk/testsuite/imports/sections/ws.xml
trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java
trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java
trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.java
Log:
[JBAS-8051] Moving to JBossWS-CXF 3.3.0.GA
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/build/build.xml 2010-06-01 15:49:15 UTC (rev 105488)
@@ -1655,7 +1655,7 @@
<property name="webservices.module.name" value="webservices"/>
<property name="webservices.module.output" value="${project.root}/${webservices.module.name}/target"/>
- <unzip src="${org.jboss.ws.native:jbossws-native-resources:jar}"
+ <unzip src="${org.jboss.ws.cxf:jbossws-cxf-resources:jar}"
dest="${install.bin}">
<patternset>
<include name="bin/wsconsume.bat"/>
@@ -1682,7 +1682,6 @@
<fileset refid="sun-fi:FastInfoset:jar"/>
<fileset refid="jboss.jaxbintros:jboss-jaxb-intros:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
- <fileset refid="org.codehaus.jettison:jettison:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
<fileset refid="org.apache:xmlsec:jar"/>
@@ -1702,18 +1701,17 @@
<target name="install-jbossws-to-endorsed">
<!-- Endorse JBossWS jars on JDK1.6 and above -->
<copy todir="${install.lib}/endorsed" flatten="true" overwrite="true">
- <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
<fileset refid="javax.xml.ws:jaxws-api:jar"/>
+ <fileset refid="org.jboss.ws.cxf:jbossws-cxf-factories:jar"/>
<mapper refid="remove-versions" />
</copy>
</target>
<target name="install-jbossws-to-deploy">
- <!-- Install JBossWS web console to deploy directory -->
- <mkdir dir="${install.common.deploy}"/>
- <unzip src="${org.jboss.ws.native:jbossws-native-management:war}"
- dest="${install.common.deploy}/jbossws-console.war"
- />
+ <!-- Install JBossWS web console to deploy directory -->
+ <mkdir dir="${install.common.deploy}"/>
+ <unzip src="${org.jboss.ws.cxf:jbossws-cxf-management:war}"
+ dest="${install.common.deploy}/jbossws-console.war"/>
</target>
<target name="install-jbossws-to-deployers">
@@ -1722,14 +1720,15 @@
<unzip dest="${install.all.deployers}/jbossws.deployer"
src="${webservices.module.output}/jboss-as-webservices-jbossws-jboss60-deployer.zip"/>
<copy todir="${install.all.deployers}/jbossws.deployer" flatten="true" overwrite="true">
- <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
+ <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"/>
<mapper refid="remove-versions" />
</copy>
- <unzip src="${org.jboss.ws.native:jbossws-native-resources:jar}"
- dest="${webservices.module.output}/jbossws-native-resources"/>
+ <unzip src="${org.jboss.ws.cxf:jbossws-cxf-resources:jar}"
+ dest="${webservices.module.output}/jbossws-cxf-resources"/>
<copy todir="${install.all.deployers}/jbossws.deployer">
- <fileset dir="${webservices.module.output}/jbossws-native-resources/resources/jbossws-jboss601/jbossws.beans">
+ <fileset dir="${webservices.module.output}/jbossws-cxf-resources/resources/jbossws-jboss601/jbossws.beans">
<include name="META-INF/**"/>
</fileset>
</copy>
@@ -1745,6 +1744,13 @@
<fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
<mapper refid="remove-versions" />
</copy>
+ <unzip src="${org.jboss.ws.cxf:jbossws-cxf-resources:jar}"
+ dest="${webservices.module.output}/jbossws-cxf-resources"/>
+ <copy todir="${install.all.deployers}/jbossws-jaxrpc.deployer">
+ <fileset dir="${webservices.module.output}/jbossws-cxf-resources/resources/jbossws-jaxrpc-jboss601/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
</target>
<target name="module-webservices-all">
@@ -1960,6 +1966,44 @@
<copy todir="${install.common.lib}" filtering="no">
<fileset refid="apache-xalan:xalan:jar"/>
<fileset refid="apache-xalan:serializer:jar"/>
+ <fileset refid="org.apache.cxf:cxf-api:jar"/>
+ <fileset refid="org.apache.cxf:cxf-common-schemas:jar"/>
+ <fileset refid="org.apache.cxf:cxf-common-utilities:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-coloc:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-corba:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-http:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-object:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-soap:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-xml:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-core:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-databinding-aegis:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-databinding-jaxb:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-frontend-jaxws:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-frontend-jaxrs:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-javascript: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"/>
+ <fileset refid="org.apache.cxf:cxf-rt-ws-policy:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-ws-rm:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-ws-security:jar"/>
+ <fileset refid="org.apache.cxf:cxf-tools-common:jar"/>
+ <fileset refid="org.apache.cxf:cxf-tools-java2ws:jar"/>
+ <fileset refid="org.apache.cxf:cxf-tools-validator:jar"/>
+ <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-boolean:jar"/>
+ <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-bug671:jar"/>
+ <fileset refid="org.apache.neethi:neethi:jar"/>
+ <fileset refid="org.apache.ws.commons.schema:XmlSchema:jar"/>
+ <fileset refid="org.apache.ws.security:wss4j:jar"/>
<fileset refid="org.jboss.threads:jboss-threads:jar"/>
<fileset refid="org.jboss.xnio:xnio-api:jar"/>
<fileset refid="javax.xml.ws:jaxws-api:jar"/>
@@ -2104,6 +2148,14 @@
<fileset refid="org.hornetq:hornetq-logging:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-jms:jar"/>
+ <fileset refid="org.springframework:spring-aop:jar"/>
+ <fileset refid="org.springframework:spring-asm:jar"/>
+ <fileset refid="org.springframework:spring-beans:jar"/>
+ <fileset refid="org.springframework:spring-context:jar"/>
+ <fileset refid="org.springframework:spring-core:jar"/>
+ <fileset refid="org.springframework:spring-expression:jar"/>
+ <fileset refid="org.springframework:spring-jms:jar"/>
+ <fileset refid="org.springframework:spring-tx:jar"/>
<mapper refid="remove-versions" />
</copy>
<!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
@@ -2214,6 +2266,45 @@
<fileset refid="apache-xalan:serializer:jar"/>
<fileset refid="xerces:xercesImpl:jar"/>
<fileset refid="xml-resolver:xml-resolver:jar"/>
+ <fileset refid="org.apache.cxf:cxf-api:jar"/>
+ <fileset refid="org.apache.cxf:cxf-common-schemas:jar"/>
+ <fileset refid="org.apache.cxf:cxf-common-utilities:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-coloc:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-corba:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-http:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-object:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-soap:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-bindings-xml:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-core:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-databinding-aegis:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-databinding-jaxb:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-frontend-jaxws:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-frontend-jaxrs:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-javascript: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"/>
+ <fileset refid="org.apache.cxf:cxf-rt-ws-policy:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-ws-rm:jar"/>
+ <fileset refid="org.apache.cxf:cxf-rt-ws-security:jar"/>
+ <fileset refid="org.apache.cxf:cxf-tools-common:jar"/>
+ <fileset refid="org.apache.cxf:cxf-tools-java2ws:jar"/>
+ <fileset refid="org.apache.cxf:cxf-tools-validator:jar"/>
+ <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-boolean:jar"/>
+ <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-bug671:jar"/>
+ <fileset refid="org.apache.neethi:neethi:jar"/>
+ <fileset refid="org.apache.velocity:velocity:jar"/>
+ <fileset refid="org.apache.ws.commons.schema:XmlSchema:jar"/>
+ <fileset refid="org.apache.ws.security:wss4j:jar"/>
<fileset refid="org.apache:xmlsec:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
<fileset refid="javassist:javassist:jar"/>
@@ -2263,12 +2354,9 @@
<fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
<fileset refid="javax.xml.ws:jaxws-api:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
<fileset refid="javax.xml:jaxrpc-api:jar"/>
<fileset refid="javax.xml.soap:saaj-api:jar"/>
+ <fileset refid="org.jboss.ws.cxf:jbossws-cxf-client: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"/>
@@ -2310,6 +2398,8 @@
<fileset refid="logkit:logkit:jar"/>
<fileset refid="sun-fi:FastInfoset:jar"/>
<fileset refid="commons-beanutils:commons-beanutils:jar"/>
+ <fileset refid="commons-collections:commons-collections:jar"/>
+ <fileset refid="commons-lang:commons-lang:jar"/>
<fileset refid="sun-jaxb:jaxb-api:jar"/>
<fileset refid="stax:stax-api:jar"/>
<fileset refid="org.codehaus.jettison:jettison:jar"/>
@@ -2318,6 +2408,14 @@
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
+ <fileset refid="org.springframework:spring-aop:jar"/>
+ <fileset refid="org.springframework:spring-asm:jar"/>
+ <fileset refid="org.springframework:spring-beans:jar"/>
+ <fileset refid="org.springframework:spring-context:jar"/>
+ <fileset refid="org.springframework:spring-core:jar"/>
+ <fileset refid="org.springframework:spring-expression:jar"/>
+ <fileset refid="org.springframework:spring-jms:jar"/>
+ <fileset refid="org.springframework:spring-tx:jar"/>
<mapper refid="remove-versions" />
</copy>
<!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/component-matrix/pom.xml 2010-06-01 15:49:15 UTC (rev 105488)
@@ -32,8 +32,13 @@
<properties>
<version.apache.aries.jmx>0.1-incubating-20100329</version.apache.aries.jmx>
<version.apache.aries.util>0.1-incubating-20100329</version.apache.aries.util>
+ <version.apache.cxf>2.2.8</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>
<version.apache.xalan>2.7.1.patch01-brew</version.apache.xalan>
+ <version.apache.ws.security>1.5.8</version.apache.ws.security>
+ <version.asm>2.2.3</version.asm>
<version.beanvalidation.integration>1.0.0-Beta-1</version.beanvalidation.integration>
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
@@ -48,10 +53,11 @@
<version.jaxws.api>2.2</version.jaxws.api>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
- <version.jboss.jbossws>3.3.0.CR2</version.jboss.jbossws>
- <version.jboss.jbossws-common>1.3.0.CR3</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.3.0.CR2</version.jboss.jbossws-framework>
- <version.jboss.jbossws-spi>1.3.0.CR2</version.jboss.jbossws-spi>
+ <version.jboss.jbossws-native>3.3.0.GA</version.jboss.jbossws-native>
+ <version.jboss.jbossws-cxf>3.3.0.GA</version.jboss.jbossws-cxf>
+ <version.jboss.jbossws-common>1.3.0.GA</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.3.0.GA</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-spi>1.3.0.GA</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jsf-deployer>1.0.0-SNAPSHOT</version.jboss.jsf-deployer>
<version.jboss.osgi.apache.xerces>2.9.1.SP4</version.jboss.osgi.apache.xerces>
@@ -163,6 +169,7 @@
<version.weld.api>1.0-SP1</version.weld.api>
<version.weld.integration>6.0.0.Beta11</version.weld.integration>
<version.xdoclet>1.2.3</version.xdoclet>
+ <version.xmlschema>1.4.5</version.xmlschema>
</properties>
<!-- Build Configuration -->
@@ -373,6 +380,285 @@
<artifactId>xmlsec</artifactId>
<version>1.4.3</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-corba</artifactId>
+ <version>${version.apache.cxf}</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>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${version.apache.cxf}</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>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ <version>${version.apache.cxf}</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>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-core</artifactId>
+ <version>${version.apache.cxf}</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>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-boolean</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-bug671</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ <version>${version.apache.cxf}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${version.apache.neethi}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${version.apache.velocity}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${version.xmlschema}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${version.apache.ws.security}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${version.asm}</version>
+ </dependency>
<dependency>
<groupId>bcel</groupId>
@@ -425,7 +711,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
</dependency>
<dependency>
@@ -1059,21 +1345,25 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-factories</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <version>${version.jboss.jbossws-native}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <version>${version.jboss.jbossws-native}</version>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${version.jboss.jbossws-cxf}</version>
<exclusions>
<exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
@@ -1081,20 +1371,48 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-management</artifactId>
+ <version>${version.jboss.jbossws-cxf}</version>
<type>war</type>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ <version>${version.jboss.jbossws-cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-core</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <version>${version.jboss.jbossws-native}</version>
<exclusions>
<exclusion>
<groupId>woodstox</groupId>
@@ -1124,12 +1442,18 @@
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version.jboss.jbossws-cxf}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-resources</artifactId>
+ <version>${version.jboss.jbossws-cxf}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
<version>${version.jboss.jbossws-common}</version>
@@ -1374,7 +1698,7 @@
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
@@ -3086,6 +3410,12 @@
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${version.org.springframework}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${version.org.springframework}</version>
</dependency>
@@ -3110,6 +3440,24 @@
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${version.org.springframework}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>${version.org.springframework}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${version.org.springframework}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${version.org.springframework}</version>
</dependency>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/depchain/pom.xml 2010-06-01 15:49:15 UTC (rev 105488)
@@ -863,25 +863,29 @@
<artifactId>weld-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-management</artifactId>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-resources</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
+ <artifactId>jbossws-native-factories</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/build.xml 2010-06-01 15:49:15 UTC (rev 105488)
@@ -285,12 +285,9 @@
<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-client: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.native:jbossws-native-core:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-management:war"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-resources:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
<fileset refid="javax.xml:jaxrpc-api:jar"/>
<fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
Modified: trunk/testsuite/imports/sections/webservice.xml
===================================================================
--- trunk/testsuite/imports/sections/webservice.xml 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/imports/sections/webservice.xml 2010-06-01 15:49:15 UTC (rev 105488)
@@ -119,16 +119,5 @@
</metainf>
</ear>
- <!-- jaxws-endpoint-servlet -->
- <war warfile="${build.lib}/jaxws-endpoint-servlet.war" webxml="${build.resources}/webservice/endpoint/WEB-INF/web.xml">
- <classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/endpoint/EndpointServlet.class"/>
- <include name="org/jboss/test/webservice/endpoint/EndpointBean.class"/>
- <include name="org/jboss/test/webservice/endpoint/EndpointInterface.class"/>
- </classes>
- <webinf dir="${build.resources}/webservice/endpoint/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- </war>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/testsuite/imports/sections/ws.xml
===================================================================
--- trunk/testsuite/imports/sections/ws.xml 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/imports/sections/ws.xml 2010-06-01 15:49:15 UTC (rev 105488)
@@ -66,8 +66,6 @@
<include name="org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
</fileset>
<metainf dir="${build.resources}/ws/jaxws/webserviceref/META-INF">
<include name="application-client.xml"/>
Modified: trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTest.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -70,7 +70,22 @@
{
return delegate.isTargetServerTomcat();
}
+
+ public boolean isIntegrationNative()
+ {
+ return JBossWSTestHelper.isIntegrationNative();
+ }
+ public boolean isIntegrationMetro()
+ {
+ return JBossWSTestHelper.isIntegrationMetro();
+ }
+
+ public boolean isIntegrationCXF()
+ {
+ return JBossWSTestHelper.isIntegrationCXF();
+ }
+
/**
* Locate a classpath resource.
*
Modified: trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/JBossWSTestHelper.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -28,6 +28,11 @@
import javax.management.MBeanServerConnection;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+import javax.xml.ws.soap.SOAPBinding;
/**
* A JBossWS test helper that deals with test deployment/undeployment, etc.
@@ -37,6 +42,10 @@
*/
public class JBossWSTestHelper
{
+ private static String implVendor;
+ private static String implTitle;
+ private static String implVersion;
+
/** Deploy the given archive
*/
public void deploy(String archive) throws Exception
@@ -113,4 +122,56 @@
return url;
}
+
+ public static boolean isIntegrationNative()
+ {
+ String vendor = getImplementationVendor();
+ return vendor.toLowerCase().indexOf("jboss") != -1;
+ }
+
+ public static boolean isIntegrationMetro()
+ {
+ String vendor = getImplementationVendor();
+ return vendor.toLowerCase().indexOf("sun") != -1;
+ }
+
+ public static boolean isIntegrationCXF()
+ {
+ String vendor = getImplementationVendor();
+ return vendor.toLowerCase().indexOf("apache") != -1;
+ }
+
+ private static String getImplementationVendor()
+ {
+ if (implVendor == null)
+ {
+ Object obj = getImplementationObject();
+ implVendor = obj.getClass().getPackage().getImplementationVendor();
+ if (implVendor == null)
+ implVendor = getImplementationPackage();
+
+ implTitle = obj.getClass().getPackage().getImplementationTitle();
+ implVersion = obj.getClass().getPackage().getImplementationVersion();
+
+ System.out.println(implVendor + ", " + implTitle + ", " + implVersion);
+ }
+ return implVendor;
+ }
+
+ private static Object getImplementationObject()
+ {
+ Service service = Service.create(new QName("dummyService"));
+ Object obj = service.getHandlerResolver();
+ if (obj == null)
+ {
+ service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address");
+ obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD);
+ }
+ return obj;
+ }
+
+ private static String getImplementationPackage()
+ {
+ return getImplementationObject().getClass().getPackage().getName();
+ }
}
Modified: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -31,6 +31,7 @@
import org.jboss.test.ws.jaxws.ejb3Integration.injection.webservice.EndpointIface;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.logging.Logger;
/**
* [JBWS-2634] Implement support for @EJB annotations in WS components
@@ -39,6 +40,8 @@
*/
public final class InjectionTestCase extends JBossWSTest
{
+ private static final Logger log = Logger.getLogger(InjectionTestCase.class);
+
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(InjectionTestCase.class, "jaxws-injection.ear");
@@ -46,6 +49,12 @@
public void testPojoEndpoint() throws Exception
{
+ if (isIntegrationCXF())
+ {
+ log.info("FIXME [JBWS-2596] Resource injection in jaxws endpoints and handlers");
+ return;
+ }
+
QName serviceName = new QName("http://jbossws.org/injection", "POJOService");
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-injection-pojo/POJOService?wsdl");
@@ -56,6 +65,12 @@
public void testEjb3Endpoint() throws Exception
{
+ if (isIntegrationCXF())
+ {
+ log.info("FIXME [JBWS-2596] Resource injection in jaxws endpoints and handlers");
+ return;
+ }
+
QName serviceName = new QName("http://jbossws.org/injection", "EJB3Service");
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-injection-ejb3/EJB3Service?wsdl");
Deleted: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/Echo.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/Echo.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/Echo.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.webserviceref;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echo">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "echo", propOrder = {
- "arg0"
-})
-public class Echo {
-
- @XmlElement(namespace = "http://org.jboss.ws/wsref")
- protected String arg0;
-
- /**
- * Gets the value of the arg0 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArg0() {
- return arg0;
- }
-
- /**
- * Sets the value of the arg0 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArg0(String value) {
- this.arg0 = value;
- }
-
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.webserviceref;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echoResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echoResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "echoResponse", propOrder = {
- "_return"
-})
-public class EchoResponse {
-
- @XmlElement(name = "return", namespace = "http://org.jboss.ws/wsref")
- protected String _return;
-
- /**
- * Gets the value of the return property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setReturn(String value) {
- this._return = value;
- }
-
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.webserviceref;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.jboss.test.ws.jaxws.webserviceref package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
- at XmlRegistry
-public class ObjectFactory {
-
- private final static QName _EchoResponse_QNAME = new QName("http://org.jboss.ws/wsref", "echoResponse");
- private final static QName _Echo_QNAME = new QName("http://org.jboss.ws/wsref", "echo");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.webserviceref
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link EchoResponse }
- *
- */
- public EchoResponse createEchoResponse() {
- return new EchoResponse();
- }
-
- /**
- * Create an instance of {@link Echo }
- *
- */
- public Echo createEcho() {
- return new Echo();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://org.jboss.ws/wsref", name = "echoResponse")
- public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) {
- return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://org.jboss.ws/wsref", name = "echo")
- public JAXBElement<Echo> createEcho(Echo value) {
- return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value);
- }
-
-}
Deleted: trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/package-info.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/package-info.java 2010-06-01 15:47:21 UTC (rev 105487)
+++ trunk/testsuite/src/main/org/jboss/test/ws/jaxws/webserviceref/package-info.java 2010-06-01 15:49:15 UTC (rev 105488)
@@ -1,23 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/wsref")
-package org.jboss.test.ws.jaxws.webserviceref;
More information about the jboss-cvs-commits
mailing list