[jbossws-commits] JBossWS SVN: r3392 - in trunk: integration/xfire/src/main/java/org/jboss/wsf/stack/xfire and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-06-02 10:14:20 -0400 (Sat, 02 Jun 2007) New Revision: 3392 Modified: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java trunk/integration/xfire/src/test/resources/excludes-jboss42.txt trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 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: Assign jira issues to xfire excludes Modified: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-06-02 13:11:16 UTC (rev 3391) +++ trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-06-02 14:14:20 UTC (rev 3392) @@ -2,7 +2,16 @@ # $Id$ # -# [JBWS-1699] Fix WebServiceContext.getMessageContext() +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + +# [JBWS-1669] Fix WebServiceContext.getMessageContext() org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java # [JBWS-1673] Fix JAXR samples for SunRI @@ -11,8 +20,3 @@ # [JBWS-1674] Fix @WebServiceRef with SunRI org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/webserviceref/** - -# Exclude JBossWS-Native stuff -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-02 13:11:16 UTC (rev 3391) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-02 14:14:20 UTC (rev 3392) @@ -2,7 +2,16 @@ # $Id$ # -# [JBWS-1699] Fix WebServiceContext.getMessageContext() +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + +# [JBWS-1669] Fix WebServiceContext.getMessageContext() org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java # [JBWS-1673] Fix JAXR samples for SunRI @@ -11,8 +20,3 @@ # [JBWS-1674] Fix @WebServiceRef with SunRI org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/webserviceref/** - -# Exclude JBossWS-Native stuff -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-06-02 13:11:16 UTC (rev 3391) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -48,6 +48,7 @@ InvocationHandler invHandler = ep.getInvocationHandler(); Invocation inv = invHandler.createInvocation(); + //inv.getInvocationContext().addAttachment(WebServiceContext.class, new WebServiceContextJSE(context)); inv.getInvocationContext().addAttachment(MessageContext.class, context); inv.setJavaMethod(m); inv.setArgs(params); Modified: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-06-02 13:11:16 UTC (rev 3391) +++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-06-02 14:14:20 UTC (rev 3392) @@ -2,24 +2,45 @@ # $Id$ # +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + +# [JBWS-1682] XFire does not generate proper service name org/jboss/test/ws/jaxws/samples/asynchronous/** -org/jboss/test/ws/jaxws/samples/context/** org/jboss/test/ws/jaxws/samples/exception/** org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/xop/** + +# [JBWS-1685] Add support for WebServiceContext propagation +org/jboss/test/ws/jaxws/samples/context/** + +# [JBWS-1686] Add support for @Provider org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/** + +# [JBWS-1683] Fix JAXR samples for XFire org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1687] Add support for @HandlerChain org/jboss/test/ws/jaxws/samples/logicalhandler/** -org/jboss/test/ws/jaxws/samples/oneway/** -org/jboss/test/ws/jaxws/samples/provider/** + +# [JBWS-1684] Fix @WebServiceRef with XFire org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# [JBWS-1689] Add support for SwaRef org/jboss/test/ws/jaxws/samples/swaref/** -org/jboss/test/ws/jaxws/samples/webmethod/** + +# [JBWS-1688] Fix @WebParam, @WebResult handling org/jboss/test/ws/jaxws/samples/webparam/** org/jboss/test/ws/jaxws/samples/webresult/** -org/jboss/test/ws/jaxws/samples/webservice/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -org/jboss/test/ws/jaxws/samples/xop/** Modified: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-06-02 13:11:16 UTC (rev 3391) +++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-06-02 14:14:20 UTC (rev 3392) @@ -2,24 +2,45 @@ # $Id$ # +################################################################### +# Exclude JBossWS-Native stuff +# +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +# +################################################################### + +# [JBWS-1682] XFire does not generate proper service name org/jboss/test/ws/jaxws/samples/asynchronous/** -org/jboss/test/ws/jaxws/samples/context/** org/jboss/test/ws/jaxws/samples/exception/** org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/xop/** + +# [JBWS-1685] Add support for WebServiceContext propagation +org/jboss/test/ws/jaxws/samples/context/** + +# [JBWS-1686] Add support for @Provider org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/** + +# [JBWS-1683] Fix JAXR samples for XFire org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1687] Add support for @HandlerChain org/jboss/test/ws/jaxws/samples/logicalhandler/** -org/jboss/test/ws/jaxws/samples/oneway/** -org/jboss/test/ws/jaxws/samples/provider/** + +# [JBWS-1684] Fix @WebServiceRef with XFire org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# [JBWS-1689] Add support for SwaRef org/jboss/test/ws/jaxws/samples/swaref/** -org/jboss/test/ws/jaxws/samples/webmethod/** + +# [JBWS-1688] Fix @WebParam, @WebResult handling org/jboss/test/ws/jaxws/samples/webparam/** org/jboss/test/ws/jaxws/samples/webresult/** -org/jboss/test/ws/jaxws/samples/webservice/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -org/jboss/test/ws/jaxws/samples/xop/** 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -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, "TestEndpointBeanService"); + QName serviceName = new QName(targetNS, "TestEndpointService"); 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -32,7 +32,7 @@ import javax.xml.ws.AsyncHandler; import javax.xml.ws.Response; -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -29,6 +29,8 @@ 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; @@ -38,10 +40,12 @@ import org.jboss.annotation.security.SecurityDomain; import org.jboss.wsf.spi.annotation.WebContext; -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", 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 @@ -50,6 +54,7 @@ WebServiceContext wsCtx; @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetMessageContext() { MessageContext jaxwsContext = (MessageContext)wsCtx.getMessageContext(); @@ -57,6 +62,7 @@ } @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetUserPrincipal() { Principal principal = wsCtx.getUserPrincipal(); @@ -64,7 +70,8 @@ } @WebMethod - public boolean testIsUserInRole(String role) + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public boolean testIsUserInRole(@WebParam(name = "arg0") 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -27,6 +27,8 @@ 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; @@ -41,6 +43,7 @@ WebServiceContext wsCtx; @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetMessageContext() { MessageContext jaxwsContext = (MessageContext)wsCtx.getMessageContext(); @@ -48,6 +51,7 @@ } @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") public String testGetUserPrincipal() { Principal principal = wsCtx.getUserPrincipal(); @@ -55,7 +59,8 @@ } @WebMethod - public boolean testIsUserInRole(String role) + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public boolean testIsUserInRole(@WebParam(name = "arg0") 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -1,4 +1,3 @@ - package org.jboss.test.ws.jaxws.samples.context; import javax.jws.WebMethod; @@ -8,46 +7,20 @@ 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 { +public interface TestEndpoint +{ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public String testGetMessageContext(); + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public String testGetUserPrincipal(); - /** - * - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public String testGetMessageContext(); + @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 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -23,7 +23,7 @@ import javax.jws.WebService; -@WebService +@WebService(serviceName="ExceptionEndpointService") 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -28,7 +28,7 @@ import javax.xml.soap.SOAPFault; import javax.xml.ws.soap.SOAPFaultException; -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.exception.ExceptionEndpoint") +@WebService(serviceName="ExceptionEndpointService", 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -54,7 +54,7 @@ { super.setUp(); - QName serviceName = new QName(targetNS, "ExceptionEndpointImplService"); + QName serviceName = new QName(targetNS, "ExceptionEndpointService"); 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 13:11:16 UTC (rev 3391) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java 2007-06-02 14:14:20 UTC (rev 3392) @@ -22,13 +22,16 @@ 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") +@WebService (name="TestEndpoint", serviceName="TestEndpointService") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface TestEndpoint { @WebMethod(operationName = "echoString", action = "urn:EchoString") - String echo(String input); + @WebResult(name = "result") + String echo(@WebParam(name = "arg0") String input); }