Author: jason.greene(a)jboss.com Date: 2006-10-11 18:27:39 -0400 (Wed, 11 Oct 2006) New Revision: 1214 Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java trunk/src/test/build.xml trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java trunk/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl Log: Fix JBWS-944 test case Fix signature item position Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-11 21:37:48 UTC (rev 1213) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-11 22:27:39 UTC (rev 1214) @@ -241,8 +241,8 @@ public void addRpcSignatureItem(WSDLRPCSignatureItem item) { + item.setPosition(rpcSignatureItems.size()); rpcSignatureItems.put(item.getName(), item); - item.setPosition(rpcSignatureItems.size()); } public WSDLRPCSignatureItem getRpcSignatureitem(String name) Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-10-11 21:37:48 UTC (rev 1213) +++ trunk/src/test/build.xml 2006-10-11 22:27:39 UTC (rev 1214) @@ -406,7 +406,7 @@ --> <target name="one-test" depends="init" if="test" description="Run a single unit test"> <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}"> - <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" --> + <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5007"--/> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2006-10-11 21:37:48 UTC (rev 1213) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2006-10-11 22:27:39 UTC (rev 1214) @@ -24,6 +24,8 @@ import javax.ejb.Remote; import javax.ejb.Stateless; import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -35,7 +37,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(name = "EndpointInterface", targetNamespace = "http://org.jboss.ws/samples/jsr181ejb", serviceName = "TestService") +@WebService(name = "EndpointInterface", targetNamespace = "http://org.jboss.ws/jbws944", serviceName = "TestService") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") @@ -43,7 +45,8 @@ public class EJB3Bean01 implements EJB3RemoteInterface { @WebMethod - public String echo(String input) + @WebResult(name="result") + public String echo(@WebParam(name="String_1") String input) { return input; } Modified: trunk/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl =================================================================== --- trunk/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl 2006-10-11 21:37:48 UTC (rev 1213) +++ trunk/src/test/resources/jaxws/jbws944/META-INF/wsdl/TestService.wsdl 2006-10-11 22:27:39 UTC (rev 1214) @@ -1,4 +1,4 @@ -<definitions name='TestService' targetNamespace='http://org.jboss.ws/samples/jsr181ejb' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/jsr181ejb' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<definitions name='TestService' targetNamespace='http://org.jboss.ws/jbws944' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jbws944' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types></types> <message name='EndpointInterface_echoResponse'> <part name='result' type='xsd:string'/> @@ -17,10 +17,10 @@ <operation name='echo'> <soap:operation soapAction=''/> <input> - <soap:body namespace='http://org.jboss.ws/samples/jsr181ejb' use='literal'/> + <soap:body namespace='http://org.jboss.ws/jbws944' use='literal'/> </input> <output> - <soap:body namespace='http://org.jboss.ws/samples/jsr181ejb' use='literal'/> + <soap:body namespace='http://org.jboss.ws/jbws944' use='literal'/> </output> </operation> </binding> @@ -29,4 +29,4 @@ <soap:address location='http://@jbosstest.host.name@:8080/jaxws-jbws944/FooBean01'/> </port> </service> -</definitions> \ No newline at end of file +</definitions>