April 2008 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

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/">ns1:TestEndpointService</service-qname> <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/">ns1:TestEndpointService</service-qname> <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 @@  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/">ns1:TestEndpointService</service-qname> <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/">ns1:TestEndpointService</service-qname> <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>

18 years

1
0
0 / 0

JBossWS SVN: r6563 - in framework/trunk: testsuite/test/ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 06:31:51 -0400 (Mon, 21 Apr 2008) New Revision: 6563 Modified: framework/trunk/ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml Log: Test* classes are picked up by surefire Property changes on: framework/trunk ___________________________________________________________________ Name: svn:ignore - target profiles.xml + target profiles.xml .settings Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-21 10:00:25 UTC (rev 6562) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-21 10:31:51 UTC (rev 6563) @@ -126,7 +126,7 @@  <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.class"/> </classes> </war> @@ -134,8 +134,8 @@ <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/EndpointImpl*.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> </classes> </war> @@ -388,8 +388,8 @@  <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/> </fileset> </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> @@ -400,8 +400,8 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> </fileset> @@ -460,7 +460,7 @@  <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> <include name="jboss-web.xml"/> @@ -537,8 +537,8 @@  <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/webfault/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/webfault/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/webfault/CustomException.class"/> <include name="org/jboss/test/ws/jaxws/webfault/SimpleException.class"/> </classes> Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 10:00:25 UTC (rev 6562) +++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 10:31:51 UTC (rev 6563) @@ -23,8 +23,8 @@  <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.class"/> </classes> </war> @@ -90,7 +90,7 @@ <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/server/Handler.class"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/> </classes> </war> @@ -207,16 +207,16 @@  <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> </classes> </war> <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> <include name="application-client.xml"/> @@ -227,8 +227,8 @@ <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> <include name="wsdl/**"/> @@ -241,8 +241,8 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> <include name="ejb-jar.xml"/> @@ -283,8 +283,8 @@  <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.class"/> </classes> </war> @@ -352,14 +352,14 @@  <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.class"/> </classes> </war> <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> <include name="application-client.xml"/> @@ -374,8 +374,8 @@ webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </classes> @@ -390,8 +390,8 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </fileset>

18 years

1
0
0 / 0

