Author: thomas.diesler(a)jboss.com Date: 2007-10-30 16:24:48 -0400 (Tue, 30 Oct 2007) New Revision: 4941 Added: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/ Removed: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/ Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml Log: Migrate jaxrpc/serviceref to jaxrpc/samples/serviceref Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -2703,60 +2703,6 @@ </metainf> </jar> - <!-- jaxrpc-serviceref --> - <war warfile="${tests.output.dir}/libs/jaxrpc-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war destfile="${tests.output.dir}/libs/jaxrpc-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-ejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <!-- jaxrpc-utf16 --> <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-samples-jaxrpc.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-samples-jaxrpc.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -461,6 +461,60 @@ </metainf> </jar> + <!-- jaxrpc-samples-serviceref --> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxrpc-samples-swa --> <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Copied: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref (from rev 4940, stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref) Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.rmi.RemoteException; import java.util.ArrayList; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.rmi.RemoteException; import java.util.ArrayList; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.rmi.RemoteException; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.rmi.RemoteException; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import javax.xml.rpc.handler.GenericHandler; import javax.xml.namespace.QName; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.io.File; import java.net.MalformedURLException; @@ -46,11 +46,11 @@ */ 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/jaxrpc-samples-serviceref"; public static Test suite() { - return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); + return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-client.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -63,8 +63,8 @@ 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(); + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/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); @@ -76,7 +76,7 @@ public void testDynamicProxyNeg() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL wsdlURL = new File("resources/jaxrpc/samples/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 Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.io.File; import java.net.MalformedURLException; @@ -45,11 +45,11 @@ */ public class ServiceRefEJBTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; public static Test suite() { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -62,8 +62,8 @@ 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(); + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/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); Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefServletTestCase.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.io.BufferedReader; import java.io.File; @@ -46,11 +46,11 @@ */ public class ServiceRefServletTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; public static Test suite() { - return new JBossWSTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); + return new JBossWSTestSetup(ServiceRefServletTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-servlet-client.war"); } public void testWSDLAccess() throws MalformedURLException @@ -63,8 +63,8 @@ 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(); + URL wsdlURL = new File("resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/samples/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); Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.io.IOException; import java.util.ArrayList; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import java.rmi.Remote; import java.rmi.RemoteException; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -19,7 +19,7 @@ * 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.jaxrpc.samples.serviceref; import org.jboss.logging.Logger; Modified: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.java 2007-10-30 20:24:48 UTC (rev 4941) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.serviceref; +package org.jboss.test.ws.jaxrpc.samples.serviceref; import javax.xml.rpc.ServiceException; @@ -14,6 +14,6 @@ public interface TestEndpointService extends javax.xml.rpc.Service { - public org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException; + public org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException; } Copied: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref (from rev 4940, stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref) Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/META-INF/application-client.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -13,17 +13,17 @@ <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> </service-ref> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/ejb-jar.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -8,9 +8,9 @@ <enterprise-beans> <session> <ejb-name>EJBClient</ejb-name> - <home>org.jboss.test.ws.jaxrpc.serviceref.EJBRemoteHome</home> - <remote>org.jboss.test.ws.jaxrpc.serviceref.EJBRemote</remote> - <ejb-class>org.jboss.test.ws.jaxrpc.serviceref.EJBClient</ejb-class> + <home>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBRemoteHome</home> + <remote>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBRemote</remote> + <ejb-class>org.jboss.test.ws.jaxrpc.samples.serviceref.EJBClient</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> @@ -20,17 +20,17 @@ <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> </service-ref> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/jaxrpc-mapping.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -1,10 +1,10 @@ <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.serviceref</package-type> + <package-type>org.jboss.test.ws.jaxrpc.samples.serviceref</package-type> <namespaceURI>http://org.jboss.ws/wsref/types</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/wsref'>serviceNS:TestEndpointService</wsdl-service-name> <port-mapping> <port-name>TestEndpointPort</port-name> @@ -12,7 +12,7 @@ </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/wsref'>portTypeNS:TestEndpoint</wsdl-port-type> <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/wsref'>bindingNS:TestEndpointBinding</wsdl-binding> <service-endpoint-method-mapping> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-10-30 20:24:48 UTC (rev 4941) @@ -27,7 +27,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-serviceref'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -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.jaxrpc.samples.serviceref.TestEndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/WEB-INF/webservices.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/WEB-INF/webservices.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -6,7 +6,7 @@ <port-component> <port-component-name>TestEndpointPort</port-component-name> <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> <service-impl-bean> <servlet-link>TestEndpoint</servlet-link> </service-impl-bean> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -5,7 +5,7 @@ <servlet> <servlet-name>ServletClient</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.ServletClient</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.samples.serviceref.ServletClient</servlet-class> </servlet> <servlet-mapping> @@ -19,11 +19,11 @@ <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> <handler> <handler-name>Handler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.serviceref.ExampleHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.samples.serviceref.ExampleHandler</handler-class> <!--soap-header xmlns:soap-header_ns__="http://extra-header.org">soap-header_ns__:extra-header</soap-header> <soap-role>extra-header-actor</soap-role--> </handler> @@ -31,11 +31,11 @@ <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> </service-ref> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-java-wsdl.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -8,11 +8,11 @@ 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"/> + <package-namespace package="org.jboss.test.ws.jaxrpc.samples.serviceref" namespace="http://org.jboss.ws/wsref"/> </global> <java-wsdl> - <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> + <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.samples.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"/> Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-10-30 18:25:04 UTC (rev 4940) +++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/samples/serviceref/wstools-wsdl-java.xml 2007-10-30 20:24:48 UTC (rev 4941) @@ -8,7 +8,7 @@ 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"/> + <package-namespace package="org.jboss.test.ws.jaxrpc.samples.serviceref" namespace="http://org.jboss.ws/wsref"/> </global> <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl">