Author: thomas.diesler(a)jboss.com Date: 2008-04-21 08:35:36 -0400 (Mon, 21 Apr 2008) New Revision: 6569 Added: framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl Removed: framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/TestEndpoint.wsdl Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl framework/trunk/testsuite/test/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/provider/message/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/provider/payload/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jaxrpc-mapping.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/application-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml Log: Test* classes are picked up by surefire Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -48,7 +48,7 @@ * @author darran.lofthouse(a)jboss.com * @since 19-October-2006 */ -@WebService(name = "", serviceName = "EndpointService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") +@WebService(name = "", serviceName = "EndpointService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.Endpoint") public class EndpointImpl implements Endpoint { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -55,14 +55,14 @@ { if (port == null) { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/Endpoint?wsdl"); QName qname = new QName("http://org.jboss/test/ws/jbws1190", "EndpointService"); Service service = Service.create(wsdlURL, qname); port = (Endpoint)service.getPort(Endpoint.class); } } - public void testTestEndpoint() throws Exception + public void testEndpoint() throws Exception { port.testAddress(ARCHIVE_NAME, "EndpointService", "http", "8080"); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -54,7 +54,7 @@ { if (port == null) { - URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl"); + URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/context", "EndpointService"); Service service = Service.create(wsdlURL, qname); port = (Endpoint)service.getPort(Endpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -54,7 +54,7 @@ { if (port == null) { - URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl"); + URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/context", "EndpointService"); Service service = Service.create(wsdlURL, qname); port = (Endpoint)service.getPort(Endpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.annotation.WebContext; // Test that the wsdl can be read from the nested deployment -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/Endpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebContext(contextRoot = "/earejb3") @Stateless Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; //Test that the wsdl can be read from the nested deployment -@WebService(name="Endpoint", serviceName="EndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") +@WebService(name="Endpoint", serviceName="EndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/Endpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class JSEBean { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -50,7 +50,7 @@ { InitialContext iniCtx = new InitialContext(); ports.add((Endpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getEndpointPort()); } catch (Exception ex) { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -49,10 +49,10 @@ /** * * @return - * returns TestEndpoint + * returns Endpoint */ @WebEndpoint(name = "EndpointPort") - public Endpoint getTestEndpointPort() { + public Endpoint getEndpointPort() { return (Endpoint)super.getPort(new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointPort"), Endpoint.class); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -69,7 +69,7 @@ if (isTargetJBoss50() == false) return; - URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); + URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"); QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, qname); Endpoint port = (Endpoint)service.getPort(Endpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -69,7 +69,7 @@ // JAXWS <service-ref> is only supported in EE5 if (isTargetJBoss50()) { - URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); + URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"); QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, qname); Endpoint port = (Endpoint)service.getPort(Endpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -66,7 +66,7 @@ if (isTargetJBoss50() == false) return; - URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); + URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"); QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, qname); Endpoint port = (Endpoint)service.getPort(Endpoint.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -55,7 +55,7 @@ { InitialContext iniCtx = new InitialContext(); ports.add((Endpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getEndpointPort()); } catch (Exception ex) { @@ -80,7 +80,7 @@ } // Test the injected service as well - Endpoint injectedPort = injectedService.getTestEndpointPort(); + Endpoint injectedPort = injectedService.getEndpointPort(); String outStr = injectedPort.echo(" injected service"); if (outStr.equals(" injected service") == false) throw new WebServiceException("Invalid echo return on injected service/port: " + inStr); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -32,7 +32,7 @@ * @since 12-Aug-2005 */ -@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint") +@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.Endpoint") public class EndpointImpl { // Provide logging Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -136,7 +136,7 @@ String expPayload = "<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <faultcode>env:Client</faultcode>" + - " <faultstring>Endpoint {http://webmethod.samples.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.samples.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" + + " <faultstring>Endpoint {http://webmethod.samples.jaxws.ws.test.jboss.org/}EndpointPort does not contain operation meta data for: {http://webmethod.samples.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" + "</env:Fault>"; if (isIntegrationCXF()) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -37,7 +37,7 @@ @Stateless // Test on type with wsdlLocation -@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/Endpoint.wsdl") // Test multiple on type @WebServiceRefs( { @@ -88,16 +88,16 @@ try { InitialContext iniCtx = new InitialContext(); - ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getTestEndpointPort()); - ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getEndpointPort()); ports.add((Endpoint)service3.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService3")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/EndpointService3")).getEndpointPort()); ports.add((Endpoint)service4.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service4")).getEndpointPort()); ports.add((Endpoint)service5.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/EndpointService5")).getEndpointPort()); ports.add((Endpoint)service6.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service6")).getEndpointPort()); ports.add((Endpoint)iniCtx.lookup("java:comp.ejb3/env/port1")); ports.add(port2); ports.add((Endpoint)iniCtx.lookup("java:comp.ejb3/env/Port2")); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -33,7 +33,7 @@ import org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint; // Test on type with wsdlLocation -@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/Endpoint.wsdl") // Test multiple on type @WebServiceRefs( { @@ -95,16 +95,16 @@ ArrayList<Endpoint> ports = new ArrayList<Endpoint>(); try { - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service1")).getEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getEndpointPort()); ports.add((Endpoint)service3.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/EndpointService3")).getEndpointPort()); ports.add((Endpoint)service4.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service4")).getEndpointPort()); ports.add((Endpoint)service5.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/EndpointService5")).getEndpointPort()); ports.add((Endpoint)service6.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service6")).getEndpointPort()); ports.add((Endpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((Endpoint)iniCtx.lookup("java:comp/env/Port2")); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -93,7 +93,7 @@ public String testService1(String reqStr) throws Exception { EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service1"); - Endpoint port = service.getTestEndpointPort(); + Endpoint port = service.getEndpointPort(); return port.echo(reqStr); } @@ -115,11 +115,11 @@ */ public String testService3(String reqStr) throws Exception { - Endpoint port = ((EndpointService)service3).getTestEndpointPort(); + Endpoint port = ((EndpointService)service3).getEndpointPort(); String resStr1 = port.echo(reqStr); EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service3"); - port = service.getTestEndpointPort(); + port = service.getEndpointPort(); String resStr2 = port.echo(reqStr); @@ -131,12 +131,12 @@ */ public String testService4(String reqStr) throws Exception { - Endpoint port = service4.getTestEndpointPort(); + Endpoint port = service4.getEndpointPort(); String resStr1 = port.echo(reqStr); //verifyConfig((ConfigProvider)port); EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service4"); - port = service.getTestEndpointPort(); + port = service.getEndpointPort(); //verifyConfig((ConfigProvider)port); String resStr2 = port.echo(reqStr); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -45,10 +45,10 @@ /** * * @return - * returns TestEndpoint + * returns Endpoint */ @WebEndpoint(name = "EndpointPort") - public Endpoint getTestEndpointPort() { + public Endpoint getEndpointPort() { return (Endpoint)super.getPort(TESTENDPOINTPORT, Endpoint.class); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; //Test on type with wsdlLocation -@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") +@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "WEB-INF/wsdl/Endpoint.wsdl") // Test multiple on type @WebServiceRefs( { @@ -89,16 +89,16 @@ try { InitialContext iniCtx = new InitialContext(); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service1")).getEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getEndpointPort()); ports.add((Endpoint)service3.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/EndpointService3")).getEndpointPort()); ports.add((Endpoint)service4.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service4")).getEndpointPort()); ports.add((Endpoint)service5.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/EndpointService5")).getEndpointPort()); ports.add((Endpoint)service6.getPort(Endpoint.class)); - ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getEndpointPort()); ports.add((Endpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((Endpoint)iniCtx.lookup("java:comp/env/Port2")); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -53,7 +53,7 @@ QName serviceQName = new QName("http://org.jboss.ws/wsref", "EndpointService"); EndpointService service = new EndpointService(wsdlURL, serviceQName); - Endpoint port = service.getTestEndpointPort(); + Endpoint port = service.getEndpointPort(); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java 2008-04-21 12:35:36 UTC (rev 6569) @@ -31,7 +31,7 @@ * @author alessio.soldano(a)jboss.org * @since 21-Feb-2008 */ -@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") +@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.Endpoint") public class EndpointImpl { // Provide logging Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -4,12 +4,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.jbws1178.EndpointImpl</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <!-- [JBWS-864] soap:address in wsdl ignores <url-pattern> --> <url-pattern>/testpattern</url-pattern> </servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -9,7 +9,7 @@ </servlet> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.jbws1190.EndpointImpl</servlet-class> </servlet> @@ -19,8 +19,8 @@ </servlet-mapping> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/Endpoint</url-pattern> </servlet-mapping> <security-constraint> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -4,12 +4,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.jbws1854.EndpointImpl</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -6,12 +6,12 @@ version="2.4"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.samples.asynchronous.EndpointBean</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -40,7 +40,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://tdvaio:8080/jaxws-samples-asynchronous/TestEndpoint'/> + <soap:address location='http://tdvaio:8080/jaxws-samples-asynchronous/Endpoint'/> </port> </service> </definitions> \ No newline at end of file Copied: framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl (from rev 6567, framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl) =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -0,0 +1,66 @@ +<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/jaxws/context' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jaxws/context' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types></types> + <message name='Endpoint_testIsUserInRole'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='Endpoint_testGetMessageContext'></message> + <message name='Endpoint_testGetUserPrincipal'></message> + <message name='Endpoint_testGetUserPrincipalResponse'> + <part name='return' type='xsd:string'/> + </message> + <message name='Endpoint_testGetMessageContextResponse'> + <part name='return' type='xsd:string'/> + </message> + <message name='Endpoint_testIsUserInRoleResponse'> + <part name='return' type='xsd:boolean'/> + </message> + <portType name='Endpoint'> + <operation name='GetMessageContext'> + <input message='tns:Endpoint_testGetMessageContext'/> + <output message='tns:Endpoint_testGetMessageContextResponse'/> + </operation> + <operation name='GetUserPrincipal'> + <input message='tns:Endpoint_testGetUserPrincipal'/> + <output message='tns:Endpoint_testGetUserPrincipalResponse'/> + </operation> + <operation name='IsUserInRole' parameterOrder='arg0'> + <input message='tns:Endpoint_testIsUserInRole'/> + <output message='tns:Endpoint_testIsUserInRoleResponse'/> + </operation> + </portType> + <binding name='EndpointBinding' type='tns:Endpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='GetMessageContext'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> + </output> + </operation> + <operation name='GetUserPrincipal'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> + </output> + </operation> + <operation name='IsUserInRole'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> + </output> + </operation> + </binding> + <service name='EndpointService'> + <port binding='tns:EndpointBinding' name='EndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-context'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -1,66 +0,0 @@ -<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/jaxws/context' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jaxws/context' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types></types> - <message name='Endpoint_testIsUserInRole'> - <part name='arg0' type='xsd:string'/> - </message> - <message name='Endpoint_testGetMessageContext'></message> - <message name='Endpoint_testGetUserPrincipal'></message> - <message name='Endpoint_testGetUserPrincipalResponse'> - <part name='return' type='xsd:string'/> - </message> - <message name='Endpoint_testGetMessageContextResponse'> - <part name='return' type='xsd:string'/> - </message> - <message name='Endpoint_testIsUserInRoleResponse'> - <part name='return' type='xsd:boolean'/> - </message> - <portType name='Endpoint'> - <operation name='GetMessageContext'> - <input message='tns:Endpoint_testGetMessageContext'/> - <output message='tns:Endpoint_testGetMessageContextResponse'/> - </operation> - <operation name='GetUserPrincipal'> - <input message='tns:Endpoint_testGetUserPrincipal'/> - <output message='tns:Endpoint_testGetUserPrincipalResponse'/> - </operation> - <operation name='IsUserInRole' parameterOrder='arg0'> - <input message='tns:Endpoint_testIsUserInRole'/> - <output message='tns:Endpoint_testIsUserInRoleResponse'/> - </operation> - </portType> - <binding name='EndpointBinding' type='tns:Endpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='GetMessageContext'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> - </output> - </operation> - <operation name='GetUserPrincipal'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> - </output> - </operation> - <operation name='IsUserInRole'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/> - </output> - </operation> - </binding> - <service name='EndpointService'> - <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-context'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl (from rev 6567, framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl) =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -0,0 +1,48 @@ +<!-- + This wsdl is used for client artifact generation + + wsimport -keep -verbose -d ../../../java ./META-INF/wsdl/Endpoint.wsdl + + $Id$ +--> +<definitions name="EndpointService" + targetNamespace="http://eardeployment.jaxws/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:jbws1616="http://jira.jboss.org/jira/browse/JBWS-1616" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + + <!-- Test a schema import --> + <types> + <xsd:import namespace="http://org.jboss.ws/jaxrpc/types" schemaLocation="TestService.xsd"/> + </types> + + <message name="Endpoint_echoResponse"> + <part name="return" type="xsd:string"/> + </message> + <message name="Endpoint_echo"> + <part name="arg0" type="xsd:string"/> + </message> + <portType name="Endpoint"> + <operation name="echo" parameterOrder="arg0"> + <input message="tns:Endpoint_echo"/> + <output message="tns:Endpoint_echoResponse"/> + </operation> + </portType> + <binding name="EndpointBinding" type="tns:Endpoint"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> + </input> + <output> + <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> + </output> + </operation> + </binding> + <service name="EndpointService"> + <port binding="tns:EndpointBinding" name="EndpointPort"> + <soap:address location="http://REPLACE_ON_DEPLOY"/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -1,48 +0,0 @@ -<!-- - This wsdl is used for client artifact generation - - wsimport -keep -verbose -d ../../../java ./META-INF/wsdl/TestEndpoint.wsdl - - $Id$ ---> -<definitions name="EndpointService" - targetNamespace="http://eardeployment.jaxws/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:jbws1616="http://jira.jboss.org/jira/browse/JBWS-1616" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://eardeployment.jaxws/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <!-- Test a schema import --> - <types> - <xsd:import namespace="http://org.jboss.ws/jaxrpc/types" schemaLocation="TestService.xsd"/> - </types> - - <message name="Endpoint_echoResponse"> - <part name="return" type="xsd:string"/> - </message> - <message name="Endpoint_echo"> - <part name="arg0" type="xsd:string"/> - </message> - <portType name="Endpoint"> - <operation name="echo" parameterOrder="arg0"> - <input message="tns:Endpoint_echo"/> - <output message="tns:Endpoint_echoResponse"/> - </operation> - </portType> - <binding name="EndpointBinding" type="tns:Endpoint"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="echo"> - <soap:operation soapAction=""/> - <input> - <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> - </input> - <output> - <soap:body namespace="http://eardeployment.jaxws/" use="literal"/> - </output> - </operation> - </binding> - <service name="EndpointService"> - <port binding="tns:EndpointBinding" name="EndpointPort"> - <soap:address location="http://REPLACE_ON_DEPLOY"/> - </port> - </service> -</definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -6,11 +6,11 @@ version="2.4"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.samples.httpbinding.ProviderBeanPayload</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/provider/message/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/provider/message/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/provider/message/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -6,11 +6,11 @@ version="2.4"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.samples.provider.ProviderBeanMessage</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/provider/payload/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/provider/payload/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/provider/payload/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -6,11 +6,11 @@ version="2.4"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.samples.provider.ProviderBeanPayload</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -9,15 +9,15 @@ <service-ref> <service-ref-name>service1</service-ref-name> <service-interface>javax.xml.ws.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>META-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>META-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -16,15 +16,15 @@ <service-ref> <service-ref-name>service1</service-ref-name> <service-interface>javax.xml.ws.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>META-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> - <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>META-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jaxrpc-mapping.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jaxrpc-mapping.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jaxrpc-mapping.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -4,17 +4,17 @@ <namespaceURI>http://org.jboss.ws/wsref/types</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:TestEndpointService</wsdl-service-name> + <service-interface>org.jboss.test.ws.jaxrpc.serviceref.EndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:EndpointService</wsdl-service-name> <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> + <port-name>EndpointPort</port-name> + <java-port-name>EndpointPort</java-port-name> </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.Endpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:Endpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:EndpointBinding</wsdl-binding> <service-endpoint-method-mapping> <java-method-name>echo</java-method-name> <wsdl-operation>echo</wsdl-operation> @@ -22,14 +22,14 @@ <param-position>0</param-position> <param-type>java.lang.String</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/wsref'>wsdlMsgNS:TestEndpoint_echo</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/wsref'>wsdlMsgNS:Endpoint_echo</wsdl-message> <wsdl-message-part-name>String_1</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/wsref'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/wsref'>wsdlMsgNS:Endpoint_echoResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -8,7 +8,7 @@ <service-ref-name>service2</service-ref-name> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> - <port-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}TestEnd... + <port-qname>{http://serviceref.samples.jaxws.ws.test.jboss.org/}Endpoin... </port-component-ref> </service-ref--> </jboss-client> Copied: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl (from rev 6567, framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl) =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -0,0 +1,32 @@ +<definitions name='EndpointService' targetNamespace='http://serviceref.samples.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://serviceref.samples.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types></types> + <message name='Endpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + <message name='Endpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <portType name='Endpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:Endpoint_echo'/> + <output message='tns:Endpoint_echoResponse'/> + </operation> + </portType> + <binding name='EndpointBinding' type='tns:Endpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://serviceref.samples.jaxws.ws.test.jboss.org/' use='literal'/> + </input> + <output> + <soap:body namespace='http://serviceref.samples.jaxws.ws.test.jboss.org/' use='literal'/> + </output> + </operation> + </binding> + <service name='EndpointService'> + <port binding='tns:EndpointBinding' name='EndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-serviceref'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -1,32 +0,0 @@ -<definitions name='EndpointService' targetNamespace='http://serviceref.samples.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://serviceref.samples.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types></types> - <message name='Endpoint_echoResponse'> - <part name='return' type='xsd:string'/> - </message> - <message name='Endpoint_echo'> - <part name='arg0' type='xsd:string'/> - </message> - <portType name='Endpoint'> - <operation name='echo' parameterOrder='arg0'> - <input message='tns:Endpoint_echo'/> - <output message='tns:Endpoint_echoResponse'/> - </operation> - </portType> - <binding name='EndpointBinding' type='tns:Endpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://serviceref.samples.jaxws.ws.test.jboss.org/' use='literal'/> - </input> - <output> - <soap:body namespace='http://serviceref.samples.jaxws.ws.test.jboss.org/' use='literal'/> - </output> - </operation> - </binding> - <service name='EndpointService'> - <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-serviceref'/> - </port> - </service> -</definitions> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -4,12 +4,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.samples.serviceref.EndpointImpl</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -16,15 +16,15 @@ <service-ref> <service-ref-name>service1</service-ref-name> <service-interface>javax.xml.ws.Service</service-interface> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>WEB-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>WEB-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> @@ -34,8 +34,8 @@ <service-ref> <service-ref-name>service3</service-ref-name> <service-interface>javax.xml.ws.Service</service-interface> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... + <wsdl-file>WEB-INF/wsdl/Endpoint.wsdl</wsdl-file> + <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/"&... <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/application-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/application-client.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/application-client.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -3,6 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> - <display-name>TestEndpointService</display-name> + <display-name>EndpointService</display-name> </application-client> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -6,29 +6,29 @@ <jndi-name>jbossws-client</jndi-name> <!-- - @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + @WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/Endpoint.wsdl") <service-ref> <service-ref-name>service1</service-ref-name> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> --> <!-- - @WebServiceRef(name = "service2", value = TestEndpointService.class) + @WebServiceRef(name = "service2", value = EndpointService.class) --> <service-ref> <service-ref-name>service2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @WebServiceRef(name = "EndpointService3") --> <service-ref> - <service-ref-name>TestEndpointService3</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-ref-name>EndpointService3</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -36,17 +36,17 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/service4</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @WebServiceRef(name = "EndpointService5") --> <service-ref> - <service-ref-name>TestEndpointService5</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-ref-name>EndpointService5</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -54,35 +54,35 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/service6</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) + @WebServiceRef(name = "port1", value = EndpointService.class, type = Endpoint.class) --> <service-ref> <service-ref-name>port1</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(name = "Port2", value = TestEndpointService.class) + @WebServiceRef(name = "Port2", value = EndpointService.class) --> <service-ref> <service-ref-name>Port2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(value = TestEndpointService.class) + @WebServiceRef(value = EndpointService.class) --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/port3</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -90,8 +90,8 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/port4</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -99,8 +99,8 @@ --> <service-ref> <service-ref-name>Port5</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> </jboss-client> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -12,29 +12,29 @@ <ejb-name>EJB3Client</ejb-name> <!-- - @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + @WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/Endpoint.wsdl") <service-ref> <service-ref-name>service1</service-ref-name> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> --> <!-- - @WebServiceRef(name = "service2", value = TestEndpointService.class) + @WebServiceRef(name = "service2", value = EndpointService.class) --> <service-ref> <service-ref-name>service2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @WebServiceRef(name = "EndpointService3") --> <service-ref> - <service-ref-name>TestEndpointService3</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-ref-name>EndpointService3</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -42,17 +42,17 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service4</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @WebServiceRef(name = "EndpointService5") --> <service-ref> - <service-ref-name>TestEndpointService5</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-ref-name>EndpointService5</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -60,35 +60,35 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) + @WebServiceRef(name = "port1", value = EndpointService.class, type = Endpoint.class) --> <service-ref> <service-ref-name>port1</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(name = "Port2", value = TestEndpointService.class) + @WebServiceRef(name = "Port2", value = EndpointService.class) --> <service-ref> <service-ref-name>Port2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(value = TestEndpointService.class) + @WebServiceRef(value = EndpointService.class) --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/port3</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>META-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> </session> </enterprise-beans> Copied: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl (from rev 6567, framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/TestEndpoint.wsdl) =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -0,0 +1,39 @@ +<!-- + wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/Endpoint.wsdl +--> +<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <message name='Endpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='Endpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + + <portType name='Endpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:Endpoint_echo'/> + <output message='tns:Endpoint_echoResponse'/> + </operation> + </portType> + + <binding name='EndpointBinding' type='tns:Endpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </output> + </operation> + </binding> + + <service name='EndpointService'> + <port binding='tns:EndpointBinding' name='EndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + </port> + </service> + +</definitions> Deleted: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2008-04-21 12:35:36 UTC (rev 6569) @@ -1,39 +0,0 @@ -<!-- - wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/TestEndpoint.wsdl ---> -<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <message name='Endpoint_echo'> - <part name='arg0' type='xsd:string'/> - </message> - <message name='Endpoint_echoResponse'> - <part name='return' type='xsd:string'/> - </message> - - <portType name='Endpoint'> - <operation name='echo' parameterOrder='arg0'> - <input message='tns:Endpoint_echo'/> - <output message='tns:Endpoint_echoResponse'/> - </operation> - </portType> - - <binding name='EndpointBinding' type='tns:Endpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </output> - </operation> - </binding> - - <service name='EndpointService'> - <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> - </port> - </service> - -</definitions> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -4,12 +4,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <servlet> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl</servlet-class> </servlet> <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> + <servlet-name>Endpoint</servlet-name> <url-pattern>/*</url-pattern> </servlet-mapping> </web-app> \ No newline at end of file Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2008-04-21 12:25:41 UTC (rev 6568) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2008-04-21 12:35:36 UTC (rev 6569) @@ -6,29 +6,29 @@ <!-- - @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") + @WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "WEB-INF/wsdl/Endpoint.wsdl") <service-ref> <service-ref-name>service1</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> --> <!-- - @WebServiceRef(name = "service2", value = TestEndpointService.class) + @WebServiceRef(name = "service2", value = EndpointService.class) --> <service-ref> <service-ref-name>service2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @WebServiceRef(name = "EndpointService3") --> <service-ref> - <service-ref-name>TestEndpointService3</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-ref-name>EndpointService3</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -36,17 +36,17 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @WebServiceRef(name = "EndpointService5") --> <service-ref> - <service-ref-name>TestEndpointService5</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-ref-name>EndpointService5</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- @@ -54,35 +54,35 @@ --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) + @WebServiceRef(name = "port1", value = EndpointService.class, type = Endpoint.class) --> <service-ref> <service-ref-name>port1</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(name = "Port2", value = TestEndpointService.class) + @WebServiceRef(name = "Port2", value = EndpointService.class) --> <service-ref> <service-ref-name>Port2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> <!-- - @WebServiceRef(value = TestEndpointService.class) + @WebServiceRef(value = EndpointService.class) --> <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname> + <wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override> </service-ref> </jboss-web> \ No newline at end of file