JBossWS SVN: r6562 - in framework/trunk: testsuite/test/ant-import and 26 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 06:00:25 -0400 (Mon, 21 Apr 2008) New Revision: 6562 Added: 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/jbws1190/Endpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.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/UserException.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/jbws860/UserServlet.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/exception/server/ServerHandler.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/webmethod/EndpointImpl.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/webfault/EndpointImpl.java Removed: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java Modified: framework/trunk/pom.xml framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.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/samples/exception/server/jaxws-handlers-server.xml 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/ServletClient.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/ServletClient.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws860/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/webmethod/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/webfault/WEB-INF/web.xml Log: Test* classes are picked up by surefire Modified: framework/trunk/pom.xml =================================================================== --- framework/trunk/pom.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/pom.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -47,6 +47,18 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>1.0-MR1</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -367,7 +367,7 @@ <include name="wsdl/**"/> </metainf> <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne"/> </manifest> </jar> <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/Endpoint.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/Endpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1178; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint +{ + @WebMethod + public String echo(String input); +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,37 @@ +/* + * 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.jbws1178; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -81,7 +81,7 @@ QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService"); Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); URL epURL = new URL((String)reqCtx.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); @@ -95,7 +95,7 @@ QName serviceName = new QName("http://org.jboss.ws/jbws1178", "TestEndpointService"); Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); + Endpoint port = service.getPort(Endpoint.class); Map<String, Object> reqCtx = ((BindingProvider)port).getRequestContext(); URL epURL = new URL((String)reqCtx.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)); Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1178; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - @WebMethod - public String echo(String input); -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1178/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,37 +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.jbws1178; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1178") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/Endpoint.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/Endpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,43 @@ +/* + * 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.jbws1190; + +import java.rmi.Remote; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint extends Remote +{ + + @WebMethod + public void testAddress(final String archive, final String service, final String scheme, final String port); + +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,134 @@ +/* + * 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.jbws1190; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.List; +import java.util.Map; + +import javax.jws.WebService; +import javax.wsdl.Definition; +import javax.wsdl.Port; +import javax.wsdl.Service; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.soap.SOAPAddress; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; + +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; + +/** + * [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account + * + * http://jira.jboss.org/jira/browse/JBWS-1190 + * + * @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") +public class EndpointImpl implements Endpoint +{ + + public void testAddress(final String archive, final String service, final String scheme, final String port) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); + + File dataDir = serverConfig.getServerDataDir(); + File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); + + if (wsdlDir.exists() == false) + { + throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); + } + + File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.startsWith(service); + } + }); + + File wsdlFile = null; + for (int i = 0; i < wsdls.length; i++) + { + if (wsdlFile == null || wsdls[i].compareTo(wsdlFile) > 0) + { + wsdlFile = wsdls[i]; + } + } + assertTrue("No WSDL files found", wsdlFile != null); + + Definition wsdl; + try + { + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + wsdl = wsdlReader.readWSDL(wsdlFile.getAbsolutePath()); + } + catch (WSDLException e) + { + throw new JBWS1190Exception("Error readin WSDL", e); + } + + Map services = wsdl.getServices(); + assertEquals("No of services", 1, services.size()); + + Service _service = (Service)services.values().iterator().next(); + Map ports = _service.getPorts(); + assertEquals("No of endpoints", 1, ports.size()); + Port _port = (Port)ports.values().iterator().next(); + + List extElements = _port.getExtensibilityElements(); + String address = null; + for (int i = 0; i < extElements.size(); i++) + { + if (extElements.get(i) instanceof SOAPAddress) + { + SOAPAddress soapAddrExtElement = (SOAPAddress)extElements.get(i); + address = soapAddrExtElement.getLocationURI(); + } + } + assertTrue("Address is null", address != null); + assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://")); + assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1); + } + + private void assertEquals(final String message, final int expected, final int actual) + { + if (expected != actual) + { + throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); + } + } + + private void assertTrue(final String message, final boolean value) + { + if (value == false) + { + throw new JBWS1190Exception(message); + } + } +} 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -44,7 +44,7 @@ private static final String ARCHIVE_NAME = "jaxws-jbws1190.war"; - private static TestEndpoint port; + private static Endpoint port; public static Test suite() { @@ -58,7 +58,7 @@ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestService"); Service service = Service.create(wsdlURL, qname); - port = (TestEndpoint)service.getPort(TestEndpoint.class); + port = (Endpoint)service.getPort(Endpoint.class); } } Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,43 +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.jbws1190; - -import java.rmi.Remote; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint extends Remote -{ - - @WebMethod - public void testAddress(final String archive, final String service, final String scheme, final String port); - -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,134 +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.jbws1190; - -import java.io.File; -import java.io.FilenameFilter; -import java.util.List; -import java.util.Map; - -import javax.jws.WebService; -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.WSDLException; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; - -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -/** - * [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account - * - * http://jira.jboss.org/jira/browse/JBWS-1190 - * - * @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") -public class TestEndpointImpl implements TestEndpoint -{ - - public void testAddress(final String archive, final String service, final String scheme, final String port) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); - - File dataDir = serverConfig.getServerDataDir(); - File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); - - if (wsdlDir.exists() == false) - { - throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); - } - - File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.startsWith(service); - } - }); - - File wsdlFile = null; - for (int i = 0; i < wsdls.length; i++) - { - if (wsdlFile == null || wsdls[i].compareTo(wsdlFile) > 0) - { - wsdlFile = wsdls[i]; - } - } - assertTrue("No WSDL files found", wsdlFile != null); - - Definition wsdl; - try - { - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - wsdl = wsdlReader.readWSDL(wsdlFile.getAbsolutePath()); - } - catch (WSDLException e) - { - throw new JBWS1190Exception("Error readin WSDL", e); - } - - Map services = wsdl.getServices(); - assertEquals("No of services", 1, services.size()); - - Service _service = (Service)services.values().iterator().next(); - Map ports = _service.getPorts(); - assertEquals("No of endpoints", 1, ports.size()); - Port _port = (Port)ports.values().iterator().next(); - - List extElements = _port.getExtensibilityElements(); - String address = null; - for (int i = 0; i < extElements.size(); i++) - { - if (extElements.get(i) instanceof SOAPAddress) - { - SOAPAddress soapAddrExtElement = (SOAPAddress)extElements.get(i); - address = soapAddrExtElement.getLocationURI(); - } - } - assertTrue("Address is null", address != null); - assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://")); - assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1); - } - - private void assertEquals(final String message, final int expected, final int actual) - { - if (expected != actual) - { - throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); - } - } - - private void assertTrue(final String message, final boolean value) - { - if (value == false) - { - throw new JBWS1190Exception(message); - } - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1822.shared; + +/** + * The EJB3 interface + * + * @author richard.opalka(a)jboss.org + * + * @since 08-Jan-2008 + */ +public interface BeanIface +{ + String printString(); +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,40 @@ +/* + * 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.jbws1822.shared; + +import javax.ejb.Stateless; + +/** + * The EJB3 implementation + * + * @author richard.opalka(a)jboss.org + * + * @since 08-Jan-2008 + */ +@Stateless +public class BeanImpl implements BeanIface +{ + public String printString() + { + return "Injected hello message"; + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,40 +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.jbws1822.shared; - -import javax.ejb.Stateless; - -/** - * The EJB3 implementation - * - * @author richard.opalka(a)jboss.org - * - * @since 08-Jan-2008 - */ -@Stateless -public class TestBean implements TestBeanIface -{ - public String printString() - { - return "Injected hello message"; - } -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1822.shared; - -/** - * The EJB3 interface - * - * @author richard.opalka(a)jboss.org - * - * @since 08-Jan-2008 - */ -public interface TestBeanIface -{ - String printString(); -} 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -28,7 +28,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.test.ws.jaxws.jbws1822.shared.TestBeanIface; +import org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface; /** * EJB3 bean published as WebService injecting other EJB3 bean @@ -45,7 +45,7 @@ public class EJB3Bean implements EJB3RemoteIface { @EJB - private TestBeanIface testBean; + private BeanIface testBean; @WebMethod public String getMessage() Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,37 @@ +/* + * 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.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,37 +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.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/Endpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1904; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") +public interface Endpoint +{ + String echo(String input) throws UserException; +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,47 @@ +/* + * 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.jbws1904; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +@Stateless +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +@WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*") +@WebService +( + name = "TestEndpoint", + serviceName = "TestEndpointService", + targetNamespace = "http://org.jboss.ws/jbws1904" +) +public class EndpointImpl implements Endpoint +{ + @WebMethod + public String echo(String input) throws UserException + { + return input; + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1904; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") -public interface TestEndpoint -{ - String echo(String input) throws TestException; -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,47 +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.jbws1904; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -@Stateless -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*") -@WebService -( - name = "TestEndpoint", - serviceName = "TestEndpointService", - targetNamespace = "http://org.jboss.ws/jbws1904" -) -public class TestEndpointImpl implements TestEndpoint -{ - @WebMethod - public String echo(String input) throws TestException - { - return input; - } -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,32 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1904; - -import javax.xml.bind.annotation.XmlType; -import javax.xml.ws.WebFault; - -@WebFault -( - name="TestExceptionFault", - targetNamespace="http://org.jboss.ws/jbws1904/faults" -) -@XmlType -( - name = "TestException", - namespace = "http://org.jboss.ws/jbws1904/exceptions", - propOrder = {"message"} -) -public class TestException extends Exception -{ - private static final long serialVersionUID = 3203477602591432846L; - - private String message; - - public String getMessage() - { - return message; - } - - public void setMessage(String message) - { - this.message = message; - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/UserException.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/UserException.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1904/UserException.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,32 @@ +package org.jboss.test.ws.jaxws.jbws1904; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.ws.WebFault; + +@WebFault +( + name="UserExceptionFault", + targetNamespace="http://org.jboss.ws/jbws1904/faults" +) +@XmlType +( + name = "UserException", + namespace = "http://org.jboss.ws/jbws1904/exceptions", + propOrder = {"message"} +) +public class UserException extends Exception +{ + private static final long serialVersionUID = 3203477602591432846L; + + private String message; + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/Endpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1969; + +import javax.jws.WebService; + +/** + * The SEI + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") +public interface Endpoint +{ + String echo(String input); +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,50 @@ +/* + * 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.jbws1969; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * The SEI implementation + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + */ +@Stateless +@WebService +( + name = "TestEndpoint", + serviceName = "TestEndpointService", + wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl", + targetNamespace = "http://org.jboss.ws/jbws1969" +) +@WebContext(contextRoot="jaxws-jbws1969", urlPattern="/*") +public class EndpointImpl implements Endpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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.jbws1969; - -import javax.jws.WebService; - -/** - * The SEI - * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") -public interface TestEndpoint -{ - String echo(String input); -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,50 +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.jbws1969; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; - -import org.jboss.wsf.spi.annotation.WebContext; - -/** - * The SEI implementation - * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - */ -@Stateless -@WebService -( - name = "TestEndpoint", - serviceName = "TestEndpointService", - wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl", - targetNamespace = "http://org.jboss.ws/jbws1969" -) -@WebContext(contextRoot="jaxws-jbws1969", urlPattern="/*") -public class TestEndpointImpl implements TestEndpoint -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,47 +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.jbws860; - -// $Id$ - -import java.io.IOException; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; - -/** - * @author mcantrell - */ -public class TestServlet extends HttpServlet -{ - // Provide logging - private static Logger log = Logger.getLogger(InventoryWebService.class); - - public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException - { - log.info("doGet"); - res.getWriter().println("Hello"); - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/UserServlet.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/UserServlet.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws860/UserServlet.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,47 @@ +/* + * 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.jbws860; + +// $Id$ + +import java.io.IOException; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.logging.Logger; + +/** + * @author mcantrell + */ +public class UserServlet extends HttpServlet +{ + // Provide logging + private static Logger log = Logger.getLogger(InventoryWebService.class); + + public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException + { + log.info("doGet"); + res.getWriter().println("Hello"); + } +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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; + +// $Id$ + +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 org.jboss.logging.Logger; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") +@SOAPBinding(style = Style.RPC) +public class EndpointBean +{ + private static Logger log = Logger.getLogger(EndpointBean.class); + + @WebMethod + @WebResult(name = "result") + public String echo(@WebParam(name = "String_1") String msg) + { + log.info("echo: " + msg); + return msg; + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -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; - -// $Id$ - -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 org.jboss.logging.Logger; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/asynchronous") -@SOAPBinding(style = Style.RPC) -public class TestEndpointBean -{ - private static Logger log = Logger.getLogger(TestEndpointBean.class); - - @WebMethod - @WebResult(name = "result") - public String echo(@WebParam(name = "String_1") String msg) - { - log.info("echo: " + msg); - return msg; - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,72 @@ +/* + * 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.exception.server; + +import java.util.Iterator; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.wsf.test.GenericSOAPHandler; + +/** + * A simple server side handler applying uppercase function to the error message strings. + * + * @author alessio.soldano(a)jboss.org + * @since 12-Feb-2008 + */ +public class ServerHandler extends GenericSOAPHandler +{ + @SuppressWarnings("unchecked") + public boolean handleFault(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement faultStringElement = (SOAPElement)soapBodyElement.getChildElements(new QName("faultstring")).next(); + faultStringElement.setValue(faultStringElement.getValue().toUpperCase()); + Iterator<SOAPElement> itDetail = soapBodyElement.getChildElements(new QName("detail")); + if (itDetail.hasNext()) + { + Iterator<SOAPElement> itException = itDetail.next().getChildElements(new QName("http://server.exception.samples.jaxws.ws.test.jboss.org/","UserException")); + if (itException.hasNext()) + { + SOAPElement messageElement = (SOAPElement)itException.next().getChildElements(new QName("message")).next(); + messageElement.setValue(messageElement.getValue().toUpperCase()); + } + } + } + catch (Exception e) + { + throw new WebServiceException(e); + } + return true; + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,72 +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.exception.server; - -import java.util.Iterator; - -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.wsf.test.GenericSOAPHandler; - -/** - * A simple server side handler applying uppercase function to the error message strings. - * - * @author alessio.soldano(a)jboss.org - * @since 12-Feb-2008 - */ -public class TestHandler extends GenericSOAPHandler -{ - @SuppressWarnings("unchecked") - public boolean handleFault(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); - SOAPElement faultStringElement = (SOAPElement)soapBodyElement.getChildElements(new QName("faultstring")).next(); - faultStringElement.setValue(faultStringElement.getValue().toUpperCase()); - Iterator<SOAPElement> itDetail = soapBodyElement.getChildElements(new QName("detail")); - if (itDetail.hasNext()) - { - Iterator<SOAPElement> itException = itDetail.next().getChildElements(new QName("http://server.exception.samples.jaxws.ws.test.jboss.org/","UserException")); - if (itException.hasNext()) - { - SOAPElement messageElement = (SOAPElement)itException.next().getChildElements(new QName("message")).next(); - messageElement.setValue(messageElement.getValue().toUpperCase()); - } - } - } - catch (Exception e) - { - throw new WebServiceException(e); - } - return true; - } -} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -8,7 +8,7 @@ <protocol-bindings>##SOAP11_HTTP</protocol-bindings> <handler> <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.samples.exception.server.TestHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxws.samples.exception.server.ServerHandler</handler-class> </handler> </handler-chain> </handler-chains> \ No newline at end of file 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -50,7 +50,7 @@ { InitialContext iniCtx = new InitialContext(); ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); } catch (Exception ex) { Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,50 @@ +/* + * 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.serviceref; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +/** + * Test the jaxws <service-ref> + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Mar-2007 + */ + +@WebService (name = "TestEndpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,59 @@ + +package org.jboss.test.ws.jaxws.samples.serviceref; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * 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 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-samples-serviceref?wsdl") +public class EndpointService + extends Service +{ + + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("http://tddell:8080/jaxws-samples-serviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + TESTENDPOINTSERVICE_WSDL_LOCATION = url; + } + + public EndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public EndpointService() { + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "TestEndpointService")); + } + + /** + * + * @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); + } + +} 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -43,7 +43,7 @@ private static Logger log = Logger.getLogger(ServletClient.class); @WebServiceRef(name="service3") - TestEndpointService injectedService = null; + EndpointService injectedService = null; protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { @@ -55,7 +55,7 @@ { InitialContext iniCtx = new InitialContext(); ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); } catch (Exception ex) { Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,50 +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.serviceref; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; - -/** - * Test the jaxws <service-ref> - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Mar-2007 - */ - -@WebService (name = "TestEndpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,59 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.serviceref; - -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; - - -/** - * 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 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://serviceref.samples.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-samples-serviceref?wsdl") -public class TestEndpointService - extends Service -{ - - private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; - - static { - URL url = null; - try { - url = new URL("http://tddell:8080/jaxws-samples-serviceref?wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - TESTENDPOINTSERVICE_WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.samples.jaxws.ws.test.jboss.org/", "TestEndpointService")); - } - - /** - * - * @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); - } - -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,51 @@ +/* + * 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.WebService; + +import org.jboss.logging.Logger; + +/** + * Test the JSR-181 annotation: javax.jws.WebMethod + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Aug-2005 + */ + +@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint") +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + public String echo(String input) + { + log.info("echo: " + input); + return input; + } + + public String noWebMethod(String input) + { + throw new RuntimeException("Not a @WebMethod"); + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,51 +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.WebService; - -import org.jboss.logging.Logger; - -/** - * Test the JSR-181 annotation: javax.jws.WebMethod - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Aug-2005 - */ - -@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.samples.webmethod.TestEndpoint") -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echo(String input) - { - log.info("echo: " + input); - return input; - } - - public String noWebMethod(String input) - { - throw new RuntimeException("Not a @WebMethod"); - } -} 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -37,12 +37,12 @@ @Stateless // Test on type with wsdlLocation -@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") // Test multiple on type @WebServiceRefs( { - @WebServiceRef(name = "service2", value = TestEndpointService.class), - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) + @WebServiceRef(name = "service2", value = EndpointService.class), + @WebServiceRef(name = "port1", value = EndpointService.class, type = TestEndpoint.class) }) public class EJB3Client implements EJB3Remote { // Provide logging @@ -50,34 +50,34 @@ // Test on field with name @WebServiceRef(name = "TestEndpointService3") - public TestEndpointService service3; + public EndpointService service3; // Test on field without name @WebServiceRef - public TestEndpointService service4; + public EndpointService service4; // Test on method with value @WebServiceRef(name = "TestEndpointService5") - public void setService5(TestEndpointService service) + public void setService5(EndpointService service) { this.service5 = service; } - private TestEndpointService service5; + private EndpointService service5; // Test on method without name @WebServiceRef - public void setService6(TestEndpointService service) + public void setService6(EndpointService service) { this.service6 = service; } - private TestEndpointService service6; + private EndpointService service6; // Test on field with name and value - @WebServiceRef(name = "Port2", value = TestEndpointService.class) + @WebServiceRef(name = "Port2", value = EndpointService.class) public TestEndpoint port2; // Test on field with value - @WebServiceRef(value = TestEndpointService.class) + @WebServiceRef(value = EndpointService.class) public TestEndpoint port3; public String echo(String inStr) @@ -88,16 +88,16 @@ try { InitialContext iniCtx = new InitialContext(); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service1")).getTestEndpointPort()); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/service2")).getTestEndpointPort()); + 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(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService3")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService3")).getTestEndpointPort()); ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); + 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(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/Port2")); Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,131 @@ +/* + * 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.webserviceref; + +import java.util.ArrayList; + +import javax.naming.InitialContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService; +import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint; + +// Test on type with wsdlLocation +@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + +// Test multiple on type +@WebServiceRefs( { + @WebServiceRef(name = "service2", value = EndpointService.class), + @WebServiceRef(name = "port1", value = EndpointService.class, type = TestEndpoint.class) }) +public class EndpointClientOne +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointClientOne.class); + + // Test on field with name + @WebServiceRef(name = "TestEndpointService3") + static EndpointService service3; + + // Test on field without name + @WebServiceRef + static EndpointService service4; + + // Test on method with name + @WebServiceRef(name = "TestEndpointService5") + static void setService5(EndpointService service) + { + EndpointClientOne.service5 = service; + } + private static EndpointService service5; + + // Test on method without name + @WebServiceRef + static void setService6(EndpointService service) + { + EndpointClientOne.service6 = service; + } + private static EndpointService service6; + + // Test on field with name and value + @WebServiceRef(name = "Port2", value = EndpointService.class) + static TestEndpoint port2; + + // Test on field with value + @WebServiceRef(value = EndpointService.class) + static TestEndpoint port3; + + // Test on field + @WebServiceRef + static TestEndpoint port4; + + // Test on field with name + @WebServiceRef (name = "Port5") + static TestEndpoint port5; + + static InitialContext iniCtx; + static String retStr; + + public static void main(String[] args) + { + String inStr = args[0]; + log.info("echo: " + inStr); + + ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + 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(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); + ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add((TestEndpoint)service6.getPort(TestEndpoint.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(port2); + ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); + ports.add(port3); + ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/" + EndpointClientOne.class.getName() + "/port3")); + ports.add(port4); + ports.add(port5); + } + catch (Exception ex) + { + log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (TestEndpoint port : ports) + { + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + retStr = inStr; + } +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientTwo.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,209 @@ +/* + * 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.webserviceref; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import javax.naming.InitialContext; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +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.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) }) +public class EndpointClientTwo +{ + // provide logging + private static final Logger log = Logger.getLogger(EndpointClientTwo.class); + + // Test on field + @WebServiceRef(name = "Service3") + static Service service3; + + // Test on field + @WebServiceRef(name = "Service4") + static EndpointService service4; + + // Test on field + @WebServiceRef(name = "Port2") + static TestEndpoint port2; + + // Test on field + @WebServiceRef(name = "Port3") + static TestEndpoint port3; + + static InitialContext iniCtx; + static Map<String, String> testResult = new HashMap<String, String>(); + + public static void main(String[] args) throws Exception + { + String testName = args[0]; + EndpointClientTwo client = new EndpointClientTwo(); + Method method = EndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); + try + { + String retStr = (String)method.invoke(client, testName); + testResult.put(testName, retStr); + } + catch (InvocationTargetException ex) + { + log.error("Invocation error", ex); + testResult.put(testName, ex.getTargetException().toString()); + } + catch (Exception ex) + { + log.error("Error", ex); + testResult.put(testName, ex.toString()); + } + } + + /** + * Customize service-class-name, service-qname + */ + public String testService1(String reqStr) throws Exception + { + EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service1"); + TestEndpoint port = service.getTestEndpointPort(); + return port.echo(reqStr); + } + + /** + * Customize config-name, config-file + */ + public String testService2(String reqStr) throws Exception + { + Service service = (Service)iniCtx.lookup("java:comp/env/Service2"); + + TestEndpoint port = service.getPort(TestEndpoint.class); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize service-class-name, service-qname + */ + public String testService3(String reqStr) throws Exception + { + TestEndpoint port = ((EndpointService)service3).getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + + EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service3"); + port = service.getTestEndpointPort(); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize config-name, config-file + */ + public String testService4(String reqStr) throws Exception + { + TestEndpoint port = service4.getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + //verifyConfig((ConfigProvider)port); + + EndpointService service = (EndpointService)iniCtx.lookup("java:comp/env/Service4"); + port = service.getTestEndpointPort(); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: port-qname, config-name, config-file + */ + public String testPort1(String reqStr) throws Exception + { + TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port1"); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize port-info: service-endpoint-interface, config-name, config-file + */ + public String testPort2(String reqStr) throws Exception + { + //verifyConfig((ConfigProvider)port2); + String resStr1 = port2.echo(reqStr); + + TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port2"); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: service-endpoint-interface, port-qname, stub-property + */ + public String testPort3(String reqStr) throws Exception + { + String resStr1 = port3.echo(reqStr); + + BindingProvider bp = (BindingProvider)port3; + verifyProperties(bp.getRequestContext()); + + TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port3"); + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + private void verifyProperties(Map<String, Object> ctx) + { + String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); + if ("kermit".equals(username) == false) + throw new RuntimeException("Invalid username: " + username); + + String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); + if ("thefrog".equals(password) == false) + throw new RuntimeException("Invalid password: " + password); + } + + /*private void verifyConfig(ConfigProvider cp) + { + if ("Custom Client".equals(cp.getConfigName()) == false) + throw new RuntimeException("Invalid config name: " + cp.getConfigName()); + + if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) + throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); + } */ +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,44 @@ +/* + * 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.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.logging.Logger; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@SOAPBinding(style = Style.RPC) +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,55 @@ + +package org.jboss.test.ws.jaxws.samples.webserviceref; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", 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"); + + static { + URL url = null; + try { + url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public EndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public EndpointService() { + super(WSDL_LOCATION, TESTENDPOINTSERVICE); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(TESTENDPOINTPORT, TestEndpoint.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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -36,12 +36,12 @@ import org.jboss.logging.Logger; //Test on type with wsdlLocation -@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") +@WebServiceRef(name = "service1", value = EndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") // Test multiple on type @WebServiceRefs( { - @WebServiceRef(name = "service2", value = TestEndpointService.class), - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) + @WebServiceRef(name = "service2", value = EndpointService.class), + @WebServiceRef(name = "port1", value = EndpointService.class, type = TestEndpoint.class) }) public class ServletClient extends HttpServlet { // Provide logging @@ -49,34 +49,34 @@ // Test on field with name @WebServiceRef(name = "TestEndpointService3") - public TestEndpointService service3; + public EndpointService service3; // Test on field without name @WebServiceRef - public TestEndpointService service4; + public EndpointService service4; // Test on method with value @WebServiceRef(name = "TestEndpointService5") - public void setService5(TestEndpointService service) + public void setService5(EndpointService service) { this.service5 = service; } - private TestEndpointService service5; + private EndpointService service5; // Test on method without name @WebServiceRef - public void setService6(TestEndpointService service) + public void setService6(EndpointService service) { this.service6 = service; } - private TestEndpointService service6; + private EndpointService service6; // Test on field with name and value - @WebServiceRef(name = "Port2", value = TestEndpointService.class) + @WebServiceRef(name = "Port2", value = EndpointService.class) public TestEndpoint port2; // Test on field with value - @WebServiceRef(value = TestEndpointService.class) + @WebServiceRef(value = EndpointService.class) public TestEndpoint port3; @Override @@ -89,16 +89,16 @@ try { InitialContext iniCtx = new InitialContext(); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + 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(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service4")).getTestEndpointPort()); ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); + ports.add(((EndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,131 +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.webserviceref; - -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService; -import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint; - -// Test on type with wsdlLocation -@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") - -// Test multiple on type -@WebServiceRefs( { - @WebServiceRef(name = "service2", value = TestEndpointService.class), - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) -public class TestEndpointClientOne -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointClientOne.class); - - // Test on field with name - @WebServiceRef(name = "TestEndpointService3") - static TestEndpointService service3; - - // Test on field without name - @WebServiceRef - static TestEndpointService service4; - - // Test on method with name - @WebServiceRef(name = "TestEndpointService5") - static void setService5(TestEndpointService service) - { - TestEndpointClientOne.service5 = service; - } - private static TestEndpointService service5; - - // Test on method without name - @WebServiceRef - static void setService6(TestEndpointService service) - { - TestEndpointClientOne.service6 = service; - } - private static TestEndpointService service6; - - // Test on field with name and value - @WebServiceRef(name = "Port2", value = TestEndpointService.class) - static TestEndpoint port2; - - // Test on field with value - @WebServiceRef(value = TestEndpointService.class) - static TestEndpoint port3; - - // Test on field - @WebServiceRef - static TestEndpoint port4; - - // Test on field with name - @WebServiceRef (name = "Port5") - static TestEndpoint port5; - - static InitialContext iniCtx; - static String retStr; - - public static void main(String[] args) - { - String inStr = args[0]; - log.info("echo: " + inStr); - - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); - try - { - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - ports.add((TestEndpoint)service3.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); - ports.add((TestEndpoint)service4.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); - ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); - ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); - ports.add(port2); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); - ports.add(port3); - ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/port3")); - ports.add(port4); - ports.add(port5); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new WebServiceException(ex); - } - - for (TestEndpoint port : ports) - { - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new WebServiceException("Invalid echo return: " + inStr); - } - - retStr = inStr; - } -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,209 +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.webserviceref; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -import javax.naming.InitialContext; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -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.TestEndpointService; -//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) }) -public class TestEndpointClientTwo -{ - // provide logging - private static final Logger log = Logger.getLogger(TestEndpointClientTwo.class); - - // Test on field - @WebServiceRef(name = "Service3") - static Service service3; - - // Test on field - @WebServiceRef(name = "Service4") - static TestEndpointService service4; - - // Test on field - @WebServiceRef(name = "Port2") - static TestEndpoint port2; - - // Test on field - @WebServiceRef(name = "Port3") - static TestEndpoint port3; - - static InitialContext iniCtx; - static Map<String, String> testResult = new HashMap<String, String>(); - - public static void main(String[] args) throws Exception - { - String testName = args[0]; - TestEndpointClientTwo client = new TestEndpointClientTwo(); - Method method = TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); - try - { - String retStr = (String)method.invoke(client, testName); - testResult.put(testName, retStr); - } - catch (InvocationTargetException ex) - { - log.error("Invocation error", ex); - testResult.put(testName, ex.getTargetException().toString()); - } - catch (Exception ex) - { - log.error("Error", ex); - testResult.put(testName, ex.toString()); - } - } - - /** - * Customize service-class-name, service-qname - */ - public String testService1(String reqStr) throws Exception - { - TestEndpointService service = (TestEndpointService)iniCtx.lookup("java:comp/env/Service1"); - TestEndpoint port = service.getTestEndpointPort(); - return port.echo(reqStr); - } - - /** - * Customize config-name, config-file - */ - public String testService2(String reqStr) throws Exception - { - Service service = (Service)iniCtx.lookup("java:comp/env/Service2"); - - TestEndpoint port = service.getPort(TestEndpoint.class); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize service-class-name, service-qname - */ - public String testService3(String reqStr) throws Exception - { - TestEndpoint port = ((TestEndpointService)service3).getTestEndpointPort(); - String resStr1 = port.echo(reqStr); - - TestEndpointService service = (TestEndpointService)iniCtx.lookup("java:comp/env/Service3"); - port = service.getTestEndpointPort(); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize config-name, config-file - */ - public String testService4(String reqStr) throws Exception - { - TestEndpoint port = service4.getTestEndpointPort(); - String resStr1 = port.echo(reqStr); - //verifyConfig((ConfigProvider)port); - - TestEndpointService service = (TestEndpointService)iniCtx.lookup("java:comp/env/Service4"); - port = service.getTestEndpointPort(); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: port-qname, config-name, config-file - */ - public String testPort1(String reqStr) throws Exception - { - TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port1"); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize port-info: service-endpoint-interface, config-name, config-file - */ - public String testPort2(String reqStr) throws Exception - { - //verifyConfig((ConfigProvider)port2); - String resStr1 = port2.echo(reqStr); - - TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port2"); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: service-endpoint-interface, port-qname, stub-property - */ - public String testPort3(String reqStr) throws Exception - { - String resStr1 = port3.echo(reqStr); - - BindingProvider bp = (BindingProvider)port3; - verifyProperties(bp.getRequestContext()); - - TestEndpoint port = (TestEndpoint)iniCtx.lookup("java:comp/env/Port3"); - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - private void verifyProperties(Map<String, Object> ctx) - { - String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); - if ("kermit".equals(username) == false) - throw new RuntimeException("Invalid username: " + username); - - String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); - if ("thefrog".equals(password) == false) - throw new RuntimeException("Invalid password: " + password); - } - - /*private void verifyConfig(ConfigProvider cp) - { - if ("Custom Client".equals(cp.getConfigName()) == false) - throw new RuntimeException("Invalid config name: " + cp.getConfigName()); - - if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) - throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); - } */ -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,44 +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.webserviceref; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.logging.Logger; - -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") -@SOAPBinding(style = Style.RPC) -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,55 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.webserviceref; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") -public class TestEndpointService - 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"); - - static { - URL url = null; - try { - url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(WSDL_LOCATION, TESTENDPOINTSERVICE); - } - - /** - * - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(TESTENDPOINTPORT, TestEndpoint.class); - } - -} 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -52,7 +52,7 @@ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); QName serviceQName = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - TestEndpointService service = new TestEndpointService(wsdlURL, serviceQName); + EndpointService service = new EndpointService(wsdlURL, serviceQName); TestEndpoint port = service.getTestEndpointPort(); String helloWorld = "Hello World!"; @@ -75,9 +75,9 @@ public void testApplicationClient() throws Throwable { String helloWorld = "Hello World!"; - TestEndpointClientOne.iniCtx = getInitialContext(); + EndpointClientOne.iniCtx = getInitialContext(); - new ClientLauncher().launch(TestEndpointClientOne.class.getName(), "jbossws-client", new String[] { helloWorld }); - assertEquals(helloWorld, TestEndpointClientOne.retStr); + new ClientLauncher().launch(EndpointClientOne.class.getName(), "jbossws-client", new String[] { helloWorld }); + assertEquals(helloWorld, EndpointClientOne.retStr); } } Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java (from rev 6560, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/EndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -0,0 +1,51 @@ +/* + * 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 org.jboss.logging.Logger; + +/** + * Test the JSR-181 annotation: javax.jws.WebFault + * + * @author alessio.soldano(a)jboss.org + * @since 21-Feb-2008 + */ +@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + public void throwCustomException(String input) throws CustomException + { + log.info("throwCustomException: " + input); + throw new CustomException("This is a @WebFault test", (input != null ? input.length() : 0)); + } + + public void throwSimpleException(String input) throws SimpleException + { + log.info("throwSimpleException: " + input); + throw new SimpleException("This is a @WebFault test", (input != null ? input.length() : 0)); + } +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java 2008-04-21 10:00:25 UTC (rev 6562) @@ -1,51 +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 org.jboss.logging.Logger; - -/** - * Test the JSR-181 annotation: javax.jws.WebFault - * - * @author alessio.soldano(a)jboss.org - * @since 21-Feb-2008 - */ -@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - public void throwCustomException(String input) throws CustomException - { - log.info("throwCustomException: " + input); - throw new CustomException("This is a @WebFault test", (input != null ? input.length() : 0)); - } - - public void throwSimpleException(String input) throws SimpleException - { - log.info("throwSimpleException: " + input); - throw new SimpleException("This is a @WebFault test", (input != null ? input.length() : 0)); - } -} Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1178/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1178.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jbws1178.EndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -10,7 +10,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1190.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jbws1190.EndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/jbws1854/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1854.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jbws1854.EndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/jbws860/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws860/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/jbws860/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -10,7 +10,7 @@ <servlet> <servlet-name>TestServlet</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws860.TestServlet</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jbws860.UserServlet</servlet-class> </servlet> <servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/asynchronous/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.asynchronous.TestEndpointBean</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.asynchronous.EndpointBean</servlet-class> </servlet> <servlet-mapping> 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/application-client.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -15,7 +15,7 @@ <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/">ns1:TestEndpointService</service-qname> <port-component-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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/META-INF/ejb-jar.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -22,7 +22,7 @@ <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/">ns1:TestEndpointService</service-qname> <port-component-ref> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.serviceref.EndpointImpl</servlet-class> </servlet> <servlet-mapping> 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 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -22,7 +22,7 @@ <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxws.samples.serviceref.EndpointService</service-interface> <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <service-qname xmlns:ns1="http://serviceref.samples.jaxws.ws.test.jboss.org/">ns1:TestEndpointService</service-qname> <port-component-ref> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webmethod/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webmethod/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webmethod/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.webmethod.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.webmethod.EndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -35,7 +35,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service4</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/service4</service-ref-name> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -53,7 +53,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/service6</service-ref-name> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -80,7 +80,7 @@ @WebServiceRef(value = TestEndpointService.class) --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port3</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/port3</service-ref-name> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -89,7 +89,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port4</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne/port4</service-ref-name> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Modified: framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/samples/webserviceref/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: framework/trunk/testsuite/test/resources/jaxws/webfault/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/webfault/WEB-INF/web.xml 2008-04-21 09:52:07 UTC (rev 6561) +++ framework/trunk/testsuite/test/resources/jaxws/webfault/WEB-INF/web.xml 2008-04-21 10:00:25 UTC (rev 6562) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.webfault.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.webfault.EndpointImpl</servlet-class> </servlet> <servlet-mapping>

