[jbossws-commits] JBossWS SVN: r18753 - in stack/cxf/trunk/modules/testsuite/shared-tests: src/test/ant-import and 46 other directories.

Author: asoldano Date: 2014-06-20 09:36:01 -0400 (Fri, 20 Jun 2014) New Revision: 18753 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 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/calendar/CalendarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2486/JBWS2486TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java Log: [JBWS-3711] Conversion to ShrinkWrap of remaining non-samples shared tests (moved benchmark jars build to a specific profile) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-06-20 13:36:01 UTC (rev 18753) @@ -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-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> </configuration> @@ -121,6 +120,38 @@ </plugins> </build> </profile> + + <profile> + <id>build-benchmarks</id> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>benchmarks</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="maven.test.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="project.version" value="${project.version}"/> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"/> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="endorsed.dir" value="${project.build.directory}/endorsed"/> + <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-06-20 13:36:01 UTC (rev 18753) @@ -32,28 +32,6 @@ <target name="build-jars-jaxws" description="Build the deployments."> - <!-- endpoint-publish.war --> - <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/publish/**/*.class" /> - <include name="org/jboss/test/ws/publish/EndpointImpl5.xml" /> - <include name="org/jboss/test/ws/publish/TestService.xml" /> - <exclude name="org/jboss/test/ws/publish/*TestCase.class" /> - </classes> - <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish"> - <include name="WEB-INF/wsdl/**" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common" /> - </manifest> - </war> - <!-- jaxws-benchmark-basic --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basic.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -62,24 +40,6 @@ </fileset> </jar> - <!-- jaxws-benchmark-datatypes-ejb3 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-datatypes-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/Endpoint*.class" /> - <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/ComplexType.class" /> - <exclude name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/*POJO*.class" /> - </fileset> - </jar> - - <!-- jaxws-benchmark-datatypes-pojo --> - <war warfile="${tests.output.dir}/test-libs/jaxws-benchmark-datatypes-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/benchmark/test/datatypes/war/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/Endpoint*.class" /> - <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/ComplexType.class" /> - <exclude name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/*EJB3*.class" /> - </classes> - </war> - <!-- jaxws-benchmark-basicdoclit --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basicdoclit.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -96,612 +56,24 @@ </fileset> </jar> - <!-- jaxws-calendar --> - <war warfile="${tests.output.dir}/test-libs/jaxws-calendar.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/calendar/CalendarEndpoint*.class" /> - <include name="org/jboss/test/ws/jaxws/calendar/Echo*.class" /> - <include name="org/jboss/test/ws/jaxws/calendar/Adapter*.class" /> - <include name="org/jboss/test/ws/jaxws/calendar/package-info.class" /> - <include name="org/jboss/test/ws/jaxws/calendar/ObjectFactory*.class" /> - </classes> - </war> - - <!-- jaxws-classloading-service --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar"> + <!-- jaxws-benchmark-datatypes-ejb3 --> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-datatypes-ejb3.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class" /> + <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/Endpoint*.class" /> + <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/ComplexType.class" /> + <exclude name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/*POJO*.class" /> </fileset> </jar> - <!-- jaxws-classloading-types --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class" /> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class" /> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class" /> - </fileset> - </jar> - - <!-- jaxws-complex --> - <war warfile="${tests.output.dir}/test-libs/jaxws-complex.war" webxml="${tests.output.dir}/test-resources/jaxws/complex/WEB-INF/web.xml"> + <!-- jaxws-benchmark-datatypes-pojo --> + <war warfile="${tests.output.dir}/test-libs/jaxws-benchmark-datatypes-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/benchmark/test/datatypes/war/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/complex/*.class" /> - <include name="org/jboss/test/ws/jaxws/complex/extra/*.class" /> - <include name="org/jboss/test/ws/jaxws/complex/types/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class" /> + <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/Endpoint*.class" /> + <include name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/ComplexType.class" /> + <exclude name="org/jboss/test/ws/jaxws/benchmark/test/datatypes/**/*EJB3*.class" /> </classes> </war> - <!-- jaxws-endpointReference --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-endpointReference.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/endpointReference/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/endpointReference/EndpointImpl.class" /> - </fileset> - </jar> - - <!-- jaxws-holder --> - <war warfile="${tests.output.dir}/test-libs/jaxws-holder.war" webxml="${tests.output.dir}/test-resources/jaxws/holder/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class" /> - </classes> - </war> - - <!-- jaxws-jbws981 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws981.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws1422 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1422.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1422/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1422/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws1505 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1505.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1505/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1505/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws1556 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class" /> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws1556.jar" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1556/META-INF"> - <include name="application.xml" /> - <include name="jboss-app.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1566--> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1566.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws1581 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> - </classes> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws1581-pojo.war" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> - <include name="jboss-app.xml" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointService.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> - <include name="wsdl/**" /> - <include name="permissions.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1665 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1665.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1665/**/*.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws1733 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1733/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class" /> - </classes> - </war> - - <!-- jaxws-jbws1798 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - - <!-- jaxws-jbws1799 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1799.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1799/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1799/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws1813 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF"> - <include name="jboss-webservices.xml" /> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws1813.jar" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF"> - <include name="application.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1815 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1815.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1815/META-INF"> - <include name="wsdl/my-service.wsdl" /> - <include name="permissions.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1822 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class" /> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class" /> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class" /> - </fileset> - </jar> - <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" earfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1822/two-ejb-modules/META-INF"> - <include name="jboss-app.xml" /> - <!-- this fixes the problem --> - </metainf> - <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar" /> - <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb3-inside.jar" /> - </ear> - <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" earfile="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb-module.ear"> - <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar" /> - </ear> - - <!-- jaxws-jbws1841 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1841/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1841/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF"> - <include name="wsdl/*" /> - <include name="ejb-jar.xml" /> - <include name="jboss.xml" /> - <include name="jboss-ejb3.xml" /> - <include name="jboss-webservices.xml" /> - <include name="permissions.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1904 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1904.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1904/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws2000 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2000.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2000/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2000/META-INF"> - <include name="permissions.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws2074 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/POJOIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/POJOImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml" /> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging" /> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Iface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2/META-INF"> - <include name="ejb-jar.xml" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging" /> - </manifest> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.class" /> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging" /> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase4/service/EJB3Iface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase4/service/EJB3Impl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4/META-INF"> - <include name="ejb-jar.xml" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging" /> - </manifest> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws2074-usecase1.war" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1-ear/META-INF"> - <include name="application.xml" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase2.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws2074-usecase2.jar" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase2-ear/META-INF"> - <include name="application.xml" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase3.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws2074-usecase3.war" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase3-ear/META-INF"> - <include name="application.xml" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase4.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws2074-usecase4.jar" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4-ear/META-INF"> - <include name="application.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws2150 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2150/*Service*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150-sec.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web-sec.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2150/*Service*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150-codefirst.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2150/ServiceIface.class" /> - </classes> - </war> - - <!-- jaxws-jbws2218 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2218.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2218/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2218/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws2241 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2241.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EJB3RemoteInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2241/EndpointService.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF"> - <include name="jboss.xml" /> - <include name="jboss-ejb3.xml" /> - <include name="jboss-webservices.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws2250 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2250/**/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2250/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2250/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - - <!-- jaxws-jbws2278 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2278.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2278/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2278/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2278/WEB-INF"> - <include name="jboss-web.xml" /> - <include name="wsdl/*" /> - </webinf> - </war> - - <!-- jaxws-jbws2412 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2412.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2412/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2412/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2412/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2412/WEB-INF"> - <include name="wsdl/*" /> - </webinf> - </war> - - <!-- jaxws-jbws2449 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2449.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2449/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2449/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2449/META-INF"> - <include name="wsdl/*" /> - </metainf> - </jar> - - <!-- jaxws-jbws2486 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2486.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2486/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2486/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2486/*TestCase.class" /> - </classes> - </war> - - <!-- jaxws-jbws2701 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2701.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2701/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2701/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-jbws2955 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2955.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2955/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2955/EndpointImpl.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - - <!-- jaxws-jbws2978 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - - <!-- jaxws-jbws3026 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3026/MyBean*.class" /> - </fileset> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3026-web.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3026/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3026/MyService*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" /> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/jbws3026/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - </war> - - <!-- jaxws-jbws3223 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3223.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3223/WEB-INF/web-ws.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3223/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3223/EndpointInterface.class" /> - </classes> - </war> - - <!-- jaxws-jbws3223-servlet --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3223-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3223/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3223/TestServlet.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3223/Client*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3223/EndpointInterface.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3223/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common" /> - </manifest> - </war> - - <!-- jaxws-jbws3250 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" /> - </classes> - </war> - - <!-- jaxws-jbws3401 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3401.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3401/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3401/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3401/WEB-INF"> - <include name="wsdl/*" /> - </webinf> - </war> - - <!-- jaxws-jbws3367 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3367/POJOEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - - <!-- jaxws-jbws3736 --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws3736.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3736/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3736/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3736/META-INF"> - <include name="wsdl/*" /> - </metainf> - </jar> - - <!-- jaxws-jbws3753 --> - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws3753.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3753/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3753/Service*.class" /> - </classes> - </war> - - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase2.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3367/EJB3Endpoint.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF-2"> - <include name="jboss-web.xml" /> - </webinf> - </war> - - <!-- jaxws-misc --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-misc.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/misc/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/misc/*TestCase.class" /> - </fileset> - </jar> - - <!-- jaxws-webfault --> - <war warfile="${tests.output.dir}/test-libs/jaxws-webfault.war" webxml="${tests.output.dir}/test-resources/jaxws/webfault/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/webfault/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/webfault/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/webfault/CustomException.class" /> - <include name="org/jboss/test/ws/jaxws/webfault/SimpleException.class" /> - </classes> - </war> - - <!-- jaxws-wrapped-accessor --> - <war warfile="${tests.output.dir}/test-libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/test-resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class" /> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*" /> - </classes> - </war> - - <!-- Please add alphabetically --> - </target> </project> 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-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-20 13:36:01 UTC (rev 18753) @@ -34,6 +34,22 @@ <mkdir dir="${tests.output.dir}/test-libs"/> + <!-- jaxws-classloading-service --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class" /> + </fileset> + </jar> + + <!-- jaxws-classloading-types --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class" /> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class" /> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class" /> + </fileset> + </jar> + <!-- jaxws-samples-addressing --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/addressing/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -24,6 +24,8 @@ import java.io.ByteArrayInputStream; import java.net.URL; import java.util.Calendar; +import java.util.LinkedList; +import java.util.List; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; @@ -36,7 +38,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.ArchivePath; +import org.jboss.shrinkwrap.api.Filter; 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; /** @@ -49,9 +55,26 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-calendar/EndpointService"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-calendar.war") { { + archive + .addManifest() + .addPackages(false, new Filter<ArchivePath>() { + @Override + public boolean include(ArchivePath path) + { + return !path.get().contains("TestCase"); + } + }, "org.jboss.test.ws.jaxws.calendar"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(CalendarTestCase.class, "jaxws-calendar.war"); + return new JBossWSTestSetup(CalendarTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testCalendar() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,8 +21,10 @@ */ package org.jboss.test.ws.jaxws.complex; +import java.io.File; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import javax.xml.datatype.DatatypeConfigurationException; @@ -33,7 +35,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.ArchivePath; +import org.jboss.shrinkwrap.api.Filter; 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; /** @@ -46,9 +52,27 @@ { private Registration port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-complex.war") { { + archive + .addManifest() + .addPackages(false, new Filter<ArchivePath>() { + @Override + public boolean include(ArchivePath path) + { + return !path.get().contains("TestCase"); + } + }, "org.jboss.test.ws.jaxws.complex") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/complex/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ComplexTestCase.class, "jaxws-complex.war"); + return new JBossWSTestSetup(ComplexTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } protected void setUp() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.endpointReference; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.transform.Result; @@ -30,8 +32,8 @@ import javax.xml.ws.Dispatch; import javax.xml.ws.EndpointReference; import javax.xml.ws.Service; +import javax.xml.ws.Service.Mode; import javax.xml.ws.WebServiceException; -import javax.xml.ws.Service.Mode; import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.wsaddressing.W3CEndpointReference; @@ -39,6 +41,8 @@ import org.jboss.ws.common.DOMUtils; 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; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -60,9 +64,21 @@ private Service service; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-endpointReference.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.endpointReference.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.endpointReference.EndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(EndpointReferenceTestCase.class, "jaxws-endpointReference.jar"); + return new JBossWSTestSetup(EndpointReferenceTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void setUp() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,11 @@ */ package org.jboss.test.ws.jaxws.holder; +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.Holder; import javax.xml.ws.Service; @@ -29,6 +33,8 @@ import junit.framework.Test; 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; /** @@ -40,9 +46,21 @@ { private org.jboss.test.ws.jaxws.holder.Holder port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-holder.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.holder.HolderServiceImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/holder/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(HolderTestCase.class, "jaxws-holder.war"); + return new JBossWSTestSetup(HolderTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } protected void setUp() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1422; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -30,6 +32,8 @@ import org.jboss.wsf.test.CleanupOperation; 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; /** @@ -43,9 +47,21 @@ private static URL wsdlURL; private static IWebsvc port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1422.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1422.IWebsvc.class) + .addClass(org.jboss.test.ws.jaxws.jbws1422.IWebsvcImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar", new CleanupOperation() { + return new JBossWSTestSetup(JBWS1422TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() { @Override public void cleanUp() { port = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1505; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.wsdl.Definition; @@ -32,6 +34,8 @@ import junit.framework.Test; 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; /** @@ -43,9 +47,23 @@ private Interface2 port; private URL wsdlURL; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1505.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1505.CustomType.class) + .addClass(org.jboss.test.ws.jaxws.jbws1505.Interface1.class) + .addClass(org.jboss.test.ws.jaxws.jbws1505.Interface2.class) + .addClass(org.jboss.test.ws.jaxws.jbws1505.JBWS1505EndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar"); + return new JBossWSTestSetup(JBWS1505TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1556; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -31,6 +32,7 @@ import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -45,6 +47,23 @@ { private static EndpointInterface port; + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1556.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1556.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1556.UserType.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1556.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1556.jar")) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1556/META-INF/application.xml"), "application.xml"); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear", new CleanupOperation() { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/JBWS1566TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -23,6 +23,8 @@ import java.net.URL; import java.rmi.RemoteException; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -35,6 +37,8 @@ import org.jboss.test.ws.jaxws.jbws1566.b.BClass; import org.jboss.test.ws.jaxws.jbws1566.b.BException; 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; /** @@ -47,9 +51,24 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxwstest/Jaxb20StatelessTestBean"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1566.jar") { { + archive + .addManifest() + .addPackage("org.jboss.test.ws.jaxws.jbws1566.a") + .addPackage("org.jboss.test.ws.jaxws.jbws1566.b") + .addClass(org.jboss.test.ws.jaxws.jbws1566.c.JBWS1566TestCase.class) + .addClass(org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20StatelessTestBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1566.c.Jaxb20TestWSInterface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1566TestCase.class, "jaxws-jbws1566.jar"); + return new JBossWSTestSetup(JBWS1566TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWebService() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1581; +import java.io.File; import java.net.URL; import javax.naming.InitialContext; @@ -43,6 +44,34 @@ */ public class JBWS1581TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws1581-pojo.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1581-ejb3.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Remote.class) + .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointService.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1581.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1581-pojo.war")); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS1581TestCase.class, "jaxws-jbws1581-ejb3.jar"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1665; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.wsdl.Definition; import javax.wsdl.factory.WSDLFactory; @@ -30,6 +32,8 @@ import junit.framework.Test; 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,12 +43,28 @@ */ public class JBWS1665TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1665/TrackingService"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1665.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1665.CoordinateData.class) + .addClass(org.jboss.test.ws.jaxws.jbws1665.JBWS1665TestCase.class) + .addClass(org.jboss.test.ws.jaxws.jbws1665.PropertyData.class) + .addClass(org.jboss.test.ws.jaxws.jbws1665.TraceData.class) + .addClass(org.jboss.test.ws.jaxws.jbws1665.TracePollData.class) + .addClass(org.jboss.test.ws.jaxws.jbws1665.TrackingServiceBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1665.TrackingServiceInterface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar"); + return new JBossWSTestSetup(JBWS1665TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWebService() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws1733; +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.BindingProvider; @@ -30,6 +33,8 @@ import junit.framework.Test; 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; /** @@ -43,9 +48,22 @@ private String targetNS = "http://jbws1733.jaxws.ws.test.jboss.org/"; private JBWS1733 proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1733.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1733.JBWS1733.class) + .addClass(org.jboss.test.ws.jaxws.jbws1733.JBWS1733Impl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1733/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war"); + return new JBossWSTestSetup(JBWS1733TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,9 @@ */ package org.jboss.test.ws.jaxws.jbws1798; +import java.io.File; import java.net.URL; +import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; @@ -31,9 +33,11 @@ import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType; import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response; import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType; -import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response; 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; /** @@ -47,9 +51,25 @@ private String targetNS = "http://jbws1798.jaxws.ws.test.jboss.org/"; private ServiceType proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1798.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1798.ServiceImpl.class) + .addPackage("org.jboss.test.ws.jaxws.jbws1798.generated") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd"), "wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"), "wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1798/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1798TestCase.class, "jaxws-jbws1798.war"); + return new JBossWSTestSetup(JBWS1798TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1799; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -29,6 +31,8 @@ import junit.framework.Test; 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; /** @@ -41,9 +45,23 @@ */ public class JBWS1799TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1799.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1799.IUserAccountService.class) + .addClass(org.jboss.test.ws.jaxws.jbws1799.IUserAccountServiceExt.class) + .addClass(org.jboss.test.ws.jaxws.jbws1799.UserAccountService.class) + .addClass(org.jboss.test.ws.jaxws.jbws1799.UserAccountServiceExt.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1799TestCase.class, "jaxws-jbws1799.jar"); + return new JBossWSTestSetup(JBWS1799TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testFirstService() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1813; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -29,6 +30,7 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -43,6 +45,23 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/test-context"; + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1813.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1813.EndpointImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1813/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1813.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1813.jar")) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1813/META-INF/application.xml"), "application.xml"); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS1813TestCase.class, "jaxws-jbws1813.ear"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,8 +22,11 @@ package org.jboss.test.ws.jaxws.jbws1815; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; @@ -41,6 +44,8 @@ import org.jboss.ws.api.util.DOMUtils; 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; import org.w3c.dom.Element; @@ -64,9 +69,22 @@ " </soapenv:Body>" + "</soapenv:Envelope>"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1815.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1815.ProviderImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1815/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1815/META-INF/wsdl/my-service.wsdl"), "wsdl/my-service.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.jar"); + return new JBossWSTestSetup(JBWS1815TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1822; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -30,6 +31,7 @@ import org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -41,6 +43,45 @@ */ public final class JBWS1822TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-shared.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-two-ejb3-inside.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-one-ejb3-inside.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-two-ejb-modules.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1822-one-ejb-module.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar")); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS1822TestCase.class, ""); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,19 +21,24 @@ */ package org.jboss.test.ws.jaxws.jbws1841; +import java.io.File; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; + +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import junit.framework.Test; import org.jboss.wsf.test.CleanupOperation; 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; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import java.net.URL; - /** * Serviceref through ejb3 deployment descriptor. * @@ -48,9 +53,31 @@ private static EndpointInterface port; private static StatelessRemote remote; private static InitialContext ctx; + + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1841.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1841.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1841.EndpointInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1841.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.jbws1841.StatelessBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1841.StatelessRemote.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1841/META-INF/ejb-jar.xml"), "ejb-jar.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1841/META-INF/jboss-ejb3.xml"), "jboss-ejb3.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1841/META-INF/jboss-webservices.xml"), "jboss-webservices.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1841/META-INF/jboss.xml"), "jboss.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1841/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar", new CleanupOperation() { + return new JBossWSTestSetup(JBWS1841TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() { @Override public void cleanUp() { port = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -23,6 +23,8 @@ import java.net.URL; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; @@ -30,6 +32,8 @@ import org.jboss.ws.common.DOMUtils; 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; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -45,9 +49,22 @@ */ public class JBWS1904TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1904.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1904.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1904.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1904.UserException.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1904TestCase.class, "jaxws-jbws1904.jar"); + return new JBossWSTestSetup(JBWS1904TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLSchema() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,19 +21,24 @@ */ package org.jboss.test.ws.jaxws.jbws2000; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; +import javax.activation.DataHandler; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; -import javax.xml.ws.BindingProvider; import javax.xml.ws.soap.SOAPBinding; -import javax.activation.DataHandler; import junit.framework.Test; +import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource; 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; -import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource; /** * @@ -43,9 +48,22 @@ private FileTransferService port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2000.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2000.FileTransferService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2000.FileTransferServiceImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2000/META-INF/permissions.xml"), "permissions.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2000TestCase.class, "jaxws-jbws2000.jar"); + return new JBossWSTestSetup(JBWS2000TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } protected void setUp() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2074.usecase1.client; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -28,8 +29,10 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,6 +42,29 @@ */ public final class JBWS2074TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2074-usecase1.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase1.service.POJOImpl.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1/WEB-INF/web.xml")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2074-usecase1.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2074-usecase1.war")) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase1-ear/META-INF/application.xml"), "application.xml"); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS2074TestCase.class, ""); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2074.usecase2.client; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -28,8 +29,10 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Iface; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,6 +42,25 @@ */ public final class JBWS2074TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2074-usecase2.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Iface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase2.service.EJB3Impl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2/META-INF/ejb-jar.xml"), "ejb-jar.xml"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2074-usecase2.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2074-usecase2.jar")) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase2-ear/META-INF/application.xml"), "application.xml"); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS2074TestCase.class, ""); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,15 +21,21 @@ */ package org.jboss.test.ws.jaxws.jbws2074.usecase3.client; +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.test.ws.jaxws.jbws2074.usecase3.service.POJOIface; 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,6 +45,25 @@ */ public final class JBWS2074TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2074-usecase3.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase3.service.POJOImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3/WEB-INF/web.xml")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2074-usecase3.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2074-usecase3.war")) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase3-ear/META-INF/application.xml"), "application.xml"); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS2074TestCase.class, ""); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2074.usecase4.client; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -28,8 +29,10 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Iface; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,6 +42,28 @@ */ public final class JBWS2074TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2074-usecase4.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.DescriptorResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.JavaResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Iface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2074.usecase4.service.EJB3Impl.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4/META-INF/ejb-jar.xml"), "ejb-jar.xml"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2074-usecase4.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2074-usecase4.jar")) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2074/usecase4-ear/META-INF/application.xml"), "application.xml"); + } + }); + } public static Test suite() { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2150; +import java.io.File; import java.net.URL; import java.util.Collection; import java.util.HashMap; @@ -46,6 +47,8 @@ import org.jboss.ws.common.ObjectNameFactory; import org.jboss.wsf.spi.management.ServerConfig; 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; import com.ibm.wsdl.extensions.soap.SOAPAddressImpl; @@ -70,6 +73,48 @@ private static final String NAMESPACE = "http://test.jboss.org/addressrewrite"; private static final String NAMESPACE_IMP = "http://test.jboss.org/addressrewrite/wsdlimp"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2150.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2150.InvalidSecureService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.InvalidService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ValidSecureService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ValidService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2150/WEB-INF/wsdl/Service.wsdl"), "wsdl/Service.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2150/WEB-INF/wsdl/inner.wsdl"), "wsdl/inner.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2150/WEB-INF/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2150-codefirst.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2150.CodeFirstService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ServiceIface.class); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2150-sec.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2150.InvalidSecureService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.InvalidService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ValidSecureService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2150.ValidService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2150/WEB-INF/wsdl/Service.wsdl"), "wsdl/Service.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2150/WEB-INF/wsdl/inner.wsdl"), "wsdl/inner.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2150/WEB-INF/web-sec.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + static { + JBossWSTestHelper.writeToFile(createDeployments()); + } + protected static class JBWS2150TestSetup extends JBossWSTestSetup { protected static Boolean modifySOAPAddress; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2218/JBWS2218TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws2218; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -29,6 +31,8 @@ import junit.framework.Test; 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,9 +42,21 @@ */ public class JBWS2218TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2218.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2218.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws2218.EndpointInterface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2218TestCase.class, "jaxws-jbws2218.jar"); + return new JBossWSTestSetup(JBWS2218TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testSimpleAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws2241; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -31,6 +34,8 @@ import junit.framework.Test; 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; /** @@ -41,9 +46,25 @@ */ public class JBWS2241TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2241.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2241.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws2241.EJB3RemoteInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2241.EndpointInterface.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss-ejb3.xml"), "jboss-ejb3.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss-webservices.xml"), "jboss-webservices.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2241/META-INF/jboss.xml"), "jboss.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true); + return new JBossWSTestSetup(JBWS2241TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true); } private EndpointInterface getPort(String user, String pwd) throws MalformedURLException { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2250/JBWS2250TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2250; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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; /** @@ -42,10 +47,26 @@ */ public class JBWS2250TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2250.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2250.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2250.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2250.Id.class) + .addClass(org.jboss.test.ws.jaxws.jbws2250.Message.class) + .addClass(org.jboss.test.ws.jaxws.jbws2250.ObjectFactory.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2250/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2250/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(JBWS2250TestCase.class, "jaxws-jbws2250.war"); + return new JBossWSTestSetup(JBWS2250TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testPortAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,8 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2278; +import java.io.File; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; @@ -33,7 +35,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.ArchivePath; +import org.jboss.shrinkwrap.api.Filter; 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; /** @@ -48,9 +54,28 @@ private TestEndpoint port11; private TestEndpoint port12; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2278.war") { { + archive + .addManifest() + .addPackages(false, new Filter<ArchivePath> () { + @Override + public boolean include(ArchivePath path) + { + return !path.get().contains("TestCase"); + }}, "org.jboss.test.ws.jaxws.jbws2278") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/wsdl/Test.wsdl"), "wsdl/Test.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2278TestCase.class, "jaxws-jbws2278.war"); + return new JBossWSTestSetup(JBWS2278TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2412; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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,10 +44,28 @@ */ public class JBWS2412TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2412.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2412.TestEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2412.TestEndpointImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd"), "wsdl/schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd"), "wsdl/schema2.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd"), "wsdl/schema3.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd"), "wsdl/schema4.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd"), "wsdl/schema5.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2412/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2412TestCase.class, "jaxws-jbws2412.war"); + return new JBossWSTestSetup(JBWS2412TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } private TestEndpoint getPort() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2449; +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.RespectBindingFeature; @@ -30,6 +33,8 @@ import junit.framework.Test; 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; /** @@ -42,9 +47,22 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2449"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2449.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2449.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2449.EndpointImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2449/META-INF/wsdl/test.wsdl"), "wsdl/test.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2449TestCase.class, "jaxws-jbws2449.jar"); + return new JBossWSTestSetup(JBWS2449TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2486/JBWS2486TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2486/JBWS2486TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2486/JBWS2486TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2486; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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,9 +43,22 @@ */ public class JBWS2486TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2486.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2486.JBWS2486.class) + .addClass(org.jboss.test.ws.jaxws.jbws2486.JBWS2486Impl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2486/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2486TestCase.class, "jaxws-jbws2486.war"); + return new JBossWSTestSetup(JBWS2486TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testIssue() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws2701; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -30,6 +32,8 @@ 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; /** @@ -42,9 +46,22 @@ { private final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2701/EndpointService/EndpointImpl"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2701.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2701.ClassA.class) + .addClass(org.jboss.test.ws.jaxws.jbws2701.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2701.EndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2701TestCase.class, "jaxws-jbws2701.jar"); + return new JBossWSTestSetup(JBWS2701TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDL() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2955/JBWS2955TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,21 +21,39 @@ */ package org.jboss.test.ws.jaxws.jbws2955; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; 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 JBWS2955TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2955"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2955.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2955.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2955.EndpointImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2955/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2955/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2955TestCase.class, "jaxws-jbws2955.war"); + return new JBossWSTestSetup(JBWS2955TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testCall() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.jbws2978; import java.io.ByteArrayInputStream; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; @@ -35,6 +38,8 @@ import junit.framework.Test; 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; /** @@ -44,7 +49,6 @@ */ public class JBWS2978TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2978"; private final String requestMessage = "<S:Envelope xmlns:S='http://schemas.xmlsoap.org/soap/envelope/'><S:Head... xmlns='http://www.w3.org/2005/08/addressing'>" @@ -56,9 +60,25 @@ public Service service = null; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2978.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2978.AddNumbers.class) + .addClass(org.jboss.test.ws.jaxws.jbws2978.AddNumbersImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2978.AddNumbersRequest.class) + .addClass(org.jboss.test.ws.jaxws.jbws2978.AddNumbersResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2978/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2978/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2978TestCase.class, "jaxws-jbws2978.war"); + return new JBossWSTestSetup(JBWS2978TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3026/JBWS3026TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3026; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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,9 +43,32 @@ */ public final class JBWS3026TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws3026-ejb.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3026.MyBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws3026.MyBeanLocal.class) + .addClass(org.jboss.test.ws.jaxws.jbws3026.MyBeanRemote.class); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3026-web.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3026.MyBeanRemote.class) + .addClass(org.jboss.test.ws.jaxws.jbws3026.MyService.class) + .addClass(org.jboss.test.ws.jaxws.jbws3026.MyServiceImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3026/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3026/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3026TestCase.class, "jaxws-jbws3026-ejb.jar,jaxws-jbws3026-web.war"); + return new JBossWSTestSetup(JBWS3026TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testUsecase1WithoutSar() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3223; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.wsdl.Definition; import javax.wsdl.factory.WSDLFactory; @@ -30,8 +33,11 @@ import junit.extensions.TestSetup; import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; 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; /** @@ -43,9 +49,33 @@ public class EndpointTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3223-servlet.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addClass(org.jboss.test.ws.jaxws.jbws3223.Client.class) + .addClass(org.jboss.test.ws.jaxws.jbws3223.EndpointInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws3223.TestServlet.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3223/WEB-INF/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3223.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3223.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws3223.EndpointInterface.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3223/WEB-INF/web-ws.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-jbws3223-servlet.war jaxws-jbws3223.war")); + return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()))); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3250; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.activation.DataHandler; import javax.activation.URLDataSource; @@ -36,15 +39,31 @@ 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 JBWS3250TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3250.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3250.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3250.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3250.MTOMRequest.class) + .addClass(org.jboss.test.ws.jaxws.jbws3250.MTOMResponse.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3250/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250"; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war"); + return new JBossWSTestSetup(JBWS3250TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testMtomSawpFile() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/BothPojoAndEjbInWarTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.jbws3367; +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,6 +33,8 @@ import junit.framework.Test; 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; /** @@ -41,10 +46,24 @@ */ public class BothPojoAndEjbInWarTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3367-usecase1.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3367.EJB3Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3367.EndpointIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws3367.POJOEndpoint.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3367/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3367/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(BothPojoAndEjbInWarTestCase.class, "jaxws-jbws3367-usecase1.war"); + return new JBossWSTestSetup(BothPojoAndEjbInWarTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testPOJOEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3367/OnlyEjbInWarTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.jbws3367; +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,6 +33,8 @@ import junit.framework.Test; 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; /** @@ -41,10 +46,22 @@ */ public class OnlyEjbInWarTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3367-usecase2.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3367.EJB3Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3367.EndpointIface.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3367/WEB-INF-2/jboss-web.xml"), "jboss-web.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(OnlyEjbInWarTestCase.class, "jaxws-jbws3367-usecase2.war"); + return new JBossWSTestSetup(OnlyEjbInWarTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEJB3Endpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3401; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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,10 +43,27 @@ */ public class JBWS3401TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3401.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3401.TestEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3401.TestEndpointImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema1.xsd"), "wsdl/schema1.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema2.xsd"), "wsdl/schema2.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema3.xsd"), "wsdl/schema3.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema4.xsd"), "wsdl/schema4.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3401/WEB-INF/wsdl/schema5.xsd"), "wsdl/schema5.xsd"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS3401TestCase.class, "jaxws-jbws3401.war"); + return new JBossWSTestSetup(JBWS3401TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } private TestEndpoint getPort() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3736; +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.BindingProvider; @@ -31,6 +34,8 @@ 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; /** @@ -43,9 +48,22 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3736"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws3736.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3736.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3736.EndpointImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3736/META-INF/wsdl/test.wsdl"), "wsdl/test.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3736TestCase.class, "jaxws-jbws3736.jar"); + return new JBossWSTestSetup(JBWS3736TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3753/JBWS3753TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3753; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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,8 +43,23 @@ */ public class JBWS3753TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3753.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceAImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceBImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3753.ServiceInterface.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3753/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3753TestCase.class, "jaxws-jbws3753.war"); + return new JBossWSTestSetup(JBWS3753TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testService() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws981; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -29,6 +31,8 @@ import junit.framework.Test; 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,10 +43,22 @@ */ public class JBWS981TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws981.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws981.EJB3Bean.class) + .addClass(org.jboss.test.ws.jaxws.jbws981.EJB3RemoteInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws981.EndpointInterface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar"); + return new JBossWSTestSetup(JBWS981TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testCall() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/misc/MiscTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -23,6 +23,8 @@ import java.net.HttpURLConnection; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -31,6 +33,8 @@ 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; /** @@ -43,9 +47,21 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-misc/endpoint"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-misc.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.misc.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.misc.EndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(MiscTestCase.class, "jaxws-misc.jar"); + return new JBossWSTestSetup(MiscTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.webfault; +import java.io.File; import java.net.URL; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -31,6 +34,8 @@ import org.jboss.ws.common.DOMUtils; 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; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -47,9 +52,24 @@ private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-webfault"; private static final String TARGET_NS = "http://webfault.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-webfault.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.webfault.CustomException.class) + .addClass(org.jboss.test.ws.jaxws.webfault.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.webfault.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.webfault.SimpleException.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/webfault/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebFaultTestCase.class, "jaxws-webfault.war"); + return new JBossWSTestSetup(WebFaultTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } /** Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.wrapped.accessor; +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; @@ -29,6 +32,8 @@ import junit.framework.Test; 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; /** @@ -41,9 +46,26 @@ private String targetNS = "http://accessor.wrapped.jaxws.ws.test.jboss.org/"; private Accessor proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-wrapped-accessor.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.wrapped.accessor.Accessor.class) + .addClass(org.jboss.test.ws.jaxws.wrapped.accessor.AccessorImpl.class) + .addClass(org.jboss.test.ws.jaxws.wrapped.accessor.jaxws.FieldAccessor.class) + .addClass(org.jboss.test.ws.jaxws.wrapped.accessor.jaxws.FieldAccessorResponse.class) + .addClass(org.jboss.test.ws.jaxws.wrapped.accessor.jaxws.MethodAccessor.class) + .addClass(org.jboss.test.ws.jaxws.wrapped.accessor.jaxws.MethodAccessorResponse.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/wrapped/accessor/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(AccessorTestCase.class, "jaxws-wrapped-accessor.war"); + return new JBossWSTestSetup(AccessorTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2014-06-20 09:01:54 UTC (rev 18752) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) @@ -21,12 +21,18 @@ */ package org.jboss.test.ws.publish; +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.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -37,9 +43,33 @@ */ public class EndpointPublishTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("endpoint-publish.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addAsResource("org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml", "WEB-INF/wsdl/EndpointImpl3.xml") + .addAsResource("org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml", "WEB-INF/wsdl/EndpointImpl4.xml") + .addClass(org.jboss.test.ws.publish.Endpoint.class) + .addClass(org.jboss.test.ws.publish.EndpointImpl.class) + .addClass(org.jboss.test.ws.publish.EndpointImpl2.class) + .addClass(org.jboss.test.ws.publish.EndpointImpl3.class) + .addClass(org.jboss.test.ws.publish.EndpointImpl4.class) + .addClass(org.jboss.test.ws.publish.EndpointImpl5.class) + .addAsResource("org/jboss/test/ws/publish/EndpointImpl5.xml") + .addClass(org.jboss.test.ws.publish.EndpointPublishServlet.class) + .addAsResource("org/jboss/test/ws/publish/TestService.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/publish/META-INF/permissions.xml"), "permissions.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/publish/WEB-INF/wsdl/EndpointImpl3.xml"), "wsdl/EndpointImpl3.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(EndpointPublishTestCase.class, "endpoint-publish.war"); + return new JBossWSTestSetup(EndpointPublishTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpointPublish() throws Exception