Author: asoldano Date: 2014-06-26 08:49:31 -0400 (Thu, 26 Jun 2014) New Revision: 18768 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java Removed: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java Log: [JBWS-3711] Completed migration of shared testsuite to ShrinkWrap Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-06-26 12:49:31 UTC (rev 18768) @@ -112,7 +112,6 @@ </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> <ant antfile="${tests.dir}/ant-import/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> </target> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-06-26 12:49:31 UTC (rev 18768) @@ -88,7 +88,6 @@ <property name="log4j.output.dir" value="${log4j.output.dir}"/> <property name="endorsed.dir" value="${project.build.directory}/endorsed"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> - <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> </configuration> </execution> Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-26 12:49:31 UTC (rev 18768) @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., 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. - --> - -<project> - - <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-samples-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/test-libs"/> - - <!-- jaxws-classloading-service --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class" /> - </fileset> - </jar> - - <!-- jaxws-classloading-types --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class" /> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class" /> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class" /> - </fileset> - </jar> - - <!-- jaxws-samples-serviceref - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/servicref/ApplicationClient.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.serviceref.ApplicationClient"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> - <include name="application-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-samples-serviceref-appclient.jar"/> - </fileset> - </jar> - <war destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-ejbclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="permissions.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar>--> - - <!-- jaxws-samples-webserviceref --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-samples-webserviceref-appclient.jar"/> - </fileset> - </jar> - <war destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - <include name="permissions.xml"/> - </metainf> - </jar> - - <!-- jaxws-samples-webservicerefsec --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webservicerefsec.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointImpl.class" /> - </fileset> - </jar> - <war destfile="${tests.output.dir}/test-libs/jaxws-samples-webservicerefsec-servlet-client.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/webservicerefsec/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/Client.class" /> - <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/samples/webservicerefsec/EndpointService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webservicerefsec/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <!-- Please add alphabetically --> - - </target> - -</project> Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java 2014-06-26 12:49:31 UTC (rev 18768) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.samples.webserviceref; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + private final String server; + private final String appclient; + private final String appclientEar; + private final String ejbClient; + private final String servletClient; + + private static final DeploymentArchives me = new DeploymentArchives(); + + public static String getServerArchiveFilename() { + return me.server; + } + + public static String getAppclientJarArchiveFilename() { + return me.appclient; + } + + public static String getAppclientEarArchiveFilename() { + return me.appclientEar; + } + + public static String getEJBClientArchiveFilename() { + return me.ejbClient; + } + + public static String getServletClientArchiveFilename() { + return me.servletClient; + } + + private DeploymentArchives() { + ejbClient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webserviceref-ejb3-client.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Remote.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss.xml"), "jboss.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl"); + } + }); + server = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webserviceref.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml")); + } + }); + appclient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webserviceref-appclient.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "main-class: org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne\n")) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/application-client.xml"), "application-client.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss-client.xml"), "jboss-client.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl"); + } + }); + appclientEar = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webserviceref-appclient.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-webserviceref-appclient.jar")); + } + }); + servletClient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webserviceref-servlet-client.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.MultipleEndpointService.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/web.xml")); + } + }); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2014-06-26 12:49:31 UTC (rev 18768) @@ -46,7 +46,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefClientTestCase.class, "jaxws-samples-webserviceref.war"); + return new JBossWSTestSetup(WebServiceRefClientTestCase.class, DeploymentArchives.getServerArchiveFilename()); } public void testGeneratedService() throws Exception @@ -76,11 +76,12 @@ public void testApplicationClient() throws Throwable { + final String fullAppclientDepName = DeploymentArchives.getAppclientEarArchiveFilename() + "#" + DeploymentArchives.getAppclientJarArchiveFilename(); try { final String appclientArg = "Hello World!"; final OutputStream appclientOS = new ByteArrayOutputStream(); - JBossWSTestHelper.deployAppclient("jaxws-samples-webserviceref-appclient.ear#jaxws-samples-webserviceref-appclient.jar", appclientOS, appclientArg); + JBossWSTestHelper.deployAppclient(fullAppclientDepName, appclientOS, appclientArg); // wait till appclient stops String appclientLog = appclientOS.toString(); while (!appclientLog.contains("stopped in")) { @@ -94,7 +95,7 @@ } finally { - JBossWSTestHelper.undeployAppclient("jaxws-samples-webserviceref-appclient.ear#jaxws-samples-webserviceref-appclient.jar", false); + JBossWSTestHelper.undeployAppclient(fullAppclientDepName, false); } } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2014-06-26 12:49:31 UTC (rev 18768) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-samples-webserviceref.war"); + return new JBossWSTestSetup(WebServiceRefEJB3TestCase.class, DeploymentArchives.getServerArchiveFilename()); } public void testDynamicProxy() throws Exception @@ -63,7 +63,7 @@ public void testEJB3Client() throws Exception { InitialContext iniCtx = null; - deploy("jaxws-samples-webserviceref-ejb3-client.jar"); + deploy(DeploymentArchives.getEJBClientArchiveFilename()); try { iniCtx = getServerInitialContext(); @@ -79,7 +79,7 @@ { iniCtx.close(); } - undeploy("jaxws-samples-webserviceref-ejb3-client.jar"); + undeploy(DeploymentArchives.getEJBClientArchiveFilename()); } } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-06-26 12:49:31 UTC (rev 18768) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefServletTestCase.class, "jaxws-samples-webserviceref.war"); + return new JBossWSTestSetup(WebServiceRefServletTestCase.class, DeploymentArchives.getServerArchiveFilename()); } public void testDynamicProxy() throws Exception @@ -61,7 +61,7 @@ public void testServletClient() throws Exception { - deploy("jaxws-samples-webserviceref-servlet-client.war"); + deploy(DeploymentArchives.getServletClientArchiveFilename()); try { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); @@ -69,7 +69,7 @@ } finally { - undeploy("jaxws-samples-webserviceref-servlet-client.war"); + undeploy(DeploymentArchives.getServletClientArchiveFilename()); } } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2014-06-26 12:49:31 UTC (rev 18768) @@ -21,12 +21,17 @@ */ package org.jboss.test.ws.jaxws.samples.webservicerefsec; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,22 +44,36 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webservicerefsec"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservicerefsec.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservicerefsec.EndpointImpl.class); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservicerefsec-servlet-client.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservicerefsec.Client.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservicerefsec.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservicerefsec.EndpointService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservicerefsec/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservicerefsec/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", true); + return new JBossWSTestSetup(WebServiceRefSecTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true); } public void testServletClient() throws Exception { - deploy("jaxws-samples-webservicerefsec-servlet-client.war"); - try - { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); - } - finally - { - undeploy("jaxws-samples-webservicerefsec-servlet-client.war"); - } + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2014-06-26 12:48:29 UTC (rev 18767) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2014-06-26 12:49:31 UTC (rev 18768) @@ -21,11 +21,36 @@ */ package org.jboss.test.ws.jaxws.smoke.tools; +import java.util.LinkedList; +import java.util.List; + +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; + /** * @author Heiko.Braun(a)jboss.com */ public class WSProviderTestCaseForked extends PluginBase { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-classloading-types.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.smoke.tools.service.Echo.class) + .addClass(org.jboss.test.ws.jaxws.smoke.tools.service.EchoResponse.class) + .addClass(org.jboss.test.ws.jaxws.smoke.tools.service.Message.class); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-classloading-service.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.smoke.tools.service.HelloWorld.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + /** * Recreates a tools delegate for every test * @throws Exception @@ -38,6 +63,8 @@ Class<?> wspClass = Thread.currentThread().getContextClassLoader() .loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin"); setDelegate(wspClass); + + JBossWSTestHelper.writeToFile(createDeployments()); }