18 years

1
0
0 / 0

JBossWS SVN: r6561 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-04-21 05:52:07 -0400 (Mon, 21 Apr 2008) New Revision: 6561 Modified: stack/metro/trunk/ant-import/build-thirdparty.xml Log: enforce metro rebuild when force.thirdparty.get=true Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-21 09:03:15 UTC (rev 6560) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-21 09:52:07 UTC (rev 6561) @@ -44,7 +44,7 @@ <echo message="checksum.ok=${checksum.ok}"/> </target> - <target name="thirdparty-delete" depends="thirdparty-init" unless="checksum.ok.true"> + <target name="thirdparty-delete" depends="thirdparty-init" if="force.thirdparty.get"> <delete dir="${thirdparty.dir}"/> </target> @@ -170,8 +170,18 @@ </target> <target name="metro-build-required" depends="metro-checkout-dir" if="glassfish.metro.available"> - <available property="metro.build.available" file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}" type="file"/> - <echo message="metro.build.available=${metro.build.available}"/> + <available property="metro.build.is.available" file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}" type="file"/> + + <condition property="metro.build.available" value="true"> + <and> + <equals arg1="${metro.build.is.available}" arg2="true"/> + <not> + <equals arg1="${force.thirdparty.get}" arg2="true"/> + </not> + </and> + </condition> + + <echo message="*** metro.build.available=${metro.build.available} ***"/> </target> <target name="metro-cvs-build" depends="metro-checkout,metro-build-required" unless="metro.build.available"> @@ -199,7 +209,8 @@ </target>  - <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" unless="metro.build.available"> + <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" + unless="metro.build.available"> <mkdir dir="${thirdparty.dir}"/> <property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>

