Author: heiko.braun(a)jboss.com Date: 2007-01-30 05:30:50 -0500 (Tue, 30 Jan 2007) New Revision: 2190 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/gen/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/ Modified: trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml Log: Order test suite build by WSDLToJava, compile, javaToWSDL, post-compile Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-30 10:26:37 UTC (rev 2189) +++ trunk/jbossws-tests/build.xml 2007-01-30 10:30:50 UTC (rev 2190) @@ -236,7 +236,7 @@ <!-- Compiling --> <!-- ================================================================== --> - <target name="compile" depends="compile14,compile15" description="Compile sources"/> + <target name="compile" depends="WSDLToJava,compile14,compile15" description="Compile sources"/> <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> @@ -244,10 +244,6 @@ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="${tests.java.dir}"/> <exclude name="org/jboss/test/ws/jaxws/**"/> - - <!-- defer the *gen* directories, because they depend on tools artifacts --> - <exclude name="**/gen/**/*"/> - <exclude name="org/jboss/test/ws/tools/jsr181/**"/> <classpath refid="javac.classpath"/> </javac> @@ -259,26 +255,16 @@ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="${tests.java.dir}"/> <classpath refid="javac.classpath"/> - - <!-- defer the *gen* directories, because they depend on tools artifacts --> - <exclude name="**/gen/**/*"/> </javac> </target> - <target name="compile-generated" depends="init" description="Compile generated sources"> + <target name="post-compile" depends="init" description="Compile generated sources"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${tests.output.dir}/wstools/java"/> <exclude name="org/jboss/test/ws/interop/microsoft/**"/> <classpath refid="javac.classpath"/> </javac> - - <!-- rebuild the deferred sources --> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${tests.java.dir}"/> - <include name="**/gen/**/*"/> - <classpath refid="javac.classpath"/> - </javac> </target> <target name="copy-resources" depends="init" description="Copy the deployment resources."> @@ -309,16 +295,40 @@ <!-- Building --> <!-- ================================================================== --> - <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> + <target name="main" depends="compile,copy-resources,javaToWSDL,post-compile,copy-generated" description="Build the deployments."> <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/> <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars" inheritall="true"/> </target> <!-- - Generate samples sources + Create artifacts that need to be compiled with the test cases --> - <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + <target name="WSDLToJava"> + <!-- interop --> + <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" + sourceDir="${tests.output.dir}/wstools/java" + destDir="${tests.output.dir}/classes" + package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" + verbose="true"/> + <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" + sourceDir="${tests.output.dir}/wstools/java" + destDir="${tests.output.dir}/classes" + package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" + verbose="true"/> + + <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" + sourceDir="${tests.output.dir}/wstools/java" + destDir="${tests.output.dir}/classes" + package="org.jboss.test.ws.interop.soapwsdl.baserpclit" + verbose="true"/> + </target> + + <!-- + Create artifacts that depend on pre-compiled sources + --> + <target name="javaToWSDL" depends="compile" description="Generate the deployment resources."> + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> <classpath refid="jbpm.bpel.classpath"/> </taskdef> @@ -366,24 +376,6 @@ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - <!-- interop --> - <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" - sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" - package="org.jboss.test.ws.interop.soapwsdl.gen.basedoclitb" - verbose="true"/> - - <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" - sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" - package="org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw" - verbose="true"/> - - <callWsimport wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" - sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" - package="org.jboss.test.ws.interop.soapwsdl.baserpclit" - verbose="true"/> </target> <target name="copy-generated" depends="init" description="Copy the deployment resources."> Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java (from rev 2187, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/gen/JAXBContextTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java 2007-01-30 10:30:50 UTC (rev 2190) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * 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.common.jaxb; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; + +import com.sun.xml.bind.api.JAXBRIContext; +import com.sun.xml.bind.api.RawAccessor; + +/** + * Test JAXB usage with artifacts that have been created through a tools layer. + * + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 29.01.2007 + */ +public class JAXBContextTestCase extends JBossWSTest { + + + public void testJAXBContextCreation() throws Exception + { + try { + JAXBContext ctx = JAXBContext.newInstance(org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray.class); + assertNotNull(ctx); + } catch (JAXBException e) { + fail(e.getMessage()); + } + + } + + public void testJAXBContextCreation2() throws Exception + { + try { + JAXBContext ctx = JAXBContext.newInstance( new Class[] {org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray.class}); + assertNotNull(ctx); + } catch (JAXBException e) { + fail(e.getMessage()); + } + + } + + /** + * Test non-public API + */ + public void testAccessor() throws Exception + { + try { + QName name = new QName("http://tempuri.org/";, "inByteArray"); + Class<RetByteArray> aClass = RetByteArray.class; + JAXBContext ctx = JAXBContext.newInstance(new Class[] { aClass }); + RawAccessor accessor = ((JAXBRIContext)ctx).getElementPropertyAccessor(aClass, name.getNamespaceURI(), name.getLocalPart()); + assertNotNull(accessor); + RetByteArray byteArray = new RetByteArray(); + accessor.set(byteArray, "Hello World".getBytes()); + assertEquals(accessor.get(byteArray), "Hello World".getBytes()); + } catch (JAXBException e) { + fail(e.getMessage()); + } + + } + + /** + * Test non-public API + */ + public void testAccessor2() throws Exception + { + try { + QName name = new QName("http://tempuri.org/";, "inByteArray"); + Class<RetByteArray> aClass = RetByteArray.class; + JAXBContext ctx = JAXBContext.newInstance("org.jboss.test.ws.interop.soapwsdl.basedoclitw"); + RawAccessor accessor = ((JAXBRIContext)ctx).getElementPropertyAccessor(aClass, name.getNamespaceURI(), name.getLocalPart()); + assertNotNull(accessor); + RetByteArray byteArray = new RetByteArray(); + accessor.set(byteArray, "Hello World".getBytes()); + assertEquals(accessor.get(byteArray), "Hello World".getBytes()); + } catch (JAXBException e) { + fail(e.getMessage()); + } + + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb (from rev 2187, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/basedoclitb) Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-01-30 10:14:19 UTC (rev 2187) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-01-30 10:30:50 UTC (rev 2190) @@ -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.interop.soapwsdl.gen.basedoclitb; +package org.jboss.test.ws.interop.soapwsdl.basedoclitb; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/basedoclitb/ServiceImpl.java 2007-01-30 10:14:19 UTC (rev 2187) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/ServiceImpl.java 2007-01-30 10:30:50 UTC (rev 2190) @@ -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.interop.soapwsdl.gen.basedoclitb; +package org.jboss.test.ws.interop.soapwsdl.basedoclitb; import javax.jws.WebMethod; import javax.jws.WebResult; @@ -37,7 +37,7 @@ * @since 29.01.2007 */ @WebService( - endpointInterface = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitb.IBaseDataTypesDocLitB" + endpointInterface = "org.jboss.test.ws.interop.soapwsdl.basedoclitb.IBaseDataTypesDocLitB" ) public class ServiceImpl implements IBaseDataTypesDocLitB { @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitB/RetBool") Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw (from rev 2187, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/basedoclitw) Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-01-30 10:14:19 UTC (rev 2187) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-01-30 10:30:50 UTC (rev 2190) @@ -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.interop.soapwsdl.gen.basedoclitw; +package org.jboss.test.ws.interop.soapwsdl.basedoclitw; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI; @@ -51,7 +51,7 @@ { super.setUp(); - if (org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.BaseDataTypesDocLitWTestCase.targetPort == null) + if (org.jboss.test.ws.interop.soapwsdl.basedoclitw.BaseDataTypesDocLitWTestCase.targetPort == null) { URL wsdlLocation = new File("resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl").toURL(); Service service = Service.create(wsdlLocation, new QName("", "BaseDataTypesDocLitWService") ); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/gen/basedoclitw/ServiceImpl.java 2007-01-30 10:14:19 UTC (rev 2187) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/ServiceImpl.java 2007-01-30 10:30:50 UTC (rev 2190) @@ -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.interop.soapwsdl.gen.basedoclitw; +package org.jboss.test.ws.interop.soapwsdl.basedoclitw; import javax.jws.WebMethod; import javax.jws.WebResult; @@ -40,176 +40,176 @@ public class ServiceImpl implements IBaseDataTypesDocLitW { @WebMethod(operationName = "RetBool", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetBool") @WebResult(name = "RetBoolResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetBool", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetBool") - @ResponseWrapper(localName = "RetBoolResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetBoolResponse") + @RequestWrapper(localName = "RetBool", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetBool") + @ResponseWrapper(localName = "RetBoolResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetBoolResponse") public Boolean retBool(@WebParam(name = "inBool", targetNamespace = "http://tempuri.org/") Boolean inBool) { return inBool; } @WebMethod(operationName = "RetByte", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetByte") @WebResult(name = "RetByteResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetByte", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetByte") - @ResponseWrapper(localName = "RetByteResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetByteResponse") + @RequestWrapper(localName = "RetByte", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByte") + @ResponseWrapper(localName = "RetByteResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteResponse") public Short retByte(@WebParam(name = "inByte", targetNamespace = "http://tempuri.org/") Short inByte) { return inByte; } @WebMethod(operationName = "RetSByte", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetSByte") @WebResult(name = "RetSByteResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetSByte", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetSByte") - @ResponseWrapper(localName = "RetSByteResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetSByteResponse") + @RequestWrapper(localName = "RetSByte", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetSByte") + @ResponseWrapper(localName = "RetSByteResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetSByteResponse") public Byte retSByte(@WebParam(name = "inSByte", targetNamespace = "http://tempuri.org/") Byte inSByte) { return inSByte; } @WebMethod(operationName = "RetByteArray", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetByteArray") @WebResult(name = "RetByteArrayResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetByteArray", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetByteArray") - @ResponseWrapper(localName = "RetByteArrayResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetByteArrayResponse") + @RequestWrapper(localName = "RetByteArray", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray") + @ResponseWrapper(localName = "RetByteArrayResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArrayResponse") public byte[] retByteArray(@WebParam(name = "inByteArray", targetNamespace = "http://tempuri.org/") byte[] inByteArray) { return inByteArray; } @WebMethod(operationName = "RetChar", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetChar") @WebResult(name = "RetCharResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetChar", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetChar") - @ResponseWrapper(localName = "RetCharResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetCharResponse") + @RequestWrapper(localName = "RetChar", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetChar") + @ResponseWrapper(localName = "RetCharResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetCharResponse") public Integer retChar(@WebParam(name = "inChar", targetNamespace = "http://tempuri.org/") Integer inChar) { return inChar; } @WebMethod(operationName = "RetDecimal", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetDecimal") @WebResult(name = "RetDecimalResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetDecimal", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetDecimal") - @ResponseWrapper(localName = "RetDecimalResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetDecimalResponse") + @RequestWrapper(localName = "RetDecimal", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetDecimal") + @ResponseWrapper(localName = "RetDecimalResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetDecimalResponse") public BigDecimal retDecimal(@WebParam(name = "inDecimal", targetNamespace = "http://tempuri.org/") BigDecimal inDecimal) { return inDecimal; } @WebMethod(operationName = "RetFloat", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetFloat") @WebResult(name = "RetFloatResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetFloat", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetFloat") - @ResponseWrapper(localName = "RetFloatResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetFloatResponse") + @RequestWrapper(localName = "RetFloat", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetFloat") + @ResponseWrapper(localName = "RetFloatResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetFloatResponse") public Float retFloat(@WebParam(name = "inFloat", targetNamespace = "http://tempuri.org/") Float inFloat) { return inFloat; } @WebMethod(operationName = "RetDouble", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetDouble") @WebResult(name = "RetDoubleResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetDouble", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetDouble") - @ResponseWrapper(localName = "RetDoubleResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetDoubleResponse") + @RequestWrapper(localName = "RetDouble", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetDouble") + @ResponseWrapper(localName = "RetDoubleResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetDoubleResponse") public Double retDouble(@WebParam(name = "inDouble", targetNamespace = "http://tempuri.org/") Double inDouble) { return inDouble; } @WebMethod(operationName = "RetSingle", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetSingle") @WebResult(name = "RetSingleResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetSingle", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetSingle") - @ResponseWrapper(localName = "RetSingleResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetSingleResponse") + @RequestWrapper(localName = "RetSingle", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetSingle") + @ResponseWrapper(localName = "RetSingleResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetSingleResponse") public Float retSingle(@WebParam(name = "inSingle", targetNamespace = "http://tempuri.org/") Float inSingle) { return inSingle; } @WebMethod(operationName = "RetInt", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetInt") @WebResult(name = "RetIntResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetInt", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetInt") - @ResponseWrapper(localName = "RetIntResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetIntResponse") + @RequestWrapper(localName = "RetInt", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetInt") + @ResponseWrapper(localName = "RetIntResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetIntResponse") public Integer retInt(@WebParam(name = "inInt", targetNamespace = "http://tempuri.org/") Integer inInt) { return inInt; } @WebMethod(operationName = "RetShort", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetShort") @WebResult(name = "RetShortResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetShort", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetShort") - @ResponseWrapper(localName = "RetShortResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetShortResponse") + @RequestWrapper(localName = "RetShort", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetShort") + @ResponseWrapper(localName = "RetShortResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetShortResponse") public Short retShort(@WebParam(name = "inShort", targetNamespace = "http://tempuri.org/") Short inShort) { return inShort; } @WebMethod(operationName = "RetLong", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetLong") @WebResult(name = "RetLongResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetLong", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetLong") - @ResponseWrapper(localName = "RetLongResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetLongResponse") + @RequestWrapper(localName = "RetLong", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetLong") + @ResponseWrapper(localName = "RetLongResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetLongResponse") public Long retLong(@WebParam(name = "inLong", targetNamespace = "http://tempuri.org/") Long inLong) { return inLong; } @WebMethod(operationName = "RetObject", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetObject") @WebResult(name = "RetObjectResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetObject", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetObject") - @ResponseWrapper(localName = "RetObjectResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetObjectResponse") + @RequestWrapper(localName = "RetObject", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetObject") + @ResponseWrapper(localName = "RetObjectResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetObjectResponse") public Object retObject(@WebParam(name = "inObject", targetNamespace = "http://tempuri.org/") Object inObject) { return inObject; } @WebMethod(operationName = "RetUInt", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetUInt") @WebResult(name = "RetUIntResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetUInt", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetUInt") - @ResponseWrapper(localName = "RetUIntResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetUIntResponse") + @RequestWrapper(localName = "RetUInt", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetUInt") + @ResponseWrapper(localName = "RetUIntResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetUIntResponse") public Long retUInt(@WebParam(name = "inUInt", targetNamespace = "http://tempuri.org/") Long inUInt) { return inUInt; } @WebMethod(operationName = "RetUShort", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetUShort") @WebResult(name = "RetUShortResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetUShort", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetUShort") - @ResponseWrapper(localName = "RetUShortResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetUShortResponse") + @RequestWrapper(localName = "RetUShort", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetUShort") + @ResponseWrapper(localName = "RetUShortResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetUShortResponse") public Integer retUShort(@WebParam(name = "inUShort", targetNamespace = "http://tempuri.org/") Integer inUShort) { return inUShort; } @WebMethod(operationName = "RetULong", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetULong") @WebResult(name = "RetULongResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetULong", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetULong") - @ResponseWrapper(localName = "RetULongResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetULongResponse") + @RequestWrapper(localName = "RetULong", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetULong") + @ResponseWrapper(localName = "RetULongResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetULongResponse") public BigInteger retULong(@WebParam(name = "inULong", targetNamespace = "http://tempuri.org/") BigInteger inULong) { return inULong; } @WebMethod(operationName = "RetString", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetString") @WebResult(name = "RetStringResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetString", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetString") - @ResponseWrapper(localName = "RetStringResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetStringResponse") + @RequestWrapper(localName = "RetString", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetString") + @ResponseWrapper(localName = "RetStringResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetStringResponse") public String retString(@WebParam(name = "inString", targetNamespace = "http://tempuri.org/") String inString) { return inString; } @WebMethod(operationName = "RetGuid", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetGuid") @WebResult(name = "RetGuidResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetGuid", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetGuid") - @ResponseWrapper(localName = "RetGuidResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetGuidResponse") + @RequestWrapper(localName = "RetGuid", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetGuid") + @ResponseWrapper(localName = "RetGuidResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetGuidResponse") public String retGuid(@WebParam(name = "inGuid", targetNamespace = "http://tempuri.org/") String inGuid) { return inGuid; } @WebMethod(operationName = "RetUri", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetUri") @WebResult(name = "RetUriResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetUri", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetUri") - @ResponseWrapper(localName = "RetUriResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetUriResponse") + @RequestWrapper(localName = "RetUri", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetUri") + @ResponseWrapper(localName = "RetUriResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetUriResponse") public String retUri(@WebParam(name = "inUri", targetNamespace = "http://tempuri.org/") String inUri) { return inUri; } @WebMethod(operationName = "RetDateTime", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetDateTime") @WebResult(name = "RetDateTimeResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetDateTime", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetDateTime") - @ResponseWrapper(localName = "RetDateTimeResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetDateTimeResponse") + @RequestWrapper(localName = "RetDateTime", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetDateTime") + @ResponseWrapper(localName = "RetDateTimeResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetDateTimeResponse") public XMLGregorianCalendar retDateTime(@WebParam(name = "inDateTime", targetNamespace = "http://tempuri.org/") XMLGregorianCalendar inDateTime) { return inDateTime; } @WebMethod(operationName = "RetTimeSpan", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetTimeSpan") @WebResult(name = "RetTimeSpanResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetTimeSpan", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetTimeSpan") - @ResponseWrapper(localName = "RetTimeSpanResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetTimeSpanResponse") + @RequestWrapper(localName = "RetTimeSpan", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetTimeSpan") + @ResponseWrapper(localName = "RetTimeSpanResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetTimeSpanResponse") public Duration retTimeSpan(@WebParam(name = "inTimeSpan", targetNamespace = "http://tempuri.org/") Duration inTimeSpan) { return inTimeSpan; } @WebMethod(operationName = "RetQName", action = "http://tempuri.org/IBaseDataTypesDocLitW/RetQName") @WebResult(name = "RetQNameResult", targetNamespace = "http://tempuri.org/") - @RequestWrapper(localName = "RetQName", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetQName") - @ResponseWrapper(localName = "RetQNameResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.RetQNameResponse") + @RequestWrapper(localName = "RetQName", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetQName") + @ResponseWrapper(localName = "RetQNameResponse", targetNamespace = "http://tempuri.org/", className = "org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetQNameResponse") public QName retQName(@WebParam(name = "inQName", targetNamespace = "http://tempuri.org/") QName inQName) { return inQName; } Modified: trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml 2007-01-30 10:26:37 UTC (rev 2189) +++ trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml 2007-01-30 10:30:50 UTC (rev 2190) @@ -6,7 +6,7 @@ <display-name>BaseDataTypesDocLitB_Service App</display-name> <servlet> <servlet-name>ServiceServlet</servlet-name> - <servlet-class>org.jboss.test.ws.interop.soapwsdl.gen.basedoclitb.ServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.interop.soapwsdl.basedoclitb.ServiceImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>ServiceServlet</servlet-name> Modified: trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml 2007-01-30 10:26:37 UTC (rev 2189) +++ trunk/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml 2007-01-30 10:30:50 UTC (rev 2190) @@ -6,7 +6,7 @@ <display-name>BaseDataTypesDocLitW_Service App</display-name> <servlet> <servlet-name>ServiceServlet</servlet-name> - <servlet-class>org.jboss.test.ws.interop.soapwsdl.gen.basedoclitw.ServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.interop.soapwsdl.basedoclitw.ServiceImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>ServiceServlet</servlet-name>