[jbossws-commits] JBossWS SVN: r6565 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1190 and 18 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Apr 21 07:31:27 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-04-21 07:31:27 -0400 (Mon, 21 Apr 2008)
New Revision: 6565

Modified:
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
   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/jbws1581/EndpointBean.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.java
   framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java
   framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl
   framework/trunk/testsuite/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl
   framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl
   framework/trunk/testsuite/test/resources/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl
   framework/trunk/testsuite/test/resources/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl
   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/smoke/tools/wsdl/TestService.wsdl
   framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl
   framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
Log:
Test* classes are picked up by surefire

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -29,7 +29,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "Service")
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "EndpointService")
 public class EndpointBean implements EndpointInterface
 {
    public String echo(String input)

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -83,7 +83,7 @@
    {
       // Create the port
       URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl");
-      QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "Service");
+      QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService");
       Service service = Service.create(wsdlURL, qname);
       EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
 

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -87,7 +87,7 @@
    {
       // Create the port
       URL wsdlURL = getResourceURL("jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl");
-      QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "Service");
+      QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService");
       Service service = Service.create(wsdlURL, qname);
       EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
 

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 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -48,7 +48,7 @@
  * @author darran.lofthouse at jboss.com
  * @since 19-October-2006
  */
- at WebService(name = "", serviceName = "Service", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint")
+ at WebService(name = "", serviceName = "EndpointService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint")
 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 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -56,7 +56,7 @@
       if (port == null)
       {
          URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl");
-         QName qname = new QName("http://org.jboss/test/ws/jbws1190", "Service");
+         QName qname = new QName("http://org.jboss/test/ws/jbws1190", "EndpointService");
          Service service = Service.create(wsdlURL, qname);
          port = (Endpoint)service.getPort(Endpoint.class);
       }
@@ -64,7 +64,7 @@
 
    public void testTestEndpoint() throws Exception
    {
-      port.testAddress(ARCHIVE_NAME, "Service", "http", "8080");
+      port.testAddress(ARCHIVE_NAME, "EndpointService", "http", "8080");
    }
 
    public void testConfidentialEndpoint() throws Exception

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -25,7 +25,7 @@
 
 import org.jboss.logging.Logger;
 
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "Service")
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "EndpointService")
 public class EndpointBean 
 {
    private static final Logger log = Logger.getLogger(EndpointBean.class);

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -59,7 +59,7 @@
    {
       super.setUp();
 
-      QName serviceName = new QName(targetNS, "Service");
+      QName serviceName = new QName(targetNS, "EndpointService");
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1798/Service?wsdl");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -33,7 +33,7 @@
 import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType;
 import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response;
 
- at WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType")
+ at WebService(portName = "ServicePort", serviceName = "EndpointService", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType")
 public class ServiceImpl implements ServiceType
 {
 

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -48,7 +48,7 @@
 
    private EJB3RemoteIface getProxy() throws Exception
    {
-      QName serviceName = new QName("http://jbossws.org/JBWS1822", "Service");
+      QName serviceName = new QName("http://jbossws.org/JBWS1822", "EndpointService");
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1822?wsdl");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -37,7 +37,7 @@
  * 
  * @since 08-Jan-2008
  */
- at WebService(name = "EndpointIface", targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "Service")
+ at WebService(name = "EndpointIface", targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "EndpointService")
 @WebContext(contextRoot="/jaxws-jbws1822", urlPattern="/*")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 @Remote(EJB3RemoteIface.class)

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -36,7 +36,7 @@
 @WebService(
   name = "EndpointInterface",
   targetNamespace = "http://www.openuri.org/2004/04/HelloWorld",
-  serviceName = "Service",
+  serviceName = "EndpointService",
   endpointInterface = "org.jboss.test.ws.jaxws.jbws1841.EndpointInterface"
 )
 @SOAPBinding(style = SOAPBinding.Style.RPC)

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -34,7 +34,7 @@
       if (port == null)
       {
          URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
-         QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "Service");
+         QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService");
          port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class);
 
 

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -58,7 +58,7 @@
    {
       super.setUp();
 
-      QName serviceName = new QName(targetNS, "Service");
+      QName serviceName = new QName(targetNS, "EndpointService");
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1843/Service?wsdl");
 
       javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName);

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -39,9 +39,9 @@
  */
 @WebService
 (
-      name="Service",
-      portName="Service",
-      serviceName="Service",   
+      name="EndpointService",
+      portName="EndpointService",
+      serviceName="EndpointService",   
       wsdlLocation="WEB-INF/wsdl/TestService.wsdl",
       targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/",
       endpointInterface = "org.jboss.test.ws.jaxws.jbws1843.generated.Service"

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -16,7 +16,7 @@
  * Generated source version: 2.0
  * 
  */
- at WebService(name = "Service", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/")
+ at WebService(name = "EndpointService", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/")
 public interface Service {
 
 

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -59,7 +59,7 @@
    {
       super.setUp();
 
-      QName serviceName = new QName(targetNS, "Service");
+      QName serviceName = new QName(targetNS, "EndpointService");
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2009/Service?wsdl");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -33,7 +33,7 @@
 import org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType;
 import org.jboss.test.ws.jaxws.jbws2009.generated.GetCountryCodesResponse.Response;
 
- at WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws2009.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType")
+ at WebService(portName = "ServicePort", serviceName = "EndpointService", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws2009.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType")
 public class ServiceImpl implements ServiceType
 {
 

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -35,7 +35,7 @@
  * @since Nov 2, 2006
  */
 @Stateless
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "Service")
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "EndpointService")
 public class EJB3Bean implements EJB3RemoteInterface
 {
 

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -54,7 +54,7 @@
       if (port == null)
       {
          URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl");
-         QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "Service");
+         QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "EndpointService");
          Service.create(wsdlURL, serviceName);
          Service service = Service.create(wsdlURL, serviceName);
          port = (EndpointInterface)service.getPort(EndpointInterface.class);

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -35,7 +35,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service")
+ at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "EndpointService")
 @WebContext(contextRoot="/jaxws-samples-webservice01-ejb3", urlPattern="/*")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 @Remote(EJB3RemoteInterface.class)

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -39,7 +39,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service", wsdlLocation = "META-INF/wsdl/TestService.wsdl")
+ at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "EndpointService", wsdlLocation = "META-INF/wsdl/TestService.wsdl")
 @WebContext(contextRoot="/jaxws-samples-webservice02-ejb3", urlPattern="/*")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 @Remote(EJB3RemoteInterface.class)

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -33,7 +33,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service")
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "EndpointService")
 @WebContext(contextRoot="/jaxws-samples-webservice03-ejb3", urlPattern="/*")
 @Remote(EJB3RemoteInterface.class)
 @Stateless

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -31,7 +31,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service")
+ at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "EndpointService")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 public class JSEBean01
 {

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -33,7 +33,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl")
+ at WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "EndpointService", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 public class JSEBean02
 {

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -31,7 +31,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 29-Apr-2005
  */
- at WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service")
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "EndpointService")
 public class JSEBean03
 {
    public String echo(String input)

Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java	2008-04-21 11:31:27 UTC (rev 6565)
@@ -42,7 +42,7 @@
 
    private EndpointInterface getPort(String endpointURI) throws MalformedURLException
    {
-      QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "Service");
+      QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService");
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl");
 
       Service service = Service.create(wsdlURL, serviceName);
@@ -51,7 +51,7 @@
 
    private EndpointInterface03 getPort03(String endpointURI) throws MalformedURLException
    {
-      QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "Service");
+      QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService");
       URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl");
 
       Service service = Service.create(wsdlURL, serviceName);

Modified: framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxws/endpoint" xmlns:tns="http://org.jboss.ws/jaxws/endpoint" 
+<definitions name="EndpointService" targetNamespace="http://org.jboss.ws/jaxws/endpoint" xmlns:tns="http://org.jboss.ws/jaxws/endpoint" 
   xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
   <types/>
   <message name="EndpointInterface_echo">
@@ -27,7 +27,7 @@
       </output>
     </operation>
   </binding>
-  <service name="TestService">
+  <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
       <soap:address location="http://@jboss.bind.address@:8080/jaxws-endpoint"/>
     </port>

Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="TestEndpointService" 
+<definitions name="EndpointService" 
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
     xmlns="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"

Modified: 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 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/wsdl/TestEndpoint.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -5,7 +5,7 @@
   
   $Id$
 -->
-<definitions name="TestEndpointService" 
+<definitions name="EndpointService" 
   targetNamespace="http://eardeployment.jaxws/" 
   xmlns="http://schemas.xmlsoap.org/wsdl/"
   xmlns:jbws1616="http://jira.jboss.org/jira/browse/JBWS-1616"
@@ -16,19 +16,19 @@
     <xsd:import namespace="http://org.jboss.ws/jaxrpc/types" schemaLocation="TestService.xsd"/>
   </types>
   
-  <message name="TestEndpoint_echoResponse">
+  <message name="Endpoint_echoResponse">
     <part name="return" type="xsd:string"/>
   </message>
-  <message name="TestEndpoint_echo">
+  <message name="Endpoint_echo">
     <part name="arg0" type="xsd:string"/>
   </message>
-  <portType name="TestEndpoint">
+  <portType name="Endpoint">
     <operation name="echo" parameterOrder="arg0">
       <input message="tns:TestEndpoint_echo"/>
       <output message="tns:TestEndpoint_echoResponse"/>
     </operation>
   </portType>
-  <binding name="TestEndpointBinding" type="tns:TestEndpoint">
+  <binding name="EndpointBinding" type="tns:TestEndpoint">
     <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
     <operation name="echo">
       <soap:operation soapAction=""/>
@@ -40,8 +40,8 @@
       </output>
     </operation>
   </binding>
-  <service name="TestEndpointService">
-    <port binding="tns:TestEndpointBinding" name="TestEndpointPort">
+  <service name="EndpointService">
+    <port binding="tns:TestEndpointBinding" name="EndpointPort">
       <soap:address location="http://REPLACE_ON_DEPLOY"/>
     </port>
   </service>

Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="TestService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+<definitions name="EndpointService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
   <types/>
   <message name="EndpointInterface_echo">
     <part name="arg0" type="xsd:string"/>
@@ -26,7 +26,7 @@
       </output>
     </operation>
   </binding>
-  <service name="TestService">
+  <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
       <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
     </port>

Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="TestService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+<definitions name="EndpointService" targetNamespace="http://www.openuri.org/2004/04/HelloWorld" xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
   <types/>
   <message name="EndpointInterface_echo">
     <part name="arg0" type="xsd:string"/>
@@ -26,7 +26,7 @@
       </output>
     </operation>
   </binding>
-  <service name="TestService">
+  <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
       <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
     </port>

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 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml	2008-04-21 11:31:27 UTC (rev 6565)
@@ -23,7 +23,7 @@
   </service-ref>
   
   <!-- 
-  @WebServiceRef(name = "TestEndpointService3")
+  @WebServiceRef(name = "EndpointService3")
   -->
   <service-ref>
     <service-ref-name>TestEndpointService3</service-ref-name>
@@ -41,7 +41,7 @@
   </service-ref>
   
   <!-- 
-  @WebServiceRef(name = "TestEndpointService5")
+  @WebServiceRef(name = "EndpointService5")
   -->
   <service-ref>
     <service-ref-name>TestEndpointService5</service-ref-name>

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 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml	2008-04-21 11:31:27 UTC (rev 6565)
@@ -29,7 +29,7 @@
       </service-ref>
       
       <!-- 
-      @WebServiceRef(name = "TestEndpointService3")
+      @WebServiceRef(name = "EndpointService3")
       -->
       <service-ref>
         <service-ref-name>TestEndpointService3</service-ref-name>
@@ -47,7 +47,7 @@
       </service-ref>
       
       <!-- 
-      @WebServiceRef(name = "TestEndpointService5")
+      @WebServiceRef(name = "EndpointService5")
       -->
       <service-ref>
         <service-ref-name>TestEndpointService5</service-ref-name>

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 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml	2008-04-21 11:31:27 UTC (rev 6565)
@@ -23,7 +23,7 @@
       </service-ref>
       
       <!-- 
-      @WebServiceRef(name = "TestEndpointService3")
+      @WebServiceRef(name = "EndpointService3")
       -->
       <service-ref>
         <service-ref-name>TestEndpointService3</service-ref-name>
@@ -41,7 +41,7 @@
       </service-ref>
       
       <!-- 
-      @WebServiceRef(name = "TestEndpointService5")
+      @WebServiceRef(name = "EndpointService5")
       -->
       <service-ref>
         <service-ref-name>TestEndpointService5</service-ref-name>

Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestService.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestService.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="TestService"
+<definitions name="EndpointService"
              targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
              xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
              xmlns="http://schemas.xmlsoap.org/wsdl/"
@@ -31,7 +31,7 @@
       </output>
     </operation>
   </binding>
-  <service name="TestService">
+  <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
       <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
     </port>

Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="TestService"
+<definitions name="EndpointService"
              targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
              xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
              xmlns="http://schemas.xmlsoap.org/wsdl/"
@@ -32,7 +32,7 @@
       </output>
     </operation>
   </binding>
-  <service name="TestService">
+  <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
       <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
     </port>

Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl	2008-04-21 11:08:18 UTC (rev 6564)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl	2008-04-21 11:31:27 UTC (rev 6565)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions name="TestService"
+<definitions name="EndpointService"
              targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
              xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
              xmlns="http://schemas.xmlsoap.org/wsdl/"
@@ -31,7 +31,7 @@
       </output>
     </operation>
   </binding>
-  <service name="TestService">
+  <service name="EndpointService">
     <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
       <soap12:address location="REPLACE_WITH_ACTUAL_URL"/>
     </port>




More information about the jbossws-commits mailing list