18 years

1
0
0 / 0

JBossWS SVN: r6560 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 05:03:15 -0400 (Mon, 21 Apr 2008) New Revision: 6560 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java Log: Fix resource path Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-04-21 08:23:48 UTC (rev 6559) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-04-21 09:03:15 UTC (rev 6560) @@ -112,7 +112,7 @@ public void testCatalog() throws Exception { consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog"); - consumer.setCatalog(getResourceFile("jaxws/spi/tools/wsdl/jax-ws-catalog.xml")); + consumer.setCatalog(getResourceFile("jaxws/smoke/tools/wsdl/jax-ws-catalog.xml")); consumer.setGenerateSource(true); consumer.setOutputDirectory(outputDirectory); consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl").getCanonicalPath());

18 years

1
0
0 / 0

JBossWS SVN: r6559 - stack/cxf/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 04:23:48 -0400 (Mon, 21 Apr 2008) New Revision: 6559 Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml Log: jbossws-common-src.jar Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-04-19 21:30:38 UTC (rev 6558) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-04-21 08:23:48 UTC (rev 6559) @@ -77,7 +77,7 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.jar" dest="${thirdparty.dir}/jbossws-common-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.jar" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>

18 years

1
0
0 / 0

JBossWS SVN: r6558 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-19 17:30:38 -0400 (Sat, 19 Apr 2008) New Revision: 6558 Modified: stack/cxf/trunk/version.properties Log: jbossws-common=3.0.0-SNAPSHOT Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-04-19 21:29:58 UTC (rev 6557) +++ stack/cxf/trunk/version.properties 2008-04-19 21:30:38 UTC (rev 6558) @@ -33,7 +33,7 @@ # Dependend integration projects jbossws-spi=3.0.0-SNAPSHOT -jbossws-common=snapshot +jbossws-common=3.0.0-SNAPSHOT jbossws-framework=3.0.2-SNAPSHOT jbossws-jboss422=4.2.2.DEV

