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> - <!-- jaxws-cxf-clientConfig --> - <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> - - <!-- jaxws-cxf-clientConfig-inContainer-client --> - <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"/> <!-- Apache CXF impl required for testing purposes --> - </manifest> - </war> - - <!-- jaxws-cxf-clientConfig-client --> - <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> - - <!-- jaxws-cxf-continuations --> - <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> - <!-- jaxws-cxf-disabledWSSubsystem --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-disabledWSSubsystem.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml"> @@ -217,58 +173,6 @@ </classes> </war> - <!-- jaxws-cxf-endpoint --> - <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> - - <!-- jaxws-cxf-fastinfoset --> - <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> - - - <!-- jaxws-cxf-gzip --> - <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> - - <!-- jaxws-cxf-httpproxy --> - <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> - - <!-- jaxws-cxf-http-basic --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-basic-sec.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/httpauth/basic/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -328,33 +232,6 @@ </manifest> </war> - <!-- jaxws-cxf-jbws3060 --> - <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> - - <!-- jaxws-cxf-jbws3098 --> - <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> - <!-- jaxws-cxf-jbws3497 --> <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> +<!-- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3516/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> + prefix="WEB-INF/wsdl"/> --> <manifest> <attribute name="Dependencies" value="org.apache.cxf.impl"/> </manifest> @@ -395,68 +275,6 @@ </manifest> </war> - <!-- jaxws-cxf-jbws3648 --> - <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> - - <!-- jaxws-cxf-jbws3648-b --> - <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> - - <!-- jaxws-cxf-jbws3655--> - <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> - <!-- jaxws-cxf-jbws3679 --> <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> - <!-- jaxws-cxf-jbws3713 --> - <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"/> <!-- cxf impl required for ClientProxy --> - </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> - - <!-- jaxws-cxf-jbws3745 --> - <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> - - <!-- jaxws-cxf-jbws3773 --> - <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> - - <!-- jaxws-cxf-logging --> - <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> - - <!-- jaxws-cxf-management --> - <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> - <!-- jaxws-cxf-mixtype--> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -619,14 +368,6 @@ </manifest> </war> - <!-- jaxws-cxf-wsmex --> - <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> - <!-- saaj-soap-connection --> <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> + <!--<zipfileset dir="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> + prefix="WEB-INF/wsdl"/>--> </war> <!-- Please add alphabetically --> 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