[jbossws-commits] JBossWS SVN: r6564 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1178 and 26 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 07:08:18 -0400 (Mon, 21 Apr 2008) New Revision: 6564 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/Endpoint.java Removed: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java 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/jbws1178/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.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/jbws1566/c/Jaxb20TestWSInterface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.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/jbws1854/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.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/asynchronous/AsynchronousDispatchTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.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/EarTestCase.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/exception/ExceptionTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.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/EndpointImpl.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/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/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/EndpointImpl.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/samples/webserviceref/WebServiceRefEJB3TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 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/jboss-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -29,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "TestService") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "Service") 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -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", "TestService"); + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "Service"); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -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", "TestService"); + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "Service"); Service service = Service.create(wsdlURL, qname); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/Endpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/Endpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -25,7 +25,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface Endpoint { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -25,7 +25,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") @SOAPBinding(style = SOAPBinding.Style.RPC) public class EndpointImpl { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -79,7 +79,7 @@ InetAddress inetAddr = InetAddress.getByName(getServerHost()); URL wsdlURL = new URL("http://" + inetAddr.getHostAddress() + ":8080/jaxws-jbws1178/testpattern?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService"); + QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); Endpoint port = service.getPort(Endpoint.class); Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); @@ -93,7 +93,7 @@ InetAddress inetAddr = InetAddress.getByName(getServerHost()); URL wsdlURL = new URL("http://" + inetAddr.getHostName() + ":8080/jaxws-jbws1178/testpattern?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService"); + QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); Endpoint port = service.getPort(Endpoint.class); Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -48,7 +48,7 @@ * @author darran.lofthouse(a)jboss.com * @since 19-October-2006 */ -@WebService(name = "Test", serviceName = "TestService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") +@WebService(name = "", serviceName = "Service", 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -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", "TestService"); + QName qname = new QName("http://org.jboss/test/ws/jbws1190", "Service"); 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, "TestService", "http", "8080"); + port.testAddress(ARCHIVE_NAME, "Service", "http", "8080"); } public void testConfidentialEndpoint() throws Exception Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestWSInterface.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -32,7 +32,7 @@ public interface Jaxb20TestWSInterface extends java.rmi.Remote { - @javax.jws.WebMethod(operationName = "TestMethod") + @javax.jws.WebMethod(operationName = "Method") public @javax.jws.WebResult(name = "result") TestEnumeration testMethod((a)javax.jws.WebParam(name = "input", mode = javax.jws.WebParam.Mode.IN) BClass input) throws BException, RemoteException; 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "TestService") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "Service") public class EndpointBean { private static final Logger log = Logger.getLogger(EndpointBean.class); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -48,7 +48,7 @@ private EJB3RemoteIface getProxy() throws Exception { - QName serviceName = new QName("http://jbossws.org/JBWS1822";, "TestService"); + QName serviceName = new QName("http://jbossws.org/JBWS1822";, "Service"); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -37,7 +37,7 @@ * * @since 08-Jan-2008 */ -@WebService(name = "EndpointIface", targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "TestService") +@WebService(name = "EndpointIface", targetNamespace = "http://jbossws.org/JBWS1822", serviceName = "Service") @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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -36,7 +36,7 @@ @WebService( name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", - serviceName = "TestService", + serviceName = "Service", 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -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";, "TestService"); + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "Service"); port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class); Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1854; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1854") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint +{ + String echo(String input); +} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -25,7 +25,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") +@WebService(serviceName = "EndpointService", name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1854") @SOAPBinding(style = SOAPBinding.Style.RPC) public class EndpointImpl { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -50,9 +50,9 @@ public void testPortAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1854?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1854", "TestEndpointService" ); + QName serviceName = new QName("http://org.jboss.ws/jbws1854", "EndpointService" ); Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); String retStr = port.echo("hello"); assertEquals("hello", retStr); } Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1854; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - String echo(String input); -} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -25,7 +25,7 @@ import javax.jws.soap.SOAPBinding; @SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1904") public interface Endpoint { String echo(String input) throws UserException; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -33,8 +33,8 @@ @WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*") @WebService ( - name = "TestEndpoint", - serviceName = "TestEndpointService", + name = "Endpoint", + serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1904" ) public class EndpointImpl implements Endpoint Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -70,7 +70,7 @@ while (elements.hasNext()) { Element e = (Element)elements.next(); - boolean nameEquals = e.getAttribute("name").equals("TestExceptionFault"); + boolean nameEquals = e.getAttribute("name").equals("ExceptionFault"); boolean typeEquals = e.getAttribute("type").endsWith(":TestException"); if (nameEquals && typeEquals) { @@ -84,7 +84,7 @@ while (elements.hasNext()) { Element e = (Element)elements.next(); - boolean nameEquals = e.getAttribute("name").equals("TestException"); + boolean nameEquals = e.getAttribute("name").equals("Exception"); if (nameEquals) { secondTypeFound = true; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -27,7 +27,7 @@ * The SEI * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1969") public interface Endpoint { String echo(String input); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -34,8 +34,8 @@ @Stateless @WebService ( - name = "TestEndpoint", - serviceName = "TestEndpointService", + name = "Endpoint", + serviceName = "EndpointService", wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl", targetNamespace = "http://org.jboss.ws/jbws1969" ) 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -35,7 +35,7 @@ * @since Nov 2, 2006 */ @Stateless -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "TestService") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "Service") 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -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";, "TestService"); + QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981";, "Service"); 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/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -103,8 +103,8 @@ private Dispatch createDispatch() throws MalformedURLException { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl"); - QName serviceName = new QName(targetNS, "TestEndpointBeanService"); - QName portName = new QName(targetNS, "TestEndpointPort"); + QName serviceName = new QName(targetNS, "EndpointBeanService"); + QName portName = new QName(targetNS, "EndpointPort"); Service service = Service.create(wsdlURL, serviceName); Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); return dispatch; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -57,14 +57,14 @@ public void testInvokeSync() throws Exception { - TestEndpoint port = createProxy(); + Endpoint port = createProxy(); String retStr = port.echo("Hello"); assertEquals("Hello", retStr); } public void testInvokeAsync() throws Exception { - TestEndpoint port = createProxy(); + Endpoint port = createProxy(); Response response = port.echoAsync("Async"); // access future @@ -91,7 +91,7 @@ } }; - TestEndpoint port = createProxy(); + Endpoint port = createProxy(); Future future = port.echoAsync("Hello", handler); future.get(1000, TimeUnit.MILLISECONDS); @@ -101,11 +101,11 @@ assertTrue("Async handler called", asyncHandlerCalled); } - private TestEndpoint createProxy() throws MalformedURLException + private Endpoint createProxy() throws MalformedURLException { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-asynchronous?wsdl"); - QName serviceName = new QName(targetNS, "TestEndpointBeanService"); + QName serviceName = new QName(targetNS, "EndpointBeanService"); Service service = Service.create(wsdlURL, serviceName); - return (TestEndpoint)service.getPort(TestEndpoint.class); + return (Endpoint)service.getPort(Endpoint.class); } } Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.asynchronous; + +import java.util.concurrent.Future; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; +import javax.xml.ws.AsyncHandler; +import javax.xml.ws.Response; + +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@SOAPBinding(style = Style.RPC) +public interface Endpoint +{ + @WebMethod(operationName = "echo") + public Response<String> echoAsync(@WebParam(name = "String_1") String string1); + + @WebMethod(operationName = "echo") + public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler); + + @WebMethod + @WebResult(name = "result") + public String echo(@WebParam(name = "String_1") String string1); +} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") @SOAPBinding(style = Style.RPC) public class EndpointBean { Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.asynchronous; - -import java.util.concurrent.Future; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") -@SOAPBinding(style = Style.RPC) -public interface TestEndpoint -{ - @WebMethod(operationName = "echo") - public Response<String> echoAsync(@WebParam(name = "String_1") String string1); - - @WebMethod(operationName = "echo") - public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler); - - @WebMethod - @WebResult(name = "result") - public String echo(@WebParam(name = "String_1") String string1); -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,53 @@ + +package org.jboss.test.ws.jaxws.samples.context; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") +@SOAPBinding(style = Style.RPC) +public interface Endpoint { + + + /** + * + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public String testGetMessageContext(); + + /** + * + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public String testGetUserPrincipal(); + + /** + * + * @param arg0 + * @return + * returns boolean + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") + public boolean testIsUserInRole( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -37,7 +37,7 @@ import org.jboss.wsf.spi.annotation.WebContext; -@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/context") +@WebService(name = "Endpoint", serviceName="EndpointService", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) @Stateless @WebContext(contextRoot = "/jaxws-samples-context", urlPattern = "/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -33,7 +33,7 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/context") +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) public class EndpointJSE { Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,53 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.context; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") -@SOAPBinding(style = Style.RPC) -public interface TestEndpoint { - - - /** - * - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public String testGetMessageContext(); - - /** - * - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public String testGetUserPrincipal(); - - /** - * - * @param arg0 - * @return - * returns boolean - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return") - public boolean testIsUserInRole( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Modified: 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -43,7 +43,7 @@ */ public class WebServiceContextEJBTestCase extends JBossWSTest { - private static TestEndpoint port; + private static Endpoint port; public static Test suite() { @@ -55,9 +55,9 @@ if (port == null) { URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); + QName qname = new QName("http://org.jboss.ws/jaxws/context", "EndpointService"); Service service = Service.create(wsdlURL, qname); - port = (TestEndpoint)service.getPort(TestEndpoint.class); + port = (Endpoint)service.getPort(Endpoint.class); BindingProvider bp = (BindingProvider)port; bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -43,7 +43,7 @@ */ public class WebServiceContextJSETestCase extends JBossWSTest { - private static TestEndpoint port; + private static Endpoint port; public static Test suite() { @@ -55,9 +55,9 @@ if (port == null) { URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService"); + QName qname = new QName("http://org.jboss.ws/jaxws/context", "EndpointService"); Service service = Service.create(wsdlURL, qname); - port = (TestEndpoint)service.getPort(TestEndpoint.class); + port = (Endpoint)service.getPort(Endpoint.class); BindingProvider bp = (BindingProvider)port; bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.annotation.WebContext; // Test that the wsdl can be read from the nested deployment -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebContext(contextRoot = "/earejb3") @Stateless Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -61,9 +61,9 @@ } String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EJB3Bean"; - QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl"); String nsURI = wsdl.getNamespace("jbws1616"); @@ -80,9 +80,9 @@ public void testJSEEndpoint() throws Exception { String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean"; - QName serviceName = new QName("http://eardeployment.jaxws/", "TestEndpointService"); + QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl"); String nsURI = wsdl.getNamespace("jbws1616"); Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,34 @@ + +package org.jboss.test.ws.jaxws.samples.eardeployment; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 + * Generated source version: 2.1 + * + */ +@WebService(name = "Endpoint", targetNamespace = "http://eardeployment.jaxws/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; //Test that the wsdl can be read from the nested deployment -@WebService(name="TestEndpoint", serviceName="TestEndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") +@WebService(name="Endpoint", serviceName="EndpointService", targetNamespace="http://eardeployment.jaxws/", wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class JSEBean { Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,34 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.eardeployment; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.1-11/15/2006 04:41 PM(vivek)-EA3 - * Generated source version: 2.1 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://eardeployment.jaxws/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -108,7 +108,7 @@ assertEquals("mr.actor", e.getFault().getFaultActor()); assertEquals("FooCode", e.getFault().getFaultCodeAsName().getLocalName()); assertEquals("http://foo", e.getFault().getFaultCodeAsName().getURI()); - assertEquals("test", ((Element)e.getFault().getDetail().getChildElements().next()).getLocalName()); + assertEquals("", ((Element)e.getFault().getDetail().getChildElements().next()).getLocalName()); } } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -47,7 +47,7 @@ SOAPFactory factory = SOAPFactory.newInstance(); SOAPFault fault = factory.createFault("this is a fault string!", new QName("http://foo", "FooCode")); fault.setFaultActor("mr.actor"); - fault.addDetail().addChildElement("test"); + fault.addDetail().addChildElement(""); throw new SOAPFaultException(fault); } catch (SOAPException s) Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -250,7 +250,7 @@ log.debug(" Binding Description: " + getDescription(sb)); log.debug(" Access URI: " + sb.getAccessURI()); assertEquals("http://testjboss.org", sb.getAccessURI()); - assertEquals("Test Service Binding", getDescription(sb)); + assertEquals(" Service Binding", getDescription(sb)); } } } @@ -316,7 +316,7 @@ service.setDescription(getIString("Services of XML Registry")); //Create serviceBinding ServiceBinding serviceBinding = blm.createServiceBinding(); - serviceBinding.setDescription(blm.createInternationalString("Test Service Binding")); + serviceBinding.setDescription(blm.createInternationalString(" Service Binding")); //Turn validation of URI off serviceBinding.setValidateURI(false); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -49,7 +49,7 @@ try { InitialContext iniCtx = new InitialContext(); - ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add((Endpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); } catch (Exception ex) @@ -59,7 +59,7 @@ for (int i = 0; i < ports.size(); i++) { - TestEndpoint port = (TestEndpoint)ports.get(i); + Endpoint port = (Endpoint)ports.get(i); BindingProvider bp = (BindingProvider)port; boolean mtomEnabled = ((SOAPBinding)bp.getBinding()).isMTOMEnabled(); Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,40 @@ + +package org.jboss.test.ws.jaxws.samples.serviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + + +/** + * JBossWS Generated Source + * + * Generation Date: Mon Mar 12 15:09:39 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "Endpoint", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -34,7 +34,7 @@ * @since 12-Mar-2007 */ -@WebService (name = "TestEndpoint") +@WebService (name = "Endpoint") @SOAPBinding(style = SOAPBinding.Style.RPC) public class EndpointImpl { 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -21,7 +21,7 @@ * JAX-WS Version: 2.0 * */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-samples-serviceref?wsdl") +@WebServiceClient(name = "EndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-samples-serviceref?wsdl") public class EndpointService extends Service { @@ -43,7 +43,7 @@ } public EndpointService() { - super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService")); + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService")); } /** @@ -51,9 +51,9 @@ * @return * returns TestEndpoint */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class); + @WebEndpoint(name = "EndpointPort") + public Endpoint getTestEndpointPort() { + 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -70,11 +70,11 @@ return; URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); - QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService"); + QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, qname); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); - String request = "testDynamicProxy"; + String request = "DynamicProxy"; String response = port.echo(request); assertEquals(request, response); } @@ -86,7 +86,7 @@ InitialContext iniCtx = getInitialContext("jbossws-client"); Service service = (Service) iniCtx.lookup("java:comp/env/service2"); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); assertNotNull(port); @@ -101,7 +101,7 @@ // MTOM property at service-ref level not possible with sun-ri } - String request = "testApplicationClient"; + String request = "ApplicationClient"; String response = port.echo(request); assertEquals(response, request); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -70,11 +70,11 @@ if (isTargetJBoss50()) { URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); - QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService"); + QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, qname); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); - String helloWorld = "testDynamicProxy"; + String helloWorld = "DynamicProxy"; Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -67,9 +67,9 @@ return; URL wsdlURL = getResourceURL("jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); - QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "TestEndpointService"); + QName qname = new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/";, "EndpointService"); Service service = Service.create(wsdlURL, qname); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -54,7 +54,7 @@ try { InitialContext iniCtx = new InitialContext(); - ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add((Endpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); } catch (Exception ex) @@ -65,7 +65,7 @@ for (int i = 0; i < ports.size(); i++) { - TestEndpoint port = (TestEndpoint)ports.get(i); + Endpoint port = (Endpoint)ports.get(i); BindingProvider bp = (BindingProvider)port; boolean mtomEnabled = ((SOAPBinding)bp.getBinding()).isMTOMEnabled(); @@ -80,9 +80,9 @@ } // Test the injected service as well - TestEndpoint injectedPort = injectedService.getTestEndpointPort(); - String outStr = injectedPort.echo("Test injected service"); - if (outStr.equals("Test injected service") == false) + Endpoint injectedPort = injectedService.getTestEndpointPort(); + String outStr = injectedPort.echo(" injected service"); + if (outStr.equals(" injected service") == false) throw new WebServiceException("Invalid echo return on injected service/port: " + inStr); res.getWriter().print(inStr); Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,40 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.serviceref; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - - -/** - * JBossWS Generated Source - * - * Generation Date: Mon Mar 12 15:09:39 CET 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - * - * JAX-WS Version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.webmethod; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService (name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint +{ + @WebMethod(operationName = "echoString", action = "urn:EchoString") + String echo(String input); +} 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -32,7 +32,7 @@ * @since 12-Aug-2005 */ -@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint") +@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint") public class EndpointImpl { // Provide logging Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.webmethod; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService (name="TestEndpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - @WebMethod(operationName = "echoString", action = "urn:EchoString") - String echo(String input); -} 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -63,10 +63,10 @@ public void testLegalAccess() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(targetNS, "TestEndpointService"); + QName serviceName = new QName(targetNS, "EndpointService"); Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); Object retObj = port.echo("Hello"); assertEquals("Hello", retObj); @@ -125,8 +125,8 @@ public void testIllegalDispatchAccess() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(targetNS, "TestEndpointService"); - QName portName = new QName(targetNS, "TestEndpointPort"); + QName serviceName = new QName(targetNS, "EndpointService"); + QName portName = new QName(targetNS, "EndpointPort"); String reqPayload = "<ns1:noWebMethod xmlns:ns1='" + targetNS + "'>" + 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") +@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service") @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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -39,7 +39,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") +@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service", 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service") @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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") +@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service") @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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl") +@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service", 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "Service") 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -42,7 +42,7 @@ private EndpointInterface getPort(String endpointURI) throws MalformedURLException { - QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "Service"); 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";, "TestService"); + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "Service"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -42,14 +42,14 @@ // Test multiple on type @WebServiceRefs( { @WebServiceRef(name = "service2", value = EndpointService.class), - @WebServiceRef(name = "port1", value = EndpointService.class, type = TestEndpoint.class) }) + @WebServiceRef(name = "port1", value = EndpointService.class, type = Endpoint.class) }) public class EJB3Client implements EJB3Remote { // Provide logging private static Logger log = Logger.getLogger(EJB3Client.class); // Test on field with name - @WebServiceRef(name = "TestEndpointService3") + @WebServiceRef(name = "EndpointService3") public EndpointService service3; // Test on field without name @@ -57,7 +57,7 @@ public EndpointService service4; // Test on method with value - @WebServiceRef(name = "TestEndpointService5") + @WebServiceRef(name = "EndpointService5") public void setService5(EndpointService service) { this.service5 = service; @@ -74,35 +74,35 @@ // Test on field with name and value @WebServiceRef(name = "Port2", value = EndpointService.class) - public TestEndpoint port2; + public Endpoint port2; // Test on field with value @WebServiceRef(value = EndpointService.class) - public TestEndpoint port3; + public Endpoint port3; public String echo(String inStr) { log.info("echo: " + inStr); - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + ArrayList<Endpoint> ports = new ArrayList<Endpoint>(); 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((TestEndpoint)service3.getPort(TestEndpoint.class)); + ports.add((Endpoint)service3.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService3")).getTestEndpointPort()); - ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); + ports.add((Endpoint)service4.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); - ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); + ports.add((Endpoint)service5.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort()); - ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); + ports.add((Endpoint)service6.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); - ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1")); + ports.add((Endpoint)iniCtx.lookup("java:comp.ejb3/env/port1")); ports.add(port2); - ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/Port2")); + ports.add((Endpoint)iniCtx.lookup("java:comp.ejb3/env/Port2")); ports.add(port3); - ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/port3")); + ports.add((Endpoint)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/port3")); } catch (Exception ex) { @@ -110,7 +110,7 @@ throw new WebServiceException(ex); } - for (TestEndpoint port : ports) + for (Endpoint port : ports) { String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.samples.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl") +@SOAPBinding(style = Style.RPC) +public interface Endpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService; -import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint; +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") @@ -38,14 +38,14 @@ // Test multiple on type @WebServiceRefs( { @WebServiceRef(name = "service2", value = EndpointService.class), - @WebServiceRef(name = "port1", value = EndpointService.class, type = TestEndpoint.class) }) + @WebServiceRef(name = "port1", value = EndpointService.class, type = Endpoint.class) }) public class EndpointClientOne { // Provide logging private static Logger log = Logger.getLogger(EndpointClientOne.class); // Test on field with name - @WebServiceRef(name = "TestEndpointService3") + @WebServiceRef(name = "EndpointService3") static EndpointService service3; // Test on field without name @@ -53,7 +53,7 @@ static EndpointService service4; // Test on method with name - @WebServiceRef(name = "TestEndpointService5") + @WebServiceRef(name = "EndpointService5") static void setService5(EndpointService service) { EndpointClientOne.service5 = service; @@ -70,19 +70,19 @@ // Test on field with name and value @WebServiceRef(name = "Port2", value = EndpointService.class) - static TestEndpoint port2; + static Endpoint port2; // Test on field with value @WebServiceRef(value = EndpointService.class) - static TestEndpoint port3; + static Endpoint port3; // Test on field @WebServiceRef - static TestEndpoint port4; + static Endpoint port4; // Test on field with name @WebServiceRef (name = "Port5") - static TestEndpoint port5; + static Endpoint port5; static InitialContext iniCtx; static String retStr; @@ -92,24 +92,24 @@ String inStr = args[0]; log.info("echo: " + inStr); - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + 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((TestEndpoint)service3.getPort(TestEndpoint.class)); + ports.add((Endpoint)service3.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); - ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); + ports.add((Endpoint)service4.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); - ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); + ports.add((Endpoint)service5.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); - ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); + ports.add((Endpoint)service6.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); + ports.add((Endpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); + ports.add((Endpoint)iniCtx.lookup("java:comp/env/Port2")); ports.add(port3); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/port3")); + ports.add((Endpoint)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/port3")); ports.add(port4); ports.add(port5); } @@ -119,7 +119,7 @@ throw new WebServiceException(ex); } - for (TestEndpoint port : ports) + for (Endpoint port : ports) { String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -33,14 +33,14 @@ import javax.xml.ws.WebServiceRefs; import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint; +import org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint; import org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService; //import org.jboss.ws.core.ConfigProvider; //Test on type @WebServiceRef(name = "Service1") // Test multiple on type -@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) +@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = Endpoint.class) }) public class EndpointClientTwo { // provide logging @@ -56,11 +56,11 @@ // Test on field @WebServiceRef(name = "Port2") - static TestEndpoint port2; + static Endpoint port2; // Test on field @WebServiceRef(name = "Port3") - static TestEndpoint port3; + static Endpoint port3; static InitialContext iniCtx; static Map<String, String> testResult = new HashMap<String, String>(); @@ -93,7 +93,7 @@ public String testService1(String reqStr) throws Exception { EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service1"); - TestEndpoint port = service.getTestEndpointPort(); + Endpoint port = service.getTestEndpointPort(); return port.echo(reqStr); } @@ -104,7 +104,7 @@ { Service service = (Service)iniCtx.lookup("java:comp/env/Service2"); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); //verifyConfig((ConfigProvider)port); return port.echo(reqStr); @@ -115,7 +115,7 @@ */ public String testService3(String reqStr) throws Exception { - TestEndpoint port = ((EndpointService)service3).getTestEndpointPort(); + Endpoint port = ((EndpointService)service3).getTestEndpointPort(); String resStr1 = port.echo(reqStr); EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service3"); @@ -131,7 +131,7 @@ */ public String testService4(String reqStr) throws Exception { - TestEndpoint port = service4.getTestEndpointPort(); + Endpoint port = service4.getTestEndpointPort(); String resStr1 = port.echo(reqStr); //verifyConfig((ConfigProvider)port); @@ -149,7 +149,7 @@ */ public String testPort1(String reqStr) throws Exception { - TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port1"); + Endpoint port = (Endpoint)iniCtx.lookup("java:comp/env/Port1"); //verifyConfig((ConfigProvider)port); return port.echo(reqStr); @@ -163,7 +163,7 @@ //verifyConfig((ConfigProvider)port2); String resStr1 = port2.echo(reqStr); - TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port2"); + Endpoint port = (Endpoint)iniCtx.lookup("java:comp/env/Port2"); //verifyConfig((ConfigProvider)port); String resStr2 = port.echo(reqStr); @@ -181,7 +181,7 @@ BindingProvider bp = (BindingProvider)port3; verifyProperties(bp.getRequestContext()); - TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port3"); + Endpoint port = (Endpoint)iniCtx.lookup("java:comp/env/Port3"); String resStr2 = port.echo(reqStr); return resStr1 + resStr2; Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -28,7 +28,7 @@ import org.jboss.logging.Logger; -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/wsref") @SOAPBinding(style = Style.RPC) public class EndpointImpl { 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -15,14 +15,14 @@ * Generated source version: 2.0 * */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") +@WebServiceClient(name = "EndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") public class EndpointService extends Service { private final static URL WSDL_LOCATION; - private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); + private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "EndpointService"); + private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "EndpointPort"); static { URL url = null; @@ -47,9 +47,9 @@ * @return * returns TestEndpoint */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(TESTENDPOINTPORT, TestEndpoint.class); + @WebEndpoint(name = "EndpointPort") + public Endpoint getTestEndpointPort() { + 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -41,14 +41,14 @@ // Test multiple on type @WebServiceRefs( { @WebServiceRef(name = "service2", value = EndpointService.class), - @WebServiceRef(name = "port1", value = EndpointService.class, type = TestEndpoint.class) }) + @WebServiceRef(name = "port1", value = EndpointService.class, type = Endpoint.class) }) public class ServletClient extends HttpServlet { // Provide logging private static Logger log = Logger.getLogger(ServletClient.class); // Test on field with name - @WebServiceRef(name = "TestEndpointService3") + @WebServiceRef(name = "EndpointService3") public EndpointService service3; // Test on field without name @@ -56,7 +56,7 @@ public EndpointService service4; // Test on method with value - @WebServiceRef(name = "TestEndpointService5") + @WebServiceRef(name = "EndpointService5") public void setService5(EndpointService service) { this.service5 = service; @@ -73,11 +73,11 @@ // Test on field with name and value @WebServiceRef(name = "Port2", value = EndpointService.class) - public TestEndpoint port2; + public Endpoint port2; // Test on field with value @WebServiceRef(value = EndpointService.class) - public TestEndpoint port3; + public Endpoint port3; @Override protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException @@ -85,25 +85,25 @@ String inStr = req.getParameter("echo"); log.info("doGet: " + inStr); - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + ArrayList<Endpoint> ports = new ArrayList<Endpoint>(); 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((TestEndpoint)service3.getPort(TestEndpoint.class)); + ports.add((Endpoint)service3.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); - ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); + ports.add((Endpoint)service4.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); - ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); + ports.add((Endpoint)service5.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); - ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); + ports.add((Endpoint)service6.getPort(Endpoint.class)); ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); + ports.add((Endpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); + ports.add((Endpoint)iniCtx.lookup("java:comp/env/Port2")); ports.add(port3); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/port3")); + ports.add((Endpoint)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/port3")); } catch (Exception ex) { @@ -111,7 +111,7 @@ throw new WebServiceException(ex); } - for (TestEndpoint port : ports) + for (Endpoint port : ports) { String outStr = port.echo(inStr); if (inStr.equals(outStr) == false) Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.webserviceref; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl") -@SOAPBinding(style = Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -50,10 +50,10 @@ public void testGeneratedService() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceQName = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + QName serviceQName = new QName("http://org.jboss.ws/wsref", "EndpointService"); EndpointService service = new EndpointService(wsdlURL, serviceQName); - TestEndpoint port = service.getTestEndpointPort(); + Endpoint port = service.getTestEndpointPort(); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); @@ -63,9 +63,9 @@ public void testDynamicProxy() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceQName = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + QName serviceQName = new QName("http://org.jboss.ws/wsref", "EndpointService"); Service service = Service.create(wsdlURL, serviceQName); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -51,9 +51,9 @@ public void testDynamicProxy() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + QName qname = new QName("http://org.jboss.ws/wsref", "EndpointService"); Service service = Service.create(wsdlURL, qname); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -51,9 +51,9 @@ public void testDynamicProxy() throws Exception { URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + QName qname = new QName("http://org.jboss.ws/wsref", "EndpointService"); Service service = Service.create(wsdlURL, qname); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -80,7 +80,7 @@ getBinding().setMTOMEnabled(true); - DataHandler dh = new DataHandler("testDataHandlerRoundtrip", "text/plain"); + DataHandler dh = new DataHandler("DataHandlerRoundtrip", "text/plain"); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); @@ -104,7 +104,7 @@ getBinding().setMTOMEnabled(false); - DataHandler dh = new DataHandler("testDataHandlerResponseOptimzed", "text/plain"); + DataHandler dh = new DataHandler("DataHandlerResponseOptimzed", "text/plain"); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -54,7 +54,7 @@ super.setUp(); JBOSS_HOME = System.getProperty("jboss.home"); - TEST_EXEC_DIR = System.getProperty("test.execution.dir"); + TEST_EXEC_DIR = System.getProperty(".execution.dir"); JDK_HOME = System.getProperty("jdk.home"); OS = System.getProperty("os.name").toLowerCase(); } @@ -106,7 +106,7 @@ { // be verbose System.out.println("cmd: " + command); - System.out.println("test execution dir: " + TEST_EXEC_DIR); + System.out.println(" execution dir: " + TEST_EXEC_DIR); Process p = Runtime.getRuntime().exec(command, new String[] { "JBOSS_HOME=" + JBOSS_HOME, "JAVA_HOME=" + JDK_HOME }); return p; Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/Endpoint.java (from rev 6562, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/Endpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.webfault; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService (name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint +{ + public void throwCustomException(String input) throws CustomException; + + public void throwSimpleException(String input) throws SimpleException; +} 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -31,7 +31,7 @@ * @author alessio.soldano(a)jboss.org * @since 21-Feb-2008 */ -@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") +@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") public class EndpointImpl { // Provide logging Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.webfault; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService (name="TestEndpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - public void throwCustomException(String input) throws CustomException; - - public void throwSimpleException(String input) throws SimpleException; -} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -124,10 +124,10 @@ public void testInvocation() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(TARGET_NS, "TestEndpointService"); + QName serviceName = new QName(TARGET_NS, "EndpointService"); Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); try { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2008-04-21 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2008-04-21 11:08:18 UTC (rev 6564) @@ -62,7 +62,7 @@ public void testFieldAccessor() throws Exception { - assertEquals("testing123", proxy.fieldAccessor("testing", 123)); + assertEquals("ing123", proxy.fieldAccessor("ing", 123)); } public void testMethodAccessor() throws Exception 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml 2008-04-21 11:08:18 UTC (rev 6564) @@ -19,7 +19,7 @@ <wsdl-file>META-INF/wsdl/TestEndpoint.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.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> </port-component-ref> </service-ref> 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml 2008-04-21 11:08:18 UTC (rev 6564) @@ -26,7 +26,7 @@ <wsdl-file>META-INF/wsdl/TestEndpoint.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.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> </port-component-ref> </service-ref> 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/jboss-client.xml 2008-04-21 11:08:18 UTC (rev 6564) @@ -7,7 +7,7 @@ <!--service-ref> <service-ref-name>service2</service-ref-name> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpoint</service-endpoint-interface> + <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-component-ref> </service-ref--> 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 10:31:51 UTC (rev 6563) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2008-04-21 11:08:18 UTC (rev 6564) @@ -26,7 +26,7 @@ <wsdl-file>WEB-INF/wsdl/TestEndpoint.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.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> </port-component-ref> </service-ref> @@ -37,7 +37,7 @@ <wsdl-file>WEB-INF/wsdl/TestEndpoint.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.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.serviceref.Endpoint</service-endpoint-interface> <enable-mtom>true</enable-mtom> </port-component-ref> </service-ref>