18 years

1
0
0 / 0

JBossWS SVN: r6557 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-19 17:29:58 -0400 (Sat, 19 Apr 2008) New Revision: 6557 Modified: stack/metro/trunk/version.properties Log: jbossws-common=3.0.0-SNAPSHOT Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-04-19 21:27:23 UTC (rev 6556) +++ stack/metro/trunk/version.properties 2008-04-19 21:29:58 UTC (rev 6557) @@ -15,7 +15,7 @@ # Dependend integration projects jbossws-spi=3.0.0-SNAPSHOT -jbossws-common=snapshot +jbossws-common=3.0.0-SNAPSHOT jbossws-framework=3.0.2-SNAPSHOT jbossws-jboss422=4.2.2.DEV

18 years

1
0
0 / 0

JBossWS SVN: r6556 - in stack/native/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-19 17:27:23 -0400 (Sat, 19 Apr 2008) New Revision: 6556 Modified: stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/version.properties Log: jbossws-common=3.0.0-SNAPSHOT Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-19 21:26:34 UTC (rev 6555) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-19 21:27:23 UTC (rev 6556) @@ -84,7 +84,7 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.jar" dest="${thirdparty.dir}/jbossws-common-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.jar" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-04-19 21:26:34 UTC (rev 6555) +++ stack/native/trunk/version.properties 2008-04-19 21:27:23 UTC (rev 6556) @@ -25,7 +25,7 @@ # Dependend integration projects jbossws-spi=3.0.0-SNAPSHOT -jbossws-common=snapshot +jbossws-common=3.0.0-SNAPSHOT jbossws-framework=3.0.2-SNAPSHOT jbossws-jboss422=4.2.2.DEV

18 years

1
0
0 / 0

JBossWS SVN: r6555 - in framework/trunk: testsuite/test/ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-19 17:26:34 -0400 (Sat, 19 Apr 2008) New Revision: 6555 Modified: framework/trunk/.classpath framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: add system props for test libs/resources Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2008-04-19 21:16:38 UTC (rev 6554) +++ framework/trunk/.classpath 2008-04-19 21:26:34 UTC (rev 6555) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="testsuite/test/java"/> <classpathentry kind="src" path="src/test/java"> <attributes> <attribute name="maven.type" value="test"/> Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-19 21:16:38 UTC (rev 6554) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-19 21:26:34 UTC (rev 6555) @@ -417,6 +417,8 @@ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> + <sysproperty key="test.archive.directory" value="${tests.output.dir}/libs"/> + <sysproperty key="test.resources.directory" value="${tests.output.dir}/resources"/> <classpath> <path refid="tests.client.classpath"/> <pathelement location="${tests.output.dir}/classes"/> @@ -475,6 +477,8 @@ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> + <sysproperty key="test.archive.directory" value="${tests.output.dir}/libs"/> + <sysproperty key="test.resources.directory" value="${tests.output.dir}/resources"/> <classpath> <path refid="tests.client.classpath"/> <pathelement location="${tests.output.dir}/classes"/> @@ -543,4 +547,4 @@ </eclipseJUnitTestGenerator> </target> -</project> +</project> \ No newline at end of file

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008