Author: thomas.diesler(a)jboss.com Date: 2007-03-12 10:33:20 -0400 (Mon, 12 Mar 2007) New Revision: 2600 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java trunk/jbossws-tests/src/resources/jaxws/serviceref/ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Removed: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ApplicationClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemoteHome.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointService.java trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml Log: Initial test for jaxws <service-ref> Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-12 10:43:36 UTC (rev 2599) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -232,6 +232,13 @@ </webinf> </war> + <!-- jaxws-serviceref --> + <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/> + </classes> + </war> + <!-- jaxws-wrapped-accessor --> <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -333,118 +340,6 @@ </webinf> </war> - <!-- interop --> - - <!-- Root.war --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war" - webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml"> - <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/root"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-wsa10-service --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/wsa"> - <include name="*.*"/> - </fileset> - </war> - - <!-- wsse --> - <!-- jbossws-interop-wsse10Sign --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar"> - <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"> - <include name="jboss-wsse-client.xml"/> - </metainf> - </jar> - - <!-- jbossws-interop-wsse10Encrypt --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar"> - <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"> - <include name="jboss-wsse-client.xml"/> - </metainf> - </jar> - - <!-- base data types --> - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/> - <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/> - <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/> - <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - <!-- end interop --> - <!-- Please add alphabetically --> </target> Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref (from rev 2596, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref) Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ApplicationClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ApplicationClient.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,68 +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.jaxrpc.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ApplicationClient -{ - // Provide logging - private static Logger log = Logger.getLogger(ApplicationClient.class); - - public static InitialContext encCtx; - public static String retStr; - - public static void main(String[] args) throws RemoteException - { - String inStr = args[0]; - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - retStr = inStr; - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,93 +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.jaxrpc.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class EJBClient implements SessionBean -{ - // Provide logging - private static Logger log = Logger.getLogger(EJBClient.class); - - private SessionContext context; - - public String echo(String inStr) throws RemoteException - { - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - 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()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - return inStr; - } - - // EJB Lifecycle ---------------------------------------------------------------------- - - public void setSessionContext(SessionContext context) throws EJBException, RemoteException - { - this.context = context; - } - - public void ejbCreate() - { - } - - public void ejbRemove() - { - } - - public void ejbActivate() - { - } - - public void ejbPassivate() - { - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,31 +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.jaxrpc.serviceref; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -public interface EJBRemote extends EJBObject -{ - String echo(String input) throws RemoteException; -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemoteHome.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemoteHome.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -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.jaxrpc.serviceref; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -public interface EJBRemoteHome extends EJBHome -{ - EJBRemote create() throws CreateException, RemoteException; -} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -19,38 +19,35 @@ * 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.jaxrpc.serviceref; +package org.jboss.test.ws.jaxws.serviceref; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.ServiceFactory; +import javax.xml.ws.Service; import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; /** - * Test the JAXRPC <service-ref> + * Test the JAXWS <service-ref> * * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 + * @since 123-Mar-2007 */ public class ServiceRefClientTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref"; public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); + return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxws-serviceref.war"); //ant , jaxws-serviceref-client.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -63,42 +60,13 @@ public void testDynamicProxy() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + URL wsdlURL = new File("resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://serviceref.jaxws.ws.test.jboss.org/";, "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } - - public void testDynamicProxyNeg() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); - try - { - TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); - fail("Expected ServiceException, but got: " + port); - } - catch (ServiceException ex) - { - // this is tested by the CTS - } - catch (Exception ex) - { - fail("Expected ServiceException, but got: " + ex); - } - } - - public void testApplicationClient() throws Exception - { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); - } } Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,87 +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.jaxrpc.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefEJBTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testEJBClient() throws Exception - { - InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); - EJBRemote ejbRemote = ejbHome.create(); - - String helloWorld = "Hello World!"; - Object retObj = ejbRemote.echo(helloWorld); - assertEquals(helloWorld, retObj); - - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,84 +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.jaxrpc.serviceref; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefServletTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testServletClient() throws Exception - { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,70 +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.jaxrpc.serviceref; - -import java.io.IOException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ServletClient extends HttpServlet -{ - // Provide logging - private static Logger log = Logger.getLogger(ServletClient.class); - - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - String inStr = req.getParameter("echo"); - log.info("doGet: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - 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()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - res.getWriter().print(inStr); - } -} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpoint.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,31 +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.jaxrpc.serviceref; -import java.rmi.Remote; -import java.rmi.RemoteException; +package org.jboss.test.ws.jaxws.serviceref; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; -public interface TestEndpoint extends Remote -{ - String echo(String arg0) throws RemoteException; + +/** + * JBossWS Generated Source + * + * Generation Date: Mon Mar 12 15:09:39 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://serviceref.jaxws.ws.test.jboss.org/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + } Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,42 +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.jaxrpc.serviceref; - -import org.jboss.logging.Logger; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.org - * @since 23-Oct-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java (from rev 2599, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -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.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; + } +} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointService.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointService.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,19 +1,59 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ -//Auto Generated by jbossws - Please do not edit!!! +package org.jboss.test.ws.jaxws.serviceref; -package org.jboss.test.ws.jaxrpc.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; -import javax.xml.rpc.ServiceException; +/** + * 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.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-serviceref?wsdl") +public class TestEndpointService + extends Service +{ + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; -public interface TestEndpointService extends javax.xml.rpc.Service -{ + static { + URL url = null; + try { + url = new URL("http://tddell:8080/jaxws-serviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + TESTENDPOINTSERVICE_WSDL_LOCATION = url; + } - public org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException; + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + public TestEndpointService() { + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.jaxws.ws.test.jboss.org/";, "TestEndpointService")); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(new QName("http://serviceref.jaxws.ws.test.jboss.org/";, "TestEndpointPort"), TestEndpoint.class); + } + } Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref (from rev 2596, trunk/jbossws-tests/src/resources/jaxrpc/serviceref) Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF) Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-03-12 10:43:36 UTC (rev 2599) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echo'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </output> - </operation> - </binding> - <service name='TestEndpointService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-serviceref'/> - </port> - </service> +<definitions name='TestEndpointService' targetNamespace='http://serviceref.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://serviceref.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types></types> + <message name='TestEndpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://serviceref.jaxws.ws.test.jboss.org/' use='literal'/> + </input> + <output> + <soap:body namespace='http://serviceref.jaxws.ws.test.jboss.org/' use='literal'/> + </output> + </operation> + </binding> + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jbosstest.host.name@:8080/jaxws-serviceref'/> + </port> + </service> </definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/WEB-INF) Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-03-12 10:43:36 UTC (rev 2599) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.serviceref.TestEndpointImpl</servlet-class> </servlet> <servlet-mapping> Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../../output/classes -config wstools-java-wsdl.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <java-wsdl> - <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> - <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-java-wsdl.xml) =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -cp ../../../../../output/classes -config wstools-java-wsdl.xml +--> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <java-wsdl> + <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> + <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-wsdl-java.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-wsdl-java.xml) =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -config wstools-wsdl-java.xml +--> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> + +</configuration> \ No newline at end of file