Author: thomas.diesler(a)jboss.com Date: 2007-06-02 10:59:15 -0400 (Sat, 02 Jun 2007) New Revision: 3393 Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java Log: Rollback possibly invalid changes for xfire Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -104,7 +104,7 @@ private TestEndpoint createProxy() throws MalformedURLException { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl"); - QName serviceName = new QName(targetNS, "TestEndpointService"); + QName serviceName = new QName(targetNS, "TestEndpointBeanService"); Service service = Service.create(wsdlURL, serviceName); return (TestEndpoint)service.getPort(TestEndpoint.class); } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -32,7 +32,7 @@ import javax.xml.ws.AsyncHandler; import javax.xml.ws.Response; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") @SOAPBinding(style = Style.RPC) public interface TestEndpoint { Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") @SOAPBinding(style = Style.RPC) public class TestEndpointBean { Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -29,8 +29,6 @@ import javax.annotation.security.RolesAllowed; 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; import javax.jws.soap.SOAPBinding.Style; @@ -40,12 +38,10 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.wsf.spi.annotation.WebContext; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/context") +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) - -@WebContext(contextRoot = "/jaxws-samples-context", urlPattern = "/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) - @Stateless +@WebContext(contextRoot = "/jaxws-samples-context", urlPattern = "/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) @SecurityDomain("JBossWS") @RolesAllowed("friend") public class EndpointEJB @@ -54,7 +50,6 @@ WebServiceContext wsCtx; @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetMessageContext() { MessageContext jaxwsContext = (MessageContext)wsCtx.getMessageContext(); @@ -62,7 +57,6 @@ } @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetUserPrincipal() { Principal principal = wsCtx.getUserPrincipal(); @@ -70,8 +64,7 @@ } @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public boolean testIsUserInRole(@WebParam(name = "arg0") String role) + public boolean testIsUserInRole(String role) { return wsCtx.isUserInRole(role); } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -27,8 +27,6 @@ import javax.annotation.Resource; import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding.Style; @@ -43,7 +41,6 @@ WebServiceContext wsCtx; @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetMessageContext() { MessageContext jaxwsContext = (MessageContext)wsCtx.getMessageContext(); @@ -51,7 +48,6 @@ } @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetUserPrincipal() { Principal principal = wsCtx.getUserPrincipal(); @@ -59,8 +55,7 @@ } @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public boolean testIsUserInRole(@WebParam(name = "arg0") String role) + public boolean testIsUserInRole(String role) { return wsCtx.isUserInRole(role); } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -1,3 +1,4 @@ + package org.jboss.test.ws.jaxws.samples.context; import javax.jws.WebMethod; @@ -7,20 +8,46 @@ import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding.Style; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) -public interface TestEndpoint -{ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public String testGetMessageContext(); +public interface TestEndpoint { - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public String testGetUserPrincipal(); - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public boolean testIsUserInRole(@WebParam(name = "arg0") String arg0); + /** + * + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public String testGetMessageContext(); + /** + * + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public String testGetUserPrincipal(); + + /** + * + * @param arg0 + * @return + * returns boolean + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public boolean testIsUserInRole( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -23,7 +23,7 @@ import javax.jws.WebService; -@WebService(serviceName="ExceptionEndpointService") +@WebService public interface ExceptionEndpoint { public void throwRuntimeException(); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -28,7 +28,7 @@ import javax.xml.soap.SOAPFault; import javax.xml.ws.soap.SOAPFaultException; -@WebService(serviceName="ExceptionEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpoint") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpoint") public class ExceptionEndpointImpl implements ExceptionEndpoint { public void throwRuntimeException() Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -54,7 +54,7 @@ { super.setUp(); - QName serviceName = new QName(targetNS, "ExceptionEndpointService"); + QName serviceName = new QName(targetNS, "ExceptionEndpointImplService"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-exception/ExceptionEndpointService?wsdl"); Service service = Service.create(wsdlURL, serviceName); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java 2007-06-02 14:59:15 UTC (rev 3393) @@ -22,16 +22,13 @@ package org.jboss.test.ws.jaxws.samples.webmethod; import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -@WebService (name="TestEndpoint", serviceName="TestEndpointService") +@WebService (name="TestEndpoint") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface TestEndpoint { @WebMethod(operationName = "echoString", action = "urn:EchoString") - @WebResult(name = "result") - String echo(@WebParam(name = "arg0") String input); + String echo(String input); }