Author: heiko.braun(a)jboss.com Date: 2008-01-09 06:39:53 -0500 (Wed, 09 Jan 2008) New Revision: 5432 Removed: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/jaxws/ Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/metro-trunk.iml stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java Log: Create JAXWS 2.0 artifacts Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-09 10:11:35 UTC (rev 5431) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-09 11:39:53 UTC (rev 5432) @@ -25,8 +25,8 @@ <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> - <include name="org/jboss/test/ws/wsit/rm/jaxws/Add.class"/> - <include name="org/jboss/test/ws/wsit/rm/jaxws/AddResponse.class"/> + <include name="org/jboss/test/ws/wsit/rm/Add.class"/> + <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/> </classes> <webinf dir="${tests.output.dir}/resources/wsit/rm/WEB-INF"> <include name="sun-web.xml"/> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-01-09 10:11:35 UTC (rev 5431) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-01-09 11:39:53 UTC (rev 5432) @@ -79,7 +79,8 @@ sourcedestdir="${tests.output.dir}/wsimport" keep="true" verbose="false" - package="org.jboss.test.ws.wsit.rm"/> + package="org.jboss.test.ws.wsit.rm" + target="2.0"/> </target> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-01-09 10:11:35 UTC (rev 5431) +++ stack/metro/trunk/metro-trunk.iml 2008-01-09 11:39:53 UTC (rev 5432) @@ -4,8 +4,10 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/output/tests/wsimport" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> Modified: stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-01-09 10:11:35 UTC (rev 5431) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/wsit/rm/CalculatorWSImpl.java 2008-01-09 11:39:53 UTC (rev 5432) @@ -33,6 +33,9 @@ import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.jws.WebResult; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; /** * @@ -49,8 +52,15 @@ /** * Web service operation */ - @WebMethod(operationName = "add") - public int add(@WebParam(name = "i") int i, @WebParam(name = "j") int j) + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "add", targetNamespace = "http://calculator.me.org/", className = "org.jboss.test.ws.wsit.rm.Add") + @ResponseWrapper(localName = "addResponse", targetNamespace = "http://calculator.me.org/", className = "org.jboss.test.ws.wsit.rm.AddResponse") + public int add( + @WebParam(name = "i", targetNamespace = "") + int i, + @WebParam(name = "j", targetNamespace = "") + int j) { int result = i + j;