Author: asoldano Date: 2014-08-25 11:04:31 -0400 (Mon, 25 Aug 2014) New Revision: 18865 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointService.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/EndpointOneService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/HelloService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java Log: [JBWS-3821][JBWS-3820] Adding JAXWS 2.2 additional constructors to a bunch of test JAX-WS Service classes that are used for WebServiceRef injection Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/webserviceref/EndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -53,6 +53,10 @@ super(wsdlLocation, serviceName); } + public EndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + public EndpointService() { super(WSDL_LOCATION, TESTENDPOINTSERVICE); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/EndpointOneService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/EndpointOneService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/EndpointOneService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -31,6 +31,10 @@ super(wsdlLocation, serviceName); } + public EndpointOneService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + @WebEndpoint(name = "EndpointOne") public EndpointOne getSheepWSPort() { return super.getPort(new QName("http://org.jboss.ws.jaxws.cxf/jbws3679", "EndpointOnePort"), EndpointOne.class); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -26,6 +26,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; @WebServiceClient(name="EndpointService", targetNamespace="http://jbws1581.jaxws.ws.test.jboss.org/") public class EndpointService extends javax.xml.ws.Service @@ -36,6 +37,10 @@ super(wsdlLocation, serviceName); } + public EndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + @WebEndpoint(name = "EndpointBeanPort") public EndpointInterface getEndpointPort() { return (EndpointInterface)super.getPort(TESTENDPOINTPORT, EndpointInterface.class); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -26,6 +26,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; @WebServiceClient(name="EndpointService", targetNamespace="http://www.openuri.org/2004/04/HelloWorld") public class EndpointService extends javax.xml.ws.Service @@ -36,6 +37,10 @@ super(wsdlLocation, serviceName); } + public EndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + @WebEndpoint(name = "EJB3BeanPort") public EndpointInterface getEndpointPort() { return (EndpointInterface)super.getPort(TESTENDPOINTPORT, EndpointInterface.class); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/ClientServlet.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -44,7 +44,7 @@ @MTOM @RespectBinding @Addressing -@WebServiceRef(name="service/jbws2307service/asdf", type=HelloService.class) +@WebServiceRef(name="service/jbws2307service/asdf", type=HelloServiceJAXWS22.class) public class ClientServlet extends HttpServlet { @@ -53,7 +53,7 @@ private final Logger log = Logger.getLogger(ClientServlet.class); @WebServiceRef(name="service/jbws2307service") - HelloService service; + HelloServiceJAXWS22 service; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -23,7 +23,6 @@ import java.io.File; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTestHelper; public final class DeploymentArchives @@ -33,7 +32,6 @@ .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") @@ -72,7 +70,7 @@ .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class) .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/HelloService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/HelloService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/HelloService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -27,6 +27,7 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; @WebServiceClient(name = "HelloService", targetNamespace = "http://helloservice.org/wsdl", wsdlLocation = "WEB-INF/wsdl/HelloService.wsdl") public class HelloService extends Service @@ -38,6 +39,11 @@ super(wsdlLocation, serviceName); } + public HelloService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) + { + super(wsdlLocation, serviceName, features); + } + public HelloService() { super(HELLOSERVICE_WSDL_LOCATION, new QName("http://helloservice.org/wsdl";, "HelloService")); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/cc/CCVerificationService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -28,6 +28,7 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; /** * This class was generated by the JAXWS SI. @@ -56,6 +57,10 @@ super(wsdlLocation, serviceName); } + public CCVerificationService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + public CCVerificationService() { super(CCVERIFICATIONSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/samples/retail/cc", "CCVerificationService")); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/profile/ProfileMgmtService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -28,11 +28,10 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; /** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-10/21/2006 12:56 AM(vivek)-EA2 - * Generated source version: 2.0 + * Class generated by tools */ @WebServiceClient(name = "ProfileMgmtService", targetNamespace = "http://org.jboss.ws/samples/retail/profile", wsdlLocation = "resources/jaxws/samples/retail/META-INF/wsdl/ProfileMgmtService.wsdl") public class ProfileMgmtService @@ -55,6 +54,10 @@ super(wsdlLocation, serviceName); } + public ProfileMgmtService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + public ProfileMgmtService() { super(PROFILEMGMTSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/samples/retail/profile", "ProfileMgmtService")); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -28,6 +28,7 @@ import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; /** * JBossWS Generated Source @@ -63,6 +64,10 @@ super(wsdlLocation, serviceName); } + public EndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + public EndpointService() { super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService")); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -72,6 +72,11 @@ super(wsdlLocation, serviceName); } + public EndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) + { + super(wsdlLocation, serviceName, features); + } + /** * * @return Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -66,6 +66,11 @@ super(wsdlLocation, serviceName); } + public MultipleEndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) + { + super(wsdlLocation, serviceName, features); + } + /** * * @return Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java 2014-08-25 15:02:32 UTC (rev 18864) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.java 2014-08-25 15:04:31 UTC (rev 18865) @@ -72,6 +72,11 @@ super(wsdlLocation, serviceName); } + public EndpointService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) + { + super(wsdlLocation, serviceName, features); + } + /** * * @return