Author: asoldano Date: 2014-06-30 14:53:54 -0400 (Mon, 30 Jun 2014) New Revision: 18773 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/ Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloBasicSecTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java Log: [JBWS-3711] WIP Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-06-30 18:53:54 UTC (rev 18773) @@ -39,100 +39,7 @@ <attribute name="Dependencies" value="org.apache.cxf"/> </manifest> </war> - - <!-- jaxws-cxf-bus --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-bus.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/bus/ClientEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointImpl.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF" - prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </war> - - <!-- jaxws-cxf-bus-ejb3-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientRemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/BusTestException.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF"> - <include name="wsdl/**/*" /> - <include name="permissions.xml"/> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </jar> - - <!-- jaxws-cxf-bus-servlet-client --> - <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-servlet-client.war" - manifest="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF/MANIFEST.MF" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/bus/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/EndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/bus/BusTestException.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/WEB-INF-client/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - <!-- jaxws-cxf-bus-wsdl --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-bus-wsdl.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/bus/WSDLServlet.class"/> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/bus"> - <include name="*AddressEndpoint.wsdl"/> - </classes> - </war> - - <!-- jaxws-cxf-disabledWSSubsystem --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-disabledWSSubsystem.war" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/CXFEndpointServlet.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF"> - <include name="jboss-deployment-structure.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-embedded --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-embedded.war" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF"> - <include name="jboss-deployment-structure.xml"/> - <include name="beans.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/spring/" - prefix="WEB-INF/lib/"/> - <zipfileset - dir="${tests.output.dir}/cxf-embedded/" - prefix="WEB-INF/lib/"/> - </war> - <!-- jaxws-cxf-embedded-fail --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-embedded-fail.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml"> @@ -153,98 +60,6 @@ </manifest> </war> - <!-- jaxws-cxf-endorse --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war" - manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/endorse/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/endorse/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/endorse/Helper.class"/> - </classes> - </war> - - <!-- jaxws-cxf-endorse-no-export --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse-no-export.war" - manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF-no-export" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/endorse/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/endorse/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/endorse/Helper.class"/> - </classes> - </war> - - <!-- jaxws-cxf-http-basic --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-basic-sec.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/basic/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/httpauth/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/cxf/httpauth/*TestCase.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/WEB-INF/wsdl/" - prefix="WEB-INF/wsdl/"/> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/basic" - prefix="WEB-INF/"/> - </war> - - <!-- jaxws-cxf-http-digest --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-digest-sec.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/digest/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/httpauth/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/cxf/httpauth/*TestCase.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/WEB-INF/wsdl/" - prefix="WEB-INF/wsdl/"/> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/digest" - prefix="WEB-INF/"/> - </war> - - <!-- jaxws-cxf-jaxbintros --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jaxbintros/META-INF"> - <include name="**/*" /> - </metainf> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros-client.war" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/Helper.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotatedUserEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jaxbintros/AnnotatedUserType.class"/> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - <include name="test-resources/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"/> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/jaxbintros/META-INF"> - <include name="jaxb-intros.xml"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services"/> - </manifest> - </war> - - <!-- jaxws-cxf-jbws3497 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3497.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3497/Endpoint*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3497/META-INF"> - <include name="**/*" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server"/> - </manifest> - </jar> - <!-- jaxws-cxf-jbws3516 --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3516.war" @@ -286,52 +101,6 @@ </webinf> </war> - <!-- jaxws-cxf-mixtype--> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/mixtype/Endpoint*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/test-resources//jaxws/cxf/mixtype/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-policy --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-policy.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/policy/PIPEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/policy/CustomInInterceptor.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderInstallerInterceptor.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/policy/META-INF"> - <include name="**/*" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor using cxf-rt-ws-policy in deployment --> - </manifest> - </jar> - - <!-- jaxws-cxf-udp-api --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-udp-api.war" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/udp/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/udp/HelloWorld*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/udp/META-INF/wsdl" - prefix="WEB-INF/classes/META-INF/wsdl"/> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common,org.jboss.ws.cxf.jbossws-cxf-client services"/> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-udp-api-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/udp/META-INF"> - <include name="wsdl/*" /> - </metainf> - </jar> - <!-- jaxws-cxf-servletCtx --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-servletCtx.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -343,31 +112,6 @@ </manifest> </war> - <!-- jaxws-cxf-spring --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-spring.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/spring/Endpoint*.class"/> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-spring-client.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/spring/Helper*.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/spring/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/spring/Foo.class"/> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/spring/" - prefix="WEB-INF/classes/"/> - <zipfileset - dir="${tests.output.dir}/spring/" - prefix="WEB-INF/lib/"/> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services"/> - </manifest> - </war> - <!-- saaj-soap-connection --> <war warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war" Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusReuseTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -53,7 +53,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(BusReuseTestCase.class, "jaxws-cxf-bus.war, jaxws-cxf-bus-wsdl.war"); + return new JBossWSCXFTestSetup(BusReuseTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.SERVER_2); } public void testReuse() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointBusTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(ClientEndpointBusTestCase.class, "jaxws-cxf-bus.war"); + return new JBossWSCXFTestSetup(ClientEndpointBusTestCase.class, DeploymentArchives.SERVER); } public void testClient() throws Exception Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/DeploymentArchives.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -0,0 +1,85 @@ +/* + * 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.cxf.bus; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-bus.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.ClientEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.ClientEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.EndpointImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/WEB-INF/web.xml")); + } + }); + + public static final String SERVER_2 = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-bus-wsdl.war") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl"), "InvalidAddressEndpoint.wsdl") + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/ValidAddressEndpoint.wsdl"), "ValidAddressEndpoint.wsdl") + .addClass(org.jboss.test.ws.jaxws.cxf.bus.WSDLServlet.class); + } + }); + + public static final String SERVLET_CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-bus-servlet-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.messaging.saaj services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.AbstractClient.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.BusTestException.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.ServletClient.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/WEB-INF-client/web.xml")); + } + }); + + public static final String EJB3_CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-bus-ejb3-client.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.AbstractClient.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.BusTestException.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.EJB3Client.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.EJB3ClientRemoteInterface.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.bus.EndpointService.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl"); + } + }); + + private DeploymentArchives() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -39,12 +39,12 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(EJB3ClientBusTestCase.class, "jaxws-cxf-bus.war"); + return new JBossWSCXFTestSetup(EJB3ClientBusTestCase.class, DeploymentArchives.SERVER); } public void testSingleDeploy() throws Exception { - deploy("jaxws-cxf-bus-ejb3-client.jar"); + deploy(DeploymentArchives.EJB3_CLIENT); InitialContext iniCtx = null; try { @@ -63,7 +63,7 @@ { iniCtx.close(); } - undeploy("jaxws-cxf-bus-ejb3-client.jar"); + undeploy(DeploymentArchives.EJB3_CLIENT); } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ServletClientBusTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -42,12 +42,12 @@ public static Test suite() { - return new JBossWSCXFTestSetup(ServletClientBusTestCase.class, "jaxws-cxf-bus.war"); + return new JBossWSCXFTestSetup(ServletClientBusTestCase.class, DeploymentArchives.SERVER); } public void testSingleDeploy() throws Exception { - deploy("jaxws-cxf-bus-servlet-client.war"); + deploy(DeploymentArchives.SERVLET_CLIENT); try { URL url = new URL(TARGET_ENDPOINT_ADDRESS + "?method=testBusCreation"); @@ -64,7 +64,7 @@ } finally { - undeploy("jaxws-cxf-bus-servlet-client.war"); + undeploy(DeploymentArchives.SERVLET_CLIENT); } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/EndorseTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,14 +21,20 @@ */ package org.jboss.test.ws.jaxws.cxf.endorse; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.stack.cxf.client.ProviderImpl; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Test required endorsing when using the CXF stack @@ -38,9 +44,32 @@ */ public class EndorseTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-endorse.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services export\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.endorse.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.endorse.TestServlet.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/endorse/WEB-INF/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-endorse-no-export.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.endorse.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.endorse.TestServlet.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/endorse/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(EndorseTestCase.class, "jaxws-cxf-endorse.war,jaxws-cxf-endorse-no-export.war"); + return new JBossWSCXFTestSetup(EndorseTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testClientSide() Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloBasicSecTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloBasicSecTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloBasicSecTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.cxf.httpauth; +import java.io.File; import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -33,6 +36,8 @@ import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * @author ema(a)redhat.com * @author alessio.soldano(a)jboss.com @@ -41,10 +46,28 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-cxf-basic-sec"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-basic-sec.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.Hello.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.HelloImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.ObjectFactory.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl"), "wsdl/hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpauth/basic/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpauth/basic/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { JBossWSCXFTestSetup testSetup; - testSetup = new JBossWSCXFTestSetup(HelloBasicSecTestCase.class, "jaxws-cxf-basic-sec.war"); + testSetup = new JBossWSCXFTestSetup(HelloBasicSecTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); Map<String, String> authenticationOptions = new HashMap<String, String>(); authenticationOptions.put("usersProperties", getResourceFile("jaxws/cxf/httpauth/WEB-INF/ws-users.properties").getAbsolutePath()); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.cxf.httpauth; +import java.io.File; import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -39,6 +42,8 @@ import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * @author ema(a)redhat.com @@ -48,10 +53,28 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-cxf-digest-sec"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-digest-sec.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.Hello.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.HelloImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpauth.ObjectFactory.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl"), "wsdl/hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpauth/digest/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpauth/digest/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { JBossWSCXFTestSetup testSetup; - testSetup = new JBossWSCXFTestSetup(HelloDigestTestCase.class, "jaxws-cxf-digest-sec.war"); + testSetup = new JBossWSCXFTestSetup(HelloDigestTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); Map<String, String> authenticationOptions = new HashMap<String, String>(); authenticationOptions.put("usersProperties", getResourceFile("jaxws/cxf/httpauth/WEB-INF/ws-users.properties").getAbsolutePath()); Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -0,0 +1,59 @@ +/* + * 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.cxf.jaxbintros; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jaxbintros.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.UserType.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml"); + } + }); + + public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jaxbintros-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml") + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.AnnotatedUserEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.AnnotatedUserType.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jaxbintros.UserType.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class); + } + }); + + private DeploymentArchives() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroServletTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -42,7 +42,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(JAXBIntroServletTestCase.class, "jaxws-cxf-jaxbintros.jar, jaxws-cxf-jaxbintros-client.war"); + return new JBossWSCXFTestSetup(JAXBIntroServletTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -50,7 +50,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(JAXBIntroTestCase.class, "jaxws-cxf-jaxbintros.jar"); + return new JBossWSCXFTestSetup(JAXBIntroTestCase.class, DeploymentArchives.SERVER); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,9 +21,11 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3497; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -35,8 +37,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue. @@ -46,17 +51,27 @@ */ public class JBWS3497TestCase extends JBossWSTest { - private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3497"; - private EndpointOne portOne; protected int defaultSize = 200; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3497.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOneImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSCXFTestSetup(JBWS3497TestCase.class, "jaxws-cxf-jbws3497.jar"); + return new JBossWSCXFTestSetup(JBWS3497TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testAccess() throws Exception @@ -100,8 +115,8 @@ private void initPorts() throws MalformedURLException { - URL wsdlOneURL = new URL(endpointOneURL + "?wsdl"); - QName serviceOneName = new QName(targetNS, "ServiceOne"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne?wsdl"); + QName serviceOneName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3497", "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.cxf.mixtype; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -30,24 +33,37 @@ import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; public class MixedTypeTestCase extends JBossWSTest { - private final String endpointURL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointOne"; - private final String endpoint2URL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointTwo"; - private final String anotherEndpoint2URL = "http://" + getServerHost() + ":8080/mixtype/ServiceOne/AnotherEndpointTwo"; - private final String ejbEndpointURL = "http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EndpointOneEJB3Impl"; + private final String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype"; + + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-mixtype.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne.class) + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointTwoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } - private String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype"; - public static Test suite() { - return new JBossWSCXFTestSetup(MixedTypeTestCase.class, "jaxws-cxf-mixtype.war"); + return new JBossWSCXFTestSetup(MixedTypeTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpoint() throws Exception { - URL wsdlOneURL = new URL(endpointURL + "?wsdl"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointOne?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); @@ -58,7 +74,7 @@ public void testEJBEndpoint() throws Exception { - URL wsdlOneURL = new URL(ejbEndpointURL + "?wsdl"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/EJBServiceOne/EndpointOneEJB3Impl?wsdl"); QName serviceOneName = new QName(targetNS, "EJBServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); @@ -70,7 +86,7 @@ public void testEndpoint2() throws Exception { //verify everything works with an endpoint extending another one impl - URL wsdlOneURL = new URL(endpoint2URL + "?wsdl"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/ServiceOne/EndpointTwo?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointTwoPort"), EndpointOne.class); @@ -82,7 +98,7 @@ public void testEndpoint2WithAnotherURLPattern() throws Exception { //verify everything works with an endpoint extending another one impl - URL wsdlOneURL = new URL(anotherEndpoint2URL + "?wsdl"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":8080/mixtype/ServiceOne/AnotherEndpointTwo?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service service = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)service.getPort(new QName(targetNS, "EndpointTwoPort"), EndpointOne.class); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,8 +21,14 @@ */ package org.jboss.test.ws.jaxws.cxf.noIntegration; +import java.io.File; +import java.util.LinkedList; +import java.util.List; + +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * [AS7-537] Filter Apache CXF and dependencies @@ -34,6 +40,37 @@ */ public class AS7537TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + final File springDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); + final File embeddedCXFDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "cxf-embedded"); + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-embedded-fail.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: javax.wsdl4j.api,org.apache.ws.xmlschema,org.apache.neethi,org.codehaus.woodstox\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml"), "beans.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml")) + .addAsLibrary(new File(springDir, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-web-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-api-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-bindings-soap-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-core-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-databinding-jaxb-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-jaxws-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-simple-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-http-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-ws-policy-2.6.6.jar")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public void testFailureWithoutJBossDeploymentStructure() throws Exception { boolean undeploy = true; try { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -22,9 +22,12 @@ package org.jboss.test.ws.jaxws.cxf.noIntegration; import java.io.BufferedReader; +import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -33,6 +36,8 @@ import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Verifies a plain Apache CXF ws endpoint war can be deployed on @@ -52,9 +57,23 @@ */ public class DisabledWSSubsystemTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-disabledWSSubsystem.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.CXFEndpointServlet.class) + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(DisabledWSSubsystemTestCase.class, "jaxws-cxf-disabledWSSubsystem.war"); + return new JBossWSCXFTestSetup(DisabledWSSubsystemTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpointInvocation() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -22,9 +22,12 @@ package org.jboss.test.ws.jaxws.cxf.noIntegration; import java.io.BufferedReader; +import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -33,6 +36,8 @@ import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Verifies a plain Apache CXF ws endpoint war can be deployed on @@ -50,9 +55,40 @@ */ public class EmbeddedCXFTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + final File springDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); + final File embeddedCXFDir = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "cxf-embedded"); + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-embedded.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml"), "beans.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml"), "jboss-deployment-structure.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml")) + .addAsLibrary(new File(springDir, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(springDir, "spring-web-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-api-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-bindings-soap-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-core-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-databinding-jaxb-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-jaxws-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-frontend-simple-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-transports-http-2.6.6.jar")) + .addAsLibrary(new File(embeddedCXFDir, "cxf-rt-ws-policy-2.6.6.jar")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(EmbeddedCXFTestCase.class, "jaxws-cxf-embedded.war"); + return new JBossWSCXFTestSetup(EmbeddedCXFTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpointInvocation() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.cxf.policy; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -32,9 +35,12 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.ws.policy.IgnorablePolicyInterceptorProvider; import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * @author alessio.soldano(a)jboss.com @@ -44,9 +50,23 @@ { private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-policy/PIPService/PIPEndpoint"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-policy.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf.impl\n")) //cxf impl required due to custom interceptor using cxf-rt-ws-policy in deployment + .addClass(org.jboss.test.ws.jaxws.cxf.policy.PIPEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.policy.PolicyInterceptorProviderInstallerInterceptor.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/policy/META-INF/unknown-policy.xml"), "unknown-policy.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(PolicyInterceptorProviderTestCase.class, "jaxws-cxf-policy.jar"); + return new JBossWSCXFTestSetup(PolicyInterceptorProviderTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(ClientSpringAppTestCase.class, "jaxws-cxf-spring-client.war, jaxws-cxf-spring.war"); + return new JBossWSCXFTestSetup(ClientSpringAppTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); } public void testSpringAvailability() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(ClientSpringAppTestCaseForked.class, "jaxws-cxf-spring-client.war, jaxws-cxf-spring.war"); + return new JBossWSCXFTestSetup(ClientSpringAppTestCaseForked.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); } public void testJBossWSCXFBus() throws Exception Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -0,0 +1,65 @@ +/* + * 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.cxf.spring; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + private static final File SPRING_DIR = new File(new File(JBossWSTestHelper.getTestResourcesDir()).getParentFile(), "spring"); + + public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-spring.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.EndpointImpl.class); + } + }); + + public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-spring-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Foo.class) + .addClass(org.jboss.test.ws.jaxws.cxf.spring.Helper.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/my-cxf.xml"), "my-cxf.xml") + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/spring/spring-dd.xml"), "spring-dd.xml") + .addAsLibrary(new File(SPRING_DIR, "spring-aop-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-asm-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-beans-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-context-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-core-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-expression-3.0.3.RELEASE.jar")) + .addAsLibrary(new File(SPRING_DIR, "spring-web-3.0.3.RELEASE.jar")); + } + }); + + private DeploymentArchives() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2014-06-30 18:53:54 UTC (rev 18773) @@ -21,11 +21,14 @@ */ package org.jboss.test.ws.jaxws.cxf.udp; +import java.io.File; import java.net.InetAddress; import java.net.InterfaceAddress; import java.net.NetworkInterface; import java.net.URL; import java.util.Enumeration; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Endpoint; @@ -35,9 +38,12 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Test case for publishing a UDP (SOAP-over-UDP 1.1) endpoint through API @@ -47,9 +53,30 @@ */ public final class UDPEndpointAPITestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-udp-api-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl"), "wsdl/HelloWorldService.wsdl"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-udp-api.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common,org.jboss.ws.cxf.jbossws-cxf-client services\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.udp.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.udp.HelloWorldImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.udp.TestServlet.class) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl"), "META-INF/wsdl/HelloWorldService.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(UDPEndpointAPITestCase.class, "jaxws-cxf-udp-api.war,jaxws-cxf-udp-api-client.jar"); + return new JBossWSCXFTestSetup(UDPEndpointAPITestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testServerSide() throws Exception Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF 2014-06-27 15:29:26 UTC (rev 18772) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/MANIFEST.MF 2014-06-30 18:53:54 UTC (rev 18773) @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services export,com.sun.xml.messaging.saaj services \ No newline at end of file