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/"...); + 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/"...); - 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/"&... <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/"&... <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/"&... <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>