June 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18773 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/bus and 11 other directories.

by jbossws-commits＠lists.jboss.org

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> - -  - <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> - -  - <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> - -  - <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> -  - <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> - -  - <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> - -  - <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> -  <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> -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> -  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3516.war" @@ -286,52 +101,6 @@ </webinf> </war> -  - <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> - -  - <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"/>  - </manifest> - </jar> - -  - <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> -  <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> -  - <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> -  <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

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18772 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-27 11:29:26 -0400 (Fri, 27 Jun 2014) New Revision: 18772 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/DeploymentArchives.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3713/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/clientConfig/CXFClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java Log: [JBWS-3711] Converting non-sample cxf tests (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-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-06-27 15:29:26 UTC (rev 18772) @@ -103,50 +103,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-clientConfig.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint*.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-clientConfig-inContainer-client.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.class" /> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig"> - <include name="META-INF/jaxws-client-config.xml"/> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig/META-INF" prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf.impl"/>  - </manifest> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-clientConfig-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig/META-INF"> - <include name="jaxws-client-config.xml" /> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-continuations.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/continuations/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl*.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </war> -  <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"> @@ -217,58 +173,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endpoint.war" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/endpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/endpoint/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/endpoint/HelloWorld*.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common"/> - </manifest> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-fastinfoset.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/fastinfoset/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/fastinfoset/HelloWorld*.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </war> - - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/gzip/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld*.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip-client.war" - manifest="${tests.output.dir}/test-resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/gzip/Helper.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld.class"/> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-httpproxy.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/httpproxy/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/httpproxy/HelloWorld*.class"/> - </classes> - </war> - -  <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"> @@ -328,33 +232,6 @@ </manifest> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.class"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3098.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3098/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3098/EndpointOneImpl.class"/> - </classes> - </war> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3497.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -376,9 +253,12 @@ <include name="org/jboss/test/ws/jaxws/cxf/jbws3516/*.class"/> <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3516/*TestCase.class"/> </classes> - <zipfileset + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3516/WEB-INF"> + <include name="wsdl/**" /> + </webinf> + <manifest> <attribute name="Dependencies" value="org.apache.cxf.impl"/> </manifest> @@ -395,68 +275,6 @@ </manifest> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointOneImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointTwo*.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648-b.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointFour*.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/EndpointThree*.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3648/KeystorePasswordCallback.class"/> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3648-b/WEB-INF" prefix="WEB-INF/classes"> - <include name="bob.jks" /> - <include name="bob.properties" /> - </zipfileset> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3648-b/policies" - prefix="WEB-INF/classes/META-INF/policies"/> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security"/> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648-b-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3648-b/META-INF"> - <include name="alice.properties" /> - <include name="alice.jks" /> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3655-jaxws.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWs.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWsImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloRequest.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3655/META-INF"> - <include name="**/*" /> - <exclude name="**/application.xml"/> - </metainf> - </jar> - - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3655-ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3655/HelloWSEJBImpl.class"/> - </fileset> - </jar> - - <ear destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3655.ear" appxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3655/META-INF/application.xml"> - <zipfileset dir="${tests.output.dir}/test-libs/" prefix="lib"> - <include name="jaxws-cxf-jbws3655-jaxws.jar"/> - </zipfileset> - <fileset dir="${tests.output.dir}/test-libs/" includes="jaxws-cxf-jbws3655-ejb.jar"/> - </ear> -  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3679.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3679/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -468,75 +286,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3713.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Hello*.class" /> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3713/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3713-client.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/ClientServlet*.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Hello*.class" /> - <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Helper*.class" /> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/>  - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3713-client.jar" manifest="${tests.output.dir}/test-resources/jaxws/cxf/jbws3713/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/BusCounter.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Hello*.class" /> - <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3713/HelloWSImpl.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/Helper*.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3713/TestClient.class" /> - </fileset> - </jar> - -  - <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3745.war" - webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3745/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService*.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3773.war" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jbws3773/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3773/*TestCase.class"/> - </classes> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.class"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> - </manifest> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-management.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/management/HelloWorldImpl.class" /> - <include name="org/jboss/test/ws/jaxws/cxf/management/HelloWorld.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF"> - <include name="jboss-webservices.xml"/> - </webinf> - </war> -  <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"> @@ -619,14 +368,6 @@ </manifest> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-wsmex.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsmex/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsmex/EndpointBean.class"/> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war" @@ -636,9 +377,12 @@ <include name="org/jboss/test/ws/saaj/jbws3084/ServiceIface.class"/> <include name="org/jboss/test/ws/saaj/jbws3084/InputStreamDataSource.class"/> </classes> - <zipfileset + <webinf dir="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF"> + <include name="wsdl/**" /> + </webinf> +  </war>  Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -39,7 +39,7 @@ { public static Test suite() { - return new JBossWSTestSetup(CXFClientConfigurationTestCase.class, "jaxws-cxf-clientConfig.war,jaxws-cxf-clientConfig-client.jar,jaxws-cxf-clientConfig-inContainer-client.war"); + return new JBossWSTestSetup(CXFClientConfigurationTestCase.class, DeploymentArchives.NAMES); } /** Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCaseForked.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -39,7 +39,7 @@ { public static Test suite() { - return new JBossWSTestSetup(CXFClientConfigurationTestCaseForked.class, "jaxws-cxf-clientConfig.war,jaxws-cxf-clientConfig-client.jar,jaxws-cxf-clientConfig-inContainer-client.war"); + return new JBossWSTestSetup(CXFClientConfigurationTestCaseForked.class, DeploymentArchives.NAMES); } /** Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/DeploymentArchives.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.clientConfig; + +import java.io.File; +import java.util.LinkedList; +import java.util.List; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; + +public class DeploymentArchives +{ + public static final String NAMES = JBossWSTestHelper.writeToFile(createDeployments()); + + private static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-clientConfig.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.EndpointImpl.class); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-clientConfig-inContainer-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf.impl\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") + .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.TestUtils.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/clientConfig/META-INF/permissions.xml"), "permissions.xml"); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-clientConfig-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/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/continuations/ContinuationsTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/ContinuationsTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.cxf.continuations; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import java.util.concurrent.Future; import javax.xml.namespace.QName; @@ -31,8 +34,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; /** * Asynchronous web services test case with endpoint impl making @@ -45,9 +51,22 @@ { private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-continuations"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-continuations.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.continuations.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/continuations/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(ContinuationsTestCase.class, "jaxws-cxf-continuations.war"); + return new JBossWSCXFTestSetup(ContinuationsTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testAsyncEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,14 +21,20 @@ */ package org.jboss.test.ws.jaxws.cxf.endpoint; +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; import junit.framework.Test; +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; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -38,6 +44,21 @@ { private static String publishURL = "http://" + getServerHost() + ":18080/HelloWorldService"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-endpoint.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.endpoint.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.endpoint.HelloWorldImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.endpoint.TestServlet.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/endpoint/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { return new JBossWSTestSetup(EndpointTestCase.class, ""); @@ -45,17 +66,18 @@ public void testClassLoader() throws Exception { - deploy("jaxws-cxf-endpoint.war"); + final String deploymentName = JBossWSTestHelper.writeToFile(createDeployments()); + deploy(deploymentName); HelloWorld port = this.getProxy(publishURL); String classLoader1 = port.getClassLoader(); String deploymentClassLoader1 = port.getDeploymentClassLoader(); - undeploy("jaxws-cxf-endpoint.war"); + undeploy(deploymentName); assertEquals(classLoader1, deploymentClassLoader1); - deploy("jaxws-cxf-endpoint.war"); + deploy(deploymentName); port = this.getProxy(publishURL); String classLoader2 = port.getClassLoader(); String deploymentClassLoader2 = port.getDeploymentClassLoader(); - undeploy("jaxws-cxf-endpoint.war"); + undeploy(deploymentName); assertEquals(classLoader2, deploymentClassLoader2); assertFalse(classLoader1.equals(classLoader2)); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -22,8 +22,11 @@ package org.jboss.test.ws.jaxws.cxf.fastinfoset; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.PrintWriter; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -34,21 +37,36 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; +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; public class FastInfosetTestCase extends JBossWSTest { private String endpointURl = "http://" + getServerHost() + ":8080/jaxws-cxf-fastinfoset/HelloWorldService/HelloWorldImpl"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-fastinfoset.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.fastinfoset.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.fastinfoset.HelloWorldImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/fastinfoset/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSCXFTestSetup(FastInfosetTestCase.class, "jaxws-cxf-fastinfoset.war"); + return new JBossWSCXFTestSetup(FastInfosetTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } - public void testInfoset() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/DeploymentArchives.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -0,0 +1,56 @@ +/* + * 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.gzip; + +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-gzip.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.gzip.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.gzip.HelloWorldImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/gzip/WEB-INF/web.xml")); + } + }); + + public static final String CLIENT = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-gzip-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services,org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.gzip.GZIPEnforcingInInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.cxf.gzip.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.gzip.Helper.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class); + } + }); + + private DeploymentArchives() { + //NO OP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/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/gzip/GZIPServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(GZIPServletTestCase.class, "jaxws-cxf-gzip.war, jaxws-cxf-gzip-client.war"); + return new JBossWSCXFTestSetup(GZIPServletTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT); } public void testGZIPUsingFeatureOnBus() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -40,7 +40,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.war"); + return new JBossWSCXFTestSetup(GZIPTestCase.class, DeploymentArchives.SERVER); } private Helper getHelper() Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -25,6 +25,7 @@ import java.io.BufferedReader; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; @@ -33,6 +34,8 @@ import java.net.MalformedURLException; import java.net.PasswordAuthentication; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import java.util.Queue; import javax.xml.namespace.QName; @@ -49,6 +52,8 @@ import org.apache.cxf.transports.http.configuration.ProxyServerType; 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; import org.littleshoot.proxy.ChainedProxy; import org.littleshoot.proxy.ChainedProxyAdapter; import org.littleshoot.proxy.ChainedProxyManager; @@ -70,9 +75,22 @@ private static final String ENDPOINT_PATH = "/jaxws-cxf-httpproxy/HelloWorldService/HelloWorldImpl"; private HttpProxyServer proxyServer; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-httpproxy.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.httpproxy.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.httpproxy.HelloWorldImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/httpproxy/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(HTTPProxyTestCaseForked.class, "jaxws-cxf-httpproxy.war"); + return new JBossWSCXFTestSetup(HTTPProxyTestCaseForked.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testHttpProxy() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060EJB3TestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,9 +21,15 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3060; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * @@ -35,9 +41,22 @@ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceOne/EndpointOne"; private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/ServiceTwo/EndpointTwo"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3060.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneEJB3Impl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoEJB3Impl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(JBWS3060EJB3TestCase.class, "jaxws-cxf-jbws3060.jar"); + return new JBossWSCXFTestSetup(JBWS3060EJB3TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060ServletTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,9 +21,16 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3060; +import java.io.File; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * @@ -35,9 +42,23 @@ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060-jse/ServiceOne/EndpointOne"; private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060-jse/ServiceTwo/EndpointTwo"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3060-jse.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3060.EndpointTwoImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3060/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, "jaxws-cxf-jbws3060-jse.war"); + return new JBossWSCXFTestSetup(JBWS3060ServletTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3098; +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; @@ -37,6 +40,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; /** * Verifies the Bus is properly configured with Client/Server LifeCycleManager instances @@ -49,9 +54,21 @@ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3098/ServiceOne/EndpointOne"; private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3098"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3098.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3098.EndpointOneImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3098/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, "jaxws-cxf-jbws3098.war"); + return new JBossWSCXFTestSetup(ClientServerLifeCycleTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testClientLifeCycleManager() Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -22,8 +22,11 @@ package org.jboss.test.ws.jaxws.cxf.jbws3648; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.PrintWriter; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -36,10 +39,13 @@ import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.message.Message; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.CryptoHelper; 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; /** * @@ -49,9 +55,38 @@ */ public class PolicyAttachmentTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3648-b.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client, org.apache.ws.security\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFour.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointFourImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThree.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointThreeImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.KeystorePasswordCallback.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/WEB-INF/bob.jks"), "classes/bob.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/WEB-INF/bob.properties"), "classes/bob.properties") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/policies/My-WSSE-conf-BINDING.xml"), + "classes/META-INF/policies/My-WSSE-conf-BINDING.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore"), + "classes/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore"); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3648-b-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3648-b/META-INF/alice.properties"), "alice.properties"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(PolicyAttachmentTestCase.class, "jaxws-cxf-jbws3648-b.war, jaxws-cxf-jbws3648-b-client.jar"); + return new JBossWSCXFTestSetup(PolicyAttachmentTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpointWithWSSEAndWSA() throws Exception { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentWSDLTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -22,12 +22,17 @@ package org.jboss.test.ws.jaxws.cxf.jbws3648; 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.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * @@ -37,9 +42,23 @@ */ public class PolicyAttachmentWSDLTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3648.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointOneImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwo.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3648.EndpointTwoImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(PolicyAttachmentWSDLTestCase.class, "jaxws-cxf-jbws3648.war"); + return new JBossWSCXFTestSetup(PolicyAttachmentWSDLTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpointOneWSDL() throws Exception { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3655/EarSchemaImportTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws3655; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -29,12 +30,41 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; public class EarSchemaImportTestCase extends JBossWSTest { public final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3655/HelloService"; + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655-ejb.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWSEJBImpl.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655-jaxws.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3655.HelloWsImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3655.ear") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3655/META-INF/application.xml")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-jaxws.jar"), "lib/jaxws-cxf-jbws3655-jaxws.jar") + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3655-ejb.jar")); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(EarSchemaImportTestCase.class, "jaxws-cxf-jbws3655.ear"); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/ClientBusStrategyTests.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -61,7 +61,7 @@ final String jbm = jbh + FS + "modules"; final String jbmjar = jbh + FS + "jboss-modules.jar"; - final File f = new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-cxf-jbws3713-client.jar"); + final File f = new File(JBossWSTestHelper.getTestArchiveDir(), DeploymentArchives.CLIENT_JAR); //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar String props = " -Djavax.xml.ws.spi.Provider=" + ProviderImpl.class.getName() + " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/DeploymentArchives.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -0,0 +1,77 @@ +/* + * 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.jbws3713; + +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-jbws3713.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWSImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello.wsdl"), "wsdl/Hello.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema1.xsd"), "wsdl/Hello_schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema2.xsd"), "wsdl/Hello_schema2.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema3.xsd"), "wsdl/Hello_schema3.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema4.xsd"), "wsdl/Hello_schema4.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3713/WEB-INF/wsdl/Hello_schema5.xsd"), "wsdl/Hello_schema5.xsd"); + } + }); + + public static final String CLIENT_JAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-jbws3713-client.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Main-Class: org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl,org.jboss.ws.jaxws-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.BusCounter.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelperUsignThreadLocal.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.TestClient.class); + } + }); + + public static final String CLIENT_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3713-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.BusCounter.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.ClientServlet.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.ClientServletUsignThreadLocal.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloRequest.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelloWs.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.Helper.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3713.HelperUsignThreadLocal.class); + } + }); + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/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/jbws3713/InContainerClientBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/InContainerClientBusStrategyTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -39,7 +39,7 @@ public static Test suite() { - return new JBossWSTestSetup(InContainerClientBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war,jaxws-cxf-jbws3713-client.war"); + return new JBossWSTestSetup(InContainerClientBusStrategyTestCase.class, DeploymentArchives.SERVER + "," + DeploymentArchives.CLIENT_WAR); } public void testEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseNewBusStrategyTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -32,7 +32,7 @@ { public static Test suite() { - return new JBossWSTestSetup(UseNewBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war"); + return new JBossWSTestSetup(UseNewBusStrategyTestCase.class, DeploymentArchives.SERVER); } public void testClientWithNewBusStrategy() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseTCCLBusStrategyTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -32,7 +32,7 @@ { public static Test suite() { - return new JBossWSTestSetup(UseTCCLBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war"); + return new JBossWSTestSetup(UseTCCLBusStrategyTestCase.class, DeploymentArchives.SERVER); } public void testClientWithTCCLBusStrategy() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3713/UseThreadBusStrategyTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -32,7 +32,7 @@ { public static Test suite() { - return new JBossWSTestSetup(UseThreadBusStrategyTestCase.class, "jaxws-cxf-jbws3713.war"); + return new JBossWSTestSetup(UseThreadBusStrategyTestCase.class, DeploymentArchives.SERVER); } public void testClientWithThreadBusStrategy() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -22,8 +22,11 @@ package org.jboss.test.ws.jaxws.cxf.jbws3745; +import java.io.File; import java.net.InetAddress; import java.net.Socket; +import java.util.LinkedList; +import java.util.List; import javax.net.ssl.SSLSocketFactory; import javax.xml.namespace.QName; @@ -38,6 +41,8 @@ import org.jboss.wsf.stack.cxf.client.UseNewBusFeature; import org.jboss.wsf.stack.cxf.client.socket.tcp.SSLNoDelaySocketFactory; 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; /** @@ -56,9 +61,22 @@ private static final int SERVER_PORT = 8080; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3745.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3745.SimpleService.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3745.SimpleServiceImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/jbws3745/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(SSLNoDelaySocketFactoryTestCase.class, "jaxws-cxf-jbws3745.war"); + return new JBossWSTestSetup(SSLNoDelaySocketFactoryTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void setUp() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3773/JBWS3773TestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.cxf.jbws3773; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -37,13 +39,28 @@ import org.apache.cxf.ws.addressing.JAXWSAConstants; 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; public class JBWS3773TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-jbws3773.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.Greeter.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.GreeterImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.jbws3773.TargetServlet.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3773TestCase.class, "jaxws-cxf-jbws3773.war"); + return new JBossWSTestSetup(JBWS3773TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testServletRequestAvailability() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -25,6 +25,8 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -34,9 +36,12 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; +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; /** * Tests configuration of message exchange logging using API @@ -49,11 +54,25 @@ private String loggingFeatureEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-logging/LoggingFeatureService/LoggingFeatureEndpoint"; private String loggingInterceptorsEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-logging/LoggingInterceptorsService/LoggingInterceptorsEndpoint"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-logging.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.cxf.logging.CustomInInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.cxf.logging.LoggingFeatureEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.cxf.logging.LoggingInterceptorsEndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + private LoggingEndpoint port; public static Test suite() { - return new JBossWSCXFTestSetup(MessageLoggingTestCase.class, "jaxws-cxf-logging.jar"); + return new JBossWSCXFTestSetup(MessageLoggingTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testLoggingFeature() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/management/CXFManagementTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -1,5 +1,8 @@ package org.jboss.test.ws.jaxws.cxf.management; +import java.io.File; +import java.util.LinkedList; +import java.util.List; import java.util.Set; import javax.management.MBeanServerConnection; @@ -9,13 +12,28 @@ 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 CXFManagementTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-cxf-management.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.management.HelloWorld.class) + .addClass(org.jboss.test.ws.jaxws.cxf.management.HelloWorldImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/management/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/management/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSCXFTestSetup(CXFManagementTestCase.class, "jaxws-cxf-management.war"); + return new JBossWSCXFTestSetup(CXFManagementTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testJMXBean() throws Exception { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java 2014-06-26 14:18:36 UTC (rev 18771) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsmex/WSMexTestCase.java 2014-06-27 15:29:26 UTC (rev 18772) @@ -21,6 +21,9 @@ */ package org.jboss.test.ws.jaxws.cxf.wsmex; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Test; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; @@ -30,6 +33,8 @@ import org.jboss.ws.common.DOMWriter; 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; import org.w3c.dom.Node; /** @@ -42,9 +47,21 @@ { private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-wsmex/EndpointService"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-cxf-wsmex.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.cxf.wsmex.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.cxf.wsmex.EndpointBean.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(WSMexTestCase.class, "jaxws-cxf-wsmex.jar"); + return new JBossWSCXFTestSetup(WSMexTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpoint() throws Exception

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18771 - stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-26 10:18:36 -0400 (Thu, 26 Jun 2014) New Revision: 18771 Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml Log: [JBWS-3806] Keep on using full distribution, available in 'dist' folder of WFLY Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-06-26 14:17:25 UTC (rev 18770) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-06-26 14:18:36 UTC (rev 18771) @@ -32,7 +32,6 @@ </exports> <resources> - <artifact name="org.wildfly:wildfly-webservices-server-integration:${wildfly900.version}"/>  </resources>

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18770 - in hudson/trunk/hudson-home/jobs: CXF-BINDIST-AS-9.0.0-SPRING and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-26 10:17:25 -0400 (Thu, 26 Jun 2014) New Revision: 18770 Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml Log: [JBWS-3806] Use WFLY 'dist' distribution instead of 'build' one Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS= JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS= JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS= JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS= JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS= JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml 2014-06-26 13:37:16 UTC (rev 18769) +++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml 2014-06-26 14:17:25 UTC (rev 18770) @@ -16,7 +16,7 @@ TEST_OPTS= JBOSS_TARGET=wildfly900 JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # # load test functions

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18769 - stack/cxf/trunk/modules/testsuite/shared-tests.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-26 09:37:16 -0400 (Thu, 26 Jun 2014) New Revision: 18769 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3807] Run wsconsume task in generate-test-sources phase Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-06-26 12:49:31 UTC (rev 18768) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-06-26 13:37:16 UTC (rev 18769) @@ -56,7 +56,7 @@ <executions> <execution> <id>wsconsume</id> - <phase>generate-sources</phase> + <phase>generate-test-sources</phase> <goals> <goal>run</goal> </goals>

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18768 - in stack/cxf/trunk/modules: testsuite/shared-tests and 4 other directories.

by jbossws-commits＠lists.jboss.org

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"?> - - - -<project> - - <description>JBossWS test archive builder</description> - -  -  -  - - <target name="build-samples-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/test-libs"/> - -  - <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> - -  - <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> - -  - -  - <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> - -  - <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> - -  - - </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()); }

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18767 - stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-26 08:48:29 -0400 (Thu, 26 Jun 2014) New Revision: 18767 Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3711][JBWS-3667] Fixing bug causing failure when test archive dir does not exist Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-26 08:15:44 UTC (rev 18766) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-26 12:48:29 UTC (rev 18767) @@ -427,8 +427,7 @@ throw new IllegalArgumentException("Cannot create archive - system property '" + JBossWSTestHelper.SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set."); if (!archiveDir.mkdirs()) - ; - throw new IllegalArgumentException("Cannot create archive - can not create test archive directory '" + throw new IllegalArgumentException("Cannot create archive - can not create test archive directory '" + archiveDir.getAbsolutePath() + "' not set."); } return archiveDir;

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18766 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-26 04:15:44 -0400 (Thu, 26 Jun 2014) New Revision: 18766 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java Log: [JBWS-3711] Fix regression Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.java 2014-06-26 08:15:44 UTC (rev 18766) @@ -0,0 +1,41 @@ +/* + * 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.management.recording; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class ArchiveDeployment +{ + public static final String NAME = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("management-recording-as7.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.management.recording.Endpoint.class) + .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); + } + }); + + private ArchiveDeployment() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/ArchiveDeployment.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/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2014-06-26 08:15:44 UTC (rev 18766) @@ -49,13 +49,13 @@ protected void setUp() throws Exception { endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); + JBossWSTestHelper.deploy(ArchiveDeployment.NAME); } @Override protected void tearDown() throws Exception { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); + JBossWSTestHelper.undeploy(ArchiveDeployment.NAME); } public void testAddCustomProcessor() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-06-26 08:15:44 UTC (rev 18766) @@ -32,7 +32,6 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.api.monitoring.Record; import org.jboss.ws.api.monitoring.RecordFilter; import org.jboss.ws.common.monitoring.AndFilter; @@ -54,28 +53,17 @@ private final String targetNS = "http://recording.management.ws.test.jboss.org/"; private String endpointObjectName; - static { - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("management-recording-as7.jar") { { - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging\n")) - .addClass(org.jboss.test.ws.management.recording.Endpoint.class) - .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); - } - }); - } - @Override protected void setUp() throws Exception { endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); + JBossWSTestHelper.deploy(ArchiveDeployment.NAME); } @Override protected void tearDown() throws Exception { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); + JBossWSTestHelper.undeploy(ArchiveDeployment.NAME); } public void testRecording() throws Exception

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18765 - in stack/cxf/trunk/modules: testsuite/shared-tests/src/test/ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-25 13:07:43 -0400 (Wed, 25 Jun 2014) New Revision: 18765 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/DeploymentArchives.java Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java Log: [JBWS-3711] WIP Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -444,7 +444,7 @@ sb.append(dep.writeToFile().getName()); sb.append(" "); } - return sb.toString(); + return sb.toString().trim(); } public static abstract class WarDeployment extends BaseDeployment<WebArchive> Modified: 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-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-25 17:07:43 UTC (rev 18765) @@ -50,7 +50,7 @@ </fileset> </jar> -  +  -  - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF01/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF02/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF02"> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF03/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice02-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webservice/META-INF02"> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice03-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </fileset> - </jar> -  <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"> @@ -227,17 +184,6 @@ </webinf> </war> -  - <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointWithConfigImpl.class"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> -  </target> Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/DeploymentArchives.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -0,0 +1,142 @@ +/* + * 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.serviceref; + +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() + { + server = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-serviceref.war") + { + { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointService.class) + .setWebXML( + new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/serviceref/WEB-INF/web.xml")); + } + }); + appclient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-serviceref-appclient.jar") + { + { + archive + .setManifest( + new StringAsset("Manifest-Version: 1.0\n" + + "main-class: org.jboss.test.ws.jaxws.samples.serviceref.ApplicationClient\n")) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.ApplicationClient.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointService.class) + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/application-client.xml"), "application-client.xml") + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl"); + } + }); + appclientEar = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-serviceref-appclient.ear") + { + { + archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-serviceref-appclient.jar")); + } + }); + ejbClient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-serviceref-ejbclient.jar") + { + { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EJBClient.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EJBRemote.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointService.class) + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/ejb-jar.xml"), "ejb-jar.xml") + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl"); + } + }); + servletClient = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-serviceref-servlet-client.war") + { + { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.samples.serviceref.ServletClient.class) + .addAsWebInfResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsWebInfResource( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/servlet-client/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML( + new File(JBossWSTestHelper.getTestResourcesDir() + + "/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml")); + } + }); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/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/serviceref/ServiceRefClientTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -48,8 +48,7 @@ public static Test suite() { - String archives = "jaxws-samples-serviceref.war"; - return new JBossWSTestSetup(ServiceRefClientTestCase.class, archives); + return new JBossWSTestSetup(ServiceRefClientTestCase.class, DeploymentArchives.getServerArchiveFilename()); } public void testWSDLAccess() throws Exception @@ -77,7 +76,7 @@ try { final OutputStream appclientOS = new ByteArrayOutputStream(); - JBossWSTestHelper.deployAppclient("jaxws-samples-serviceref-appclient.ear#jaxws-samples-serviceref-appclient.jar", appclientOS, "Hello World!"); + JBossWSTestHelper.deployAppclient(DeploymentArchives.getAppclientEarArchiveFilename() + "#" + DeploymentArchives.getAppclientJarArchiveFilename(), appclientOS, "Hello World!"); // wait till appclient stops String appclientLog = appclientOS.toString(); while (!appclientLog.contains("stopped in")) { @@ -92,7 +91,7 @@ } finally { - JBossWSTestHelper.undeployAppclient("jaxws-samples-serviceref-appclient.ear#jaxws-samples-serviceref-appclient.jar", false); + JBossWSTestHelper.undeployAppclient(DeploymentArchives.getAppclientEarArchiveFilename() + "#" + DeploymentArchives.getAppclientJarArchiveFilename(), false); } } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -47,8 +47,7 @@ public static Test suite() { - final String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-ejbclient.jar"; - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, archives); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, DeploymentArchives.getServerArchiveFilename() + "," + DeploymentArchives.getEJBClientArchiveFilename()); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -46,8 +46,7 @@ public static Test suite() { - String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-servlet-client.war"; - return new JBossWSTestSetup(ServiceRefServletTestCase.class, archives); + return new JBossWSTestSetup(ServiceRefServletTestCase.class, DeploymentArchives.getServerArchiveFilename() + "," + DeploymentArchives.getServletClientArchiveFilename()); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.webservice; +import java.io.File; + import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -34,6 +37,32 @@ */ public class WebServiceEJB3TestCase extends WebServiceBase { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservice02-ejb3.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean02.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/META-INF02/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservice01-ejb3.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean01.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-webservice03-ejb3.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3Bean03.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EJB3RemoteInterface.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(WebServiceEJB3TestCase.class, ""); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.webservice; +import java.io.File; + import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -34,6 +37,32 @@ */ public class WebServiceJSETestCase extends WebServiceBase { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservice03-jse.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class) + .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean03.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF03/web.xml")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservice02-jse.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean02.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF02/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF02/web.xml")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-webservice01-jse.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webservice.JSEBean01.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF01/web.xml")); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(WebServiceJSETestCase.class, ""); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-06-25 13:22:17 UTC (rev 18764) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2014-06-25 17:07:43 UTC (rev 18765) @@ -32,6 +32,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.api.monitoring.Record; import org.jboss.ws.api.monitoring.RecordFilter; import org.jboss.ws.common.monitoring.AndFilter; @@ -52,6 +53,17 @@ private final String endpointURL = "http://" + getServerHost() + ":8080/management-recording/EndpointImpl"; private final String targetNS = "http://recording.management.ws.test.jboss.org/"; private String endpointObjectName; + + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("management-recording-as7.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.management.recording.Endpoint.class) + .addClass(org.jboss.test.ws.management.recording.EndpointWithConfigImpl.class); + } + }); + } @Override protected void setUp() throws Exception

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r18764 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-25 09:22:17 -0400 (Wed, 25 Jun 2014) New Revision: 18764 Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml Log: [JBWS-3806] Updating org/jboss/as/webservices/main/module.xml to be in synch with wildfly master and reference the webservices subsystem Maven artifact. Enabling filtering in assembly plugin for relying on 'wildfly900.version' property, we'll have to use a more generic one later Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-06-25 13:12:21 UTC (rev 18763) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-06-25 13:22:17 UTC (rev 18764) @@ -18,6 +18,7 @@ <fileSet> <directory>../resources/src/main/resources/modules</directory> <outputDirectory>deploy-artifacts/modules</outputDirectory> + <filtered>true</filtered> <includes> <include>**/module.xml</include> </includes> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-06-25 13:12:21 UTC (rev 18763) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-06-25 13:22:17 UTC (rev 18764) @@ -22,12 +22,17 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> +<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.webservices"> <properties> <property name="jboss.api" value="private"/> </properties> + + <exports> + <exclude path="org/jboss/as/webservices/logging"/> + </exports> <resources> + <artifact name="org.wildfly:wildfly-webservices-server-integration:${wildfly900.version}"/>  </resources> @@ -41,7 +46,10 @@ <module name="org.jboss.ejb3"/> <module name="org.jboss.invocation"/> <module name="org.jboss.jandex"/> - <module name="org.jboss.metadata"/> + <module name="org.jboss.metadata.common"/> + <module name="org.jboss.metadata.web"/> + <module name="org.jboss.metadata.ear"/> + <module name="org.jboss.metadata.ejb"/> <module name="org.jboss.staxmapper"/> <module name="org.jboss.as.controller"/> <module name="org.jboss.as.ejb3"/>

9 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2014