Author: alessio.soldano(a)jboss.com Date: 2010-08-27 12:39:05 -0400 (Fri, 27 Aug 2010) New Revision: 12872 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java Log: [JBWS-3103] Adding further tests Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-27 16:38:33 UTC (rev 12871) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-08-27 16:39:05 UTC (rev 12872) @@ -1009,6 +1009,16 @@ <include name="wsdl/**" /> </webinf> </war> + + <!-- jaxws-endpoint-ws --> + <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-ws.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web-ws.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.class" /> + <include name="org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.class" /> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class" /> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class" /> + </classes> + </war> <!-- jaxws namespace --> <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2010-08-27 16:38:33 UTC (rev 12871) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2010-08-27 16:39:05 UTC (rev 12872) @@ -48,7 +48,7 @@ public static Test suite() { - return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")); + return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war jaxws-endpoint-ws.war")); } public void testWSDLAccess() throws Exception @@ -76,7 +76,18 @@ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } + + public void testWSAccess() throws Exception + { + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "WSClientEndpointService"); + Service service = Service.create(new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-ws?wsdl"), qname); + WSClientEndpointInterface port = (WSClientEndpointInterface)service.getPort(WSClientEndpointInterface.class); + String helloWorld = "Hello world!"; + Object retObj = port.echo(helloWorld, getServerHost(), 9796); + assertEquals(helloWorld, retObj); + } + private void readWSDL(URL wsdlURL) throws Exception { WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.java 2010-08-27 16:39:05 UTC (rev 12872) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.endpoint; + +import java.net.URL; + +import javax.jws.WebService; +import javax.xml.namespace.QName; +import javax.xml.ws.Endpoint; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +/** + * An endpoint that publishes and invokes another endpoint using Endpoint.publish(..) API + * + * @author alessio.soldano(a)jboss.com + * @since 26-Aug-2010 + * + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.WSClientEndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "WSClientEndpointService") +public class WSClientEndpointBean implements WSClientEndpointInterface +{ + public String echo(String input, String serverHost, int port) + { + Endpoint ep = Endpoint.create(new EndpointBean()); + String publishUrl = "http://" + serverHost + ":" + port + "/foo/bar"; + ep.publish(publishUrl); + + try + { + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService"); + Service service = Service.create(new URL(publishUrl + "?wsdl"), qname); + EndpointInterface proxy = (EndpointInterface) service.getPort(EndpointInterface.class); + return proxy.echo(input); + } + catch (Exception e) + { + throw new WebServiceException(e); + } + finally + { + if (ep != null) + { + ep.stop(); + } + } + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.java 2010-08-27 16:39:05 UTC (rev 12872) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.endpoint; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +import javax.jws.WebService; + +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint") +public interface WSClientEndpointInterface extends Remote +{ + String echo(String input, String serverHost, int port) throws RemoteException; +} Added: framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/endpoint/WEB-INF/web-ws.xml 2010-08-27 16:39:05 UTC (rev 12872) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>WSClientTestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.endpoint.WSClientEndpointBean</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>WSClientTestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> +