Author: thomas.diesler(a)jboss.com Date: 2007-02-21 13:07:32 -0500 (Wed, 21 Feb 2007) New Revision: 2428 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl Removed: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/ Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/ObjectFactory.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/Statistics.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/package-info.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/WEB-INF/web.xml Log: Refactor jaxws/complex test Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -304,6 +304,12 @@ <!-- Deploy jbossws to jboss40 --> <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <delete file="${jboss40.home}/client/jbossws14-client.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -312,9 +318,11 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> + <!-- Only available on jdk1.5 --> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> @@ -354,8 +362,13 @@ <!-- Deploy jbossws to jboss40 jdk1.4 --> <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <delete file="${jboss40.home}/client/jbossws-client.jar"/> - <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -364,11 +377,8 @@ <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-client.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> </copy> + <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -157,6 +157,12 @@ <!-- Deploy jbossws to jboss42 --> <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws"> + <copy todir="${jboss42.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -164,9 +170,10 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -140,6 +140,12 @@ <!-- Deploy jbossws to jboss50 --> <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -147,9 +153,10 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - </copy> - <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-21 18:03:24 UTC (rev 2427) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -64,6 +64,16 @@ </classes> </war> + <!-- jaxws-complex --> + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/complex/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/> + </classes> + </war> + <!-- jaxws-eardeployment --> <war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -210,15 +220,6 @@ </classes> </war> - <!-- jaxws-jsr181-complex --> - <war warfile="${tests.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${tests.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/> - <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jsr181/complex/*TestCase.class"/> - </classes> - </war> - <!-- jaxws metadata --> <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex (from rev 2425, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Address.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/AlreadyRegisteredFault_Exception.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.ws.WebFault; @@ -51,7 +51,7 @@ /** * * @return - * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.AlreadyRegisteredFault + * returns fault bean: org.jboss.test.ws.jaxws.complex.AlreadyRegisteredFault */ public AlreadyRegisteredFault getFaultInfo() { return faultInfo; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegister.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/BulkRegisterResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Customer.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatistics.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/GetStatisticsResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,11 +1,11 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/InvoiceCustomer.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -19,7 +19,7 @@ * 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.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; // $Id$ @@ -39,7 +39,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** * A complex JAX-WS test Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Name.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ObjectFactory.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; @@ -10,7 +10,7 @@ /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.jsr181.complex package. + * generated in the org.jboss.test.ws.jaxws.complex package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -37,7 +37,7 @@ private final static QName _RegisterForInvoice_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterForInvoice"); /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jsr181.complex + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.complex * */ public ObjectFactory() { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/PhoneNumber.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Register.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoice.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterForInvoiceResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegisterResponse.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/Registration.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.List; import javax.jws.WebMethod; @@ -9,7 +9,7 @@ import javax.xml.ws.Holder; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** @@ -24,7 +24,7 @@ * JAX-WS Version: 2.0 * */ -@WebService(name = "Registration", targetNamespace = "http://org.jboss.ws/jaxws/complex") +@WebService(name = "Registration", targetNamespace = "http://types.complex.jaxws.ws.test.jboss.org") public interface Registration { @@ -38,8 +38,8 @@ * @throws ValidationFault_Exception */ @WebMethod(operationName = "BulkRegister") - @RequestWrapper(localName = "BulkRegister", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.BulkRegister") - @ResponseWrapper(localName = "BulkRegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.BulkRegisterResponse") + @RequestWrapper(localName = "BulkRegister", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.BulkRegister") + @ResponseWrapper(localName = "BulkRegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.BulkRegisterResponse") public void bulkRegister( @WebParam(name = "Customers", targetNamespace = "http://org.jboss.ws/jaxws/complex") List<Customer> customers, @@ -59,8 +59,8 @@ * @param customer */ @WebMethod(operationName = "GetStatistics") - @RequestWrapper(localName = "GetStatistics", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.GetStatistics") - @ResponseWrapper(localName = "GetStatisticsResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.GetStatisticsResponse") + @RequestWrapper(localName = "GetStatistics", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.GetStatistics") + @ResponseWrapper(localName = "GetStatisticsResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.GetStatisticsResponse") public void getStatistics( @WebParam(name = "Customer", targetNamespace = "http://org.jboss.ws/jaxws/complex") Customer customer, @@ -79,8 +79,8 @@ * @throws ValidationFault_Exception */ @WebMethod(operationName = "Register") - @RequestWrapper(localName = "Register", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.Register") - @ResponseWrapper(localName = "RegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterResponse") + @RequestWrapper(localName = "Register", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.Register") + @ResponseWrapper(localName = "RegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.RegisterResponse") public void register( @WebParam(name = "Customer", targetNamespace = "http://org.jboss.ws/jaxws/complex") Customer customer, @@ -102,8 +102,8 @@ * @throws ValidationFault_Exception */ @WebMethod(operationName = "RegisterForInvoice") - @RequestWrapper(localName = "RegisterForInvoice", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterForInvoice") - @ResponseWrapper(localName = "RegisterForInvoiceResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterForInvoiceResponse") + @RequestWrapper(localName = "RegisterForInvoice", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.RegisterForInvoice") + @ResponseWrapper(localName = "RegisterForInvoiceResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.complex.RegisterForInvoiceResponse") public void registerForInvoice( @WebParam(name = "InvoiceCustomer", targetNamespace = "http://org.jboss.ws/jaxws/complex") InvoiceCustomer invoiceCustomer, Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationFault.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationService.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.net.MalformedURLException; import java.net.URL; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -19,7 +19,7 @@ * 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.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; // $Id$ @@ -33,7 +33,7 @@ import javax.xml.ws.Holder; import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; +import org.jboss.test.ws.jaxws.complex.extra.Statistics; /** * A mock registration service that exercises the use of complex types, arrays, inheritence, @@ -42,7 +42,7 @@ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> * @author Thomas.Diesler(a)jboss.com */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.complex.Registration", name = "Registration") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.complex.Registration", name = "Registration", targetNamespace = "http://complex.jaxws.ws.test.jboss.org") public class RegistrationServiceImpl implements Registration { // Provide logging Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import java.util.ArrayList; import java.util.List; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/ValidationFault_Exception.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; import javax.xml.ws.WebFault; @@ -51,7 +51,7 @@ /** * * @return - * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.ValidationFault + * returns fault bean: org.jboss.test.ws.jaxws.complex.ValidationFault */ public ValidationFault getFaultInfo() { return faultInfo; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/ObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/ObjectFactory.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex.extra; +package org.jboss.test.ws.jaxws.complex.extra; import javax.xml.bind.annotation.XmlRegistry; @@ -7,7 +7,7 @@ /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.jsr181.complex.extra package. + * generated in the org.jboss.test.ws.jaxws.complex.extra package. * <p>An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -23,7 +23,7 @@ /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jsr181.complex.extra + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.complex.extra * */ public ObjectFactory() { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/Statistics.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/Statistics.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,5 +1,5 @@ -package org.jboss.test.ws.jaxws.jsr181.complex.extra; +package org.jboss.test.ws.jaxws.complex.extra; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/package-info.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/extra/package-info.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://extra.complex.jsr181.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.jboss.test.ws.jaxws.jsr181.complex.extra; +package org.jboss.test.ws.jaxws.complex.extra; Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/package-info.java 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/jaxws/complex", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.jboss.test.ws.jaxws.jsr181.complex; +package org.jboss.test.ws.jaxws.complex; Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex (from rev 2425, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-21 18:07:32 UTC (rev 2428) @@ -1,327 +1,15 @@ <!-- This wsdl is only used for client artifact generation -wsconsume -k -s src/main/java src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/Registration.wsdl +wsconsume -k -s src/main/java src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl $Id$ --> -<definitions name="RegistrationService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> - - <jaxws:bindings> - <jaxws:package name="org.jboss.test.ws.jaxws.jsr181.complex"/> - </jaxws:bindings> - - <types> - <schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> - - <xsd:annotation> - <xsd:appinfo> - <jaxb:schemaBindings> - <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex"/> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> - - <complexType name="AlreadyRegisteredFault"> - <complexContent> - <extension base="ns2:RegistrationFault"> - <sequence> - <element name="existingId" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="BulkRegister"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="ns2:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - - <complexType name="BulkRegisterResponse"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/> - <element maxOccurs="unbounded" minOccurs="0" name="result" type="long"/> - </sequence> - </complexType> - - <complexType name="GetStatistics"> - <sequence> - <element name="Customer" nillable="true" type="ns2:Customer"/> - </sequence> - </complexType> - - <complexType name="GetStatisticsResponse"> - <sequence> - <element name="Statistics" nillable="true" type="ns3:Statistics"/> - <element name="result" nillable="true" type="ns3:Statistics"/> - </sequence> - </complexType> - - <complexType name="Register"> - <sequence> - <element name="Customer" nillable="true" type="ns2:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - - <complexType name="RegisterForInvoice"> - <sequence> - <element name="InvoiceCustomer" nillable="true" type="ns2:InvoiceCustomer"/> - </sequence> - </complexType> - - <complexType name="RegisterForInvoiceResponse"> - <sequence> - <element name="done" type="boolean"/> - <element name="result" type="boolean"/> - </sequence> - </complexType> - - <complexType name="RegisterResponse"> - <sequence> - <element name="RegisteredID" type="long"/> - <element name="result" type="long"/> - </sequence> - </complexType> - - <complexType name="ValidationFault"> - <complexContent> - <extension base="ns2:RegistrationFault"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="failedCustomers" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name="AlreadyRegisteredFault" type="tns:AlreadyRegisteredFault"/> - <element name="BulkRegister" type="tns:BulkRegister"/> - <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> - <element name="GetStatistics" type="tns:GetStatistics"/> - <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/> - <element name="Register" type="tns:Register"/> - <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> - <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> - <element name="RegisterResponse" type="tns:RegisterResponse"/> - <element name="ValidationFault" type="tns:ValidationFault"/> - </schema> - - <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org... xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> - - <xsd:annotation> - <xsd:appinfo> - <jaxb:schemaBindings> - <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex.extra"/> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> - - <complexType name="Statistics"> - <sequence> - <element name="activationTime" nillable="true" type="dateTime"/> - <element name="hits" type="long"/> - </sequence> - </complexType> - </schema> - - <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" - xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> - - <xsd:annotation> - <xsd:appinfo> - <jaxb:schemaBindings> - <jaxb:package name="org.jboss.test.ws.jaxws.jsr181.complex"/> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... - - <complexType name="Address"> - <sequence> - <element name="city" nillable="true" type="string"/> - <element name="state" nillable="true" type="string"/> - <element name="street" nillable="true" type="string"/> - <element name="zip" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name="Customer"> - <sequence> - <element name="address" nillable="true" type="tns:Address"/> - <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> - <element name="id" type="long"/> - <element name="name" nillable="true" type="tns:Name"/> - <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> - </sequence> - </complexType> - - <complexType name="InvoiceCustomer"> - <complexContent> - <extension base="tns:Customer"> - <sequence> - <element name="cycleDay" type="int"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="Name"> - <sequence> - <element name="firstName" nillable="true" type="string"/> - <element name="lastName" nillable="true" type="string"/> - <element name="middleName" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name="PhoneNumber"> - <sequence> - <element name="areaCode" nillable="true" type="string"/> - <element name="exchange" nillable="true" type="string"/> - <element name="line" nillable="true" type="string"/> - </sequence> - </complexType> - - <complexType name="RegistrationFault"> - <sequence> - <element name="message" nillable="true" type="string"/> - </sequence> - </complexType> - <element name="RegistrationFault" type="tns:RegistrationFault"/> - </schema> - </types> - - <message name="Registration_BulkRegister"> - <part element="tns:BulkRegister" name="parameters"/> - </message> - <message name="Registration_GetStatisticsResponse"> - <part element="tns:GetStatisticsResponse" name="result"/> - </message> - <message name="AlreadyRegisteredFault"> - <part element="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> - </message> - <message name="ValidationFault"> - <part element="tns:ValidationFault" name="ValidationFault"/> - </message> - <message name="Registration_RegisterForInvoice"> - <part element="tns:RegisterForInvoice" name="parameters"/> - </message> - <message name="Registration_RegisterResponse"> - <part element="tns:RegisterResponse" name="result"/> - </message> - <message name="Registration_RegisterForInvoiceResponse"> - <part element="tns:RegisterForInvoiceResponse" name="result"/> - </message> - <message name="Registration_BulkRegisterResponse"> - <part element="tns:BulkRegisterResponse" name="result"/> - </message> - <message name="Registration_GetStatistics"> - <part element="tns:GetStatistics" name="parameters"/> - </message> - <message name="Registration_Register"> - <part element="tns:Register" name="parameters"/> - </message> - <portType name="Registration"> - <operation name="BulkRegister"> - <input message="tns:Registration_BulkRegister"/> - <output message="tns:Registration_BulkRegisterResponse"/> - <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> - <fault message="tns:ValidationFault" name="ValidationFault"/> - </operation> - <operation name="GetStatistics"> - <input message="tns:Registration_GetStatistics"/> - <output message="tns:Registration_GetStatisticsResponse"/> - </operation> - <operation name="Register"> - <input message="tns:Registration_Register"/> - <output message="tns:Registration_RegisterResponse"/> - <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> - <fault message="tns:ValidationFault" name="ValidationFault"/> - </operation> - <operation name="RegisterForInvoice"> - <input message="tns:Registration_RegisterForInvoice"/> - <output message="tns:Registration_RegisterForInvoiceResponse"/> - <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> - <fault message="tns:ValidationFault" name="ValidationFault"/> - </operation> - </portType> - <binding name="RegistrationBinding" type="tns:Registration"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="BulkRegister"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="AlreadyRegisteredFault"> - <soap:fault name="AlreadyRegisteredFault" use="literal"/> - </fault> - <fault name="ValidationFault"> - <soap:fault name="ValidationFault" use="literal"/> - </fault> - </operation> - <operation name="GetStatistics"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="Register"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="AlreadyRegisteredFault"> - <soap:fault name="AlreadyRegisteredFault" use="literal"/> - </fault> - <fault name="ValidationFault"> - <soap:fault name="ValidationFault" use="literal"/> - </fault> - </operation> - <operation name="RegisterForInvoice"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="AlreadyRegisteredFault"> - <soap:fault name="AlreadyRegisteredFault" use="literal"/> - </fault> - <fault name="ValidationFault"> - <soap:fault name="ValidationFault" use="literal"/> - </fault> - </operation> - </binding> +<definitions name="RegistrationService" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> + <import namespace="http://org.jboss.ws/jaxws/complex" location="Registration_PortType.wsdl"/> <service name="RegistrationService"> - <port binding="tns:RegistrationBinding" name="RegistrationPort"> - <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/Registration"/> + <port name="RegistrationPort" binding="ns1:RegistrationBinding"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService"/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2007-02-21 18:07:32 UTC (rev 2428) @@ -0,0 +1,249 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="RegistrationService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xs:schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" version="1.0" xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> + <xs:import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... + <xs:element name="AlreadyRegisteredFault" nillable="true" type="tns:AlreadyRegisteredFault"/> + <xs:element name="BulkRegister" nillable="true" type="tns:BulkRegister"/> + <xs:element name="BulkRegisterResponse" nillable="true" type="tns:BulkRegisterResponse"/> + <xs:element name="GetStatistics" nillable="true" type="tns:GetStatistics"/> + <xs:element name="GetStatisticsResponse" nillable="true" type="tns:GetStatisticsResponse"/> + <xs:element name="Register" nillable="true" type="tns:Register"/> + <xs:element name="RegisterForInvoice" nillable="true" type="tns:RegisterForInvoice"/> + <xs:element name="RegisterForInvoiceResponse" nillable="true" type="tns:RegisterForInvoiceResponse"/> + <xs:element name="RegisterResponse" nillable="true" type="tns:RegisterResponse"/> + <xs:element name="ValidationFault" nillable="true" type="tns:ValidationFault"/> + <xs:complexType name="Register"> + <xs:sequence> + <xs:element name="Customer" nillable="true" type="ns1:Customer"/> + <xs:element name="When" nillable="true" type="xs:anySimpleType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegisterResponse"> + <xs:sequence> + <xs:element name="RegisteredID" type="xs:long"/> + <xs:element name="result" type="xs:long"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="AlreadyRegisteredFault"> + <xs:complexContent> + <xs:extension base="ns1:RegistrationFault"> + <xs:sequence> + <xs:element name="existingId" type="xs:long"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="ValidationFault"> + <xs:complexContent> + <xs:extension base="ns1:RegistrationFault"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="failedCustomers" type="xs:long"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="GetStatistics"> + <xs:sequence> + <xs:element name="Customer" nillable="true" type="ns1:Customer"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="GetStatisticsResponse"> + <xs:sequence> + <xs:element name="Statistics" nillable="true" type="ns2:Statistics"/> + <xs:element name="result" nillable="true" type="ns2:Statistics"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="BulkRegister"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="ns1:Customer"/> + <xs:element name="When" nillable="true" type="xs:anySimpleType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="BulkRegisterResponse"> + <xs:sequence> + <xs:element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="xs:long"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="result" type="xs:long"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegisterForInvoice"> + <xs:sequence> + <xs:element name="InvoiceCustomer" nillable="true" type="ns1:InvoiceCustomer"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegisterForInvoiceResponse"> + <xs:sequence> + <xs:element name="done" type="xs:boolean"/> + <xs:element name="result" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + <xs:schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org... version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:complexType name="Statistics"> + <xs:sequence> + <xs:element name="activationTime" nillable="true" type="xs:anySimpleType"/> + <xs:element name="hits" type="xs:long"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + <xs:schema targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" version="1.0" xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:complexType name="Customer"> + <xs:sequence> + <xs:element form="qualified" name="address" nillable="true" type="tns:Address"/> + <xs:element form="qualified" maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> + <xs:element form="qualified" name="id" type="xs:long"/> + <xs:element form="qualified" name="name" nillable="true" type="tns:Name"/> + <xs:element form="qualified" maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Address"> + <xs:sequence> + <xs:element form="qualified" name="city" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="state" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="street" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="zip" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="PhoneNumber"> + <xs:sequence> + <xs:element form="qualified" name="areaCode" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="exchange" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="line" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="Name"> + <xs:sequence> + <xs:element form="qualified" name="firstName" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="lastName" nillable="true" type="xs:string"/> + <xs:element form="qualified" name="middleName" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="RegistrationFault"> + <xs:sequence> + <xs:element form="qualified" name="message" nillable="true" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="InvoiceCustomer"> + <xs:complexContent> + <xs:extension base="tns:Customer"> + <xs:sequence> + <xs:element form="qualified" name="cycleDay" type="xs:int"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:schema> + </types> + <message name="Registration_RegisterForInvoiceResponse"> + <part name="RegisterForInvoiceResponse" element="ns1:RegisterForInvoiceResponse"/> + </message> + <message name="Registration_RegisterResponse"> + <part name="RegisterResponse" element="ns1:RegisterResponse"/> + </message> + <message name="Registration_GetStatistics"> + <part name="GetStatistics" element="ns1:GetStatistics"/> + </message> + <message name="Registration_BulkRegisterResponse"> + <part name="BulkRegisterResponse" element="ns1:BulkRegisterResponse"/> + </message> + <message name="Registration_BulkRegister"> + <part name="BulkRegister" element="ns1:BulkRegister"/> + </message> + <message name="AlreadyRegisteredFault"> + <part name="AlreadyRegisteredFault" element="ns1:AlreadyRegisteredFault"/> + </message> + <message name="Registration_RegisterForInvoice"> + <part name="RegisterForInvoice" element="ns1:RegisterForInvoice"/> + </message> + <message name="ValidationFault"> + <part name="ValidationFault" element="ns1:ValidationFault"/> + </message> + <message name="Registration_GetStatisticsResponse"> + <part name="GetStatisticsResponse" element="ns1:GetStatisticsResponse"/> + </message> + <message name="Registration_Register"> + <part name="Register" element="ns1:Register"/> + </message> + <portType name="Registration"> + <operation name="BulkRegister" parameterOrder="BulkRegister"> + <input message="ns1:Registration_BulkRegister"/> + <output message="ns1:Registration_BulkRegisterResponse"/> + <fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/> + <fault name="ValidationFault" message="ns1:ValidationFault"/> + </operation> + <operation name="GetStatistics" parameterOrder="GetStatistics"> + <input message="ns1:Registration_GetStatistics"/> + <output message="ns1:Registration_GetStatisticsResponse"/> + </operation> + <operation name="Register" parameterOrder="Register"> + <input message="ns1:Registration_Register"/> + <output message="ns1:Registration_RegisterResponse"/> + <fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/> + <fault name="ValidationFault" message="ns1:ValidationFault"/> + </operation> + <operation name="RegisterForInvoice" parameterOrder="RegisterForInvoice"> + <input message="ns1:Registration_RegisterForInvoice"/> + <output message="ns1:Registration_RegisterForInvoiceResponse"/> + <fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/> + <fault name="ValidationFault" message="ns1:ValidationFault"/> + </operation> + </portType> + <binding name="RegistrationBinding" type="ns1:Registration"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="BulkRegister"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> + </fault> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> + </fault> + </operation> + <operation name="GetStatistics"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + <operation name="Register"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> + </fault> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> + </fault> + </operation> + <operation name="RegisterForInvoice"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> + </fault> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> + </fault> + </operation> + </binding> +</definitions> Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml 2007-02-21 15:43:21 UTC (rev 2425) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/WEB-INF/web.xml 2007-02-21 18:07:32 UTC (rev 2428) @@ -7,7 +7,7 @@ <servlet> <servlet-name>RegistrationService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.complex.RegistrationServiceImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>RegistrationService</servlet-name>