June 2014 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

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."> -  - <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> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basic.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -62,24 +40,6 @@ </fileset> </jar> -  - <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> - -  - <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> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basicdoclit.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -96,612 +56,24 @@ </fileset> </jar> -  - <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> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar"> +  + <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> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class" /> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class" /> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class" /> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-complex.war" webxml="${tests.output.dir}/test-resources/jaxws/complex/WEB-INF/web.xml"> +  + <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> -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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" /> -  - </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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - </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"/> +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class" /> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class" /> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class" /> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class" /> + </fileset> + </jar> +  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-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:Header><To 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

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18752 - spi/trunk/src/main/java/org/jboss/wsf/spi/management.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-20 05:01:54 -0400 (Fri, 20 Jun 2014) New Revision: 18752 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java Log: [JBWS-3800] Reverting commit 18750 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-06-20 08:50:53 UTC (rev 18751) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-06-20 09:01:54 UTC (rev 18752) @@ -37,7 +37,7 @@ public interface ServerConfig { /** The host name that is returned if there is no other defined */ - String UNDEFINED_HOSTNAME = "localhost"; + String UNDEFINED_HOSTNAME = "jbossws.undefined.host"; String getImplementationTitle();

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18751 - common/trunk/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-20 04:50:53 -0400 (Fri, 20 Jun 2014) New Revision: 18751 Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java Log: [JBWS-3733] Revert changes in rev. 18721 Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java 2014-06-20 06:37:20 UTC (rev 18750) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java 2014-06-20 08:50:53 UTC (rev 18751) @@ -21,16 +21,12 @@ */ package org.jboss.ws.common.deployment; -import org.jboss.ws.common.configuration.ConfigHelper; import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.management.EndpointMetricsFactory; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.metadata.config.EndpointConfig; /** * A deployer that assigns the metrics to the Endpoint @@ -44,17 +40,10 @@ public void start(Deployment dep) { EndpointMetricsFactory factory = SPIProvider.getInstance().getSPI(EndpointMetricsFactory.class); - ServerConfigFactory scf = SPIProvider.getInstance().getSPI(ServerConfigFactory.class); - EndpointConfig defaultConfig = scf.getServerConfig().getEndpointConfig(EndpointConfig.STANDARD_ENDPOINT_CONFIG); - boolean enabled = Boolean.valueOf(defaultConfig.getProperty(EndpointConfig.STATISTICS_ENABLED)); - if (enabled) + for (Endpoint ep : dep.getService().getEndpoints()) { - for (Endpoint ep : dep.getService().getEndpoints()) - { - - EndpointMetrics metrics = factory.newEndpointMetrics(); - ep.setEndpointMetrics(metrics); - } + EndpointMetrics metrics = factory.newEndpointMetrics(); + ep.setEndpointMetrics(metrics); } } }

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18750 - spi/trunk/src/main/java/org/jboss/wsf/spi/management.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-06-20 02:37:20 -0400 (Fri, 20 Jun 2014) New Revision: 18750 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java Log: [JBWS-3800]:Change undefied host to a meaningful host name Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-06-19 17:14:09 UTC (rev 18749) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-06-20 06:37:20 UTC (rev 18750) @@ -37,7 +37,7 @@ public interface ServerConfig { /** The host name that is returned if there is no other defined */ - String UNDEFINED_HOSTNAME = "jbossws.undefined.host"; + String UNDEFINED_HOSTNAME = "localhost"; String getImplementationTitle();

10 years, 6 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-19 13:14:09 -0400 (Thu, 19 Jun 2014) New Revision: 18749 Removed: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1446/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1666/META-INF/ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2183/ Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3441/JBWS3441TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3556/JBWS3556TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java Log: [JBWS-3711] Initial conversion to ShrinkWrap of some shared-testsuite tests (non-samples) Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -429,6 +429,18 @@ return archiveDir; } } + + public static String writeToFile(BaseDeployment<?>... deps) { + if (deps == null) { + return ""; + } + StringBuilder sb = new StringBuilder(); + for (BaseDeployment<?> dep : deps) { + sb.append(dep.writeToFile().getName()); + sb.append(" "); + } + return sb.toString(); + } public static abstract class WarDeployment extends BaseDeployment<WebArchive> { 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-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-06-19 17:14:09 UTC (rev 18749) @@ -54,16 +54,6 @@ </manifest> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class" /> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class" /> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class" /> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class" /> - </classes> - </war> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basic.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -106,16 +96,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-binding.war" webxml="${tests.output.dir}/test-resources/jaxws/binding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/binding/ServerHandler.class" /> - <include name="org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml" /> - </classes> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-calendar.war" needxmlfile="false"> <classes dir="${tests.output.dir}/test-classes"> @@ -143,41 +123,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-clientConfig.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/clientConfig/Endpoint*.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-clientConfig-inContainer-client.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/clientConfig/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/clientConfig/*Handler.class" /> - <include name="org/jboss/test/ws/jaxws/clientConfig/Helper.class" /> - <include name="org/jboss/test/ws/jaxws/clientConfig/TestUtils.class" /> - <include name="org/jboss/test/helper/TestServlet.class" /> - <include name="org/jboss/test/helper/ClientHelper.class" /> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/clientConfig"> - <include name="META-INF/jaxws-client-config.xml" /> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/clientConfig/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common" /> - </manifest> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-clientConfig-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/clientConfig/META-INF"> - <include name="jaxws-client-config.xml" /> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-complex.war" webxml="${tests.output.dir}/test-resources/jaxws/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -196,63 +141,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/jse-web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.class" /> - <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.class" /> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/servlet-web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.class" /> - </classes> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-handlerauth.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/handlers.xml" /> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-handlerauth2.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl2.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/LogicalSimpleHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/handlers2.xml" /> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-handlerauth3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/handlerauth/SecureEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/SecureEndpointImpl3.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/SimpleHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerauth/handlers.xml" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/handlerauth/META-INF"> - <include name="jboss-webservices.xml" /> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerscope/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/handlerscope/*ServerHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml" /> - </classes> - </war> -  <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"> @@ -260,27 +148,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws860.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws860/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws860/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws860/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws944.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class" /> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class" /> - </fileset> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws981.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -290,41 +157,6 @@ </fileset> </jar> -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1178/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.class" /> - </classes> - </war> - -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1190/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1190/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1190/EndpointImpl*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class" /> - </classes> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1283.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1283/*.*" /> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1357/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class" /> - </classes> - <fileset dir="${tests.output.dir}/test-resources/jaxws/jbws1357"> - <include name="hello.jsp" /> - </fileset> - </war> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1422.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -333,13 +165,6 @@ </fileset> </jar> -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1446.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1446/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.class" /> - </fileset> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1505.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -348,15 +173,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1529/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class" /> - </classes> - </war> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -409,33 +225,6 @@ </metainf> </jar> -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1582/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF"> - <include name="wsdl/service.wsdl" /> - </webinf> - </war> - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582-attacked.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/attack-web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1582/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF"> - <include name="wsdl/attack-service.wsdl" /> - </webinf> - </war> - -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1611/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class" /> - </classes> - </war> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1665.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -443,41 +232,6 @@ </fileset> </jar> -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1666/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class" /> - </classes> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1666-client.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1666/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestClient.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.class" /> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1666-b-client.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1666/META-INF/MANIFEST-jbossws-cxf-client.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestClient.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.class" /> - </fileset> - </jar> - - -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1694.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1694/**/*.class" /> - </fileset> - </jar> - -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1702/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1702/WEB-INF" /> - </war> -  <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"> @@ -505,26 +259,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1807/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class" /> - <include name="org/jboss/test/helper/DOMWriter.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1807/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1809/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> - </jar> -  <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"> @@ -603,34 +337,6 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1843/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1843/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1845.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1845/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class" /> - </fileset> - </jar> - -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1872.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1872/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1872/*TestCase.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1872/Client*.class" /> - </fileset> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1904.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -639,17 +345,6 @@ </fileset> </jar> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1969.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1969/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1969/META-INF"> - <include name="wsdl/**" /> - </metainf> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2000.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -661,18 +356,6 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2009/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2009/WEB-INF"> - <include name="wsdl/**" /> - <include name="schema/**" /> - </webinf> - </war> -  <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"> @@ -783,14 +466,6 @@ </classes> </war> -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2183.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2183/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2183/**/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2183/**/*TestCase.class" /> - </fileset> - </jar> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2218.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -825,45 +500,6 @@ </webinf> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2257.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2257/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2257/Service*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2257/jaxws/*.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2257/META-INF"> - <include name="wsdl/**" /> - <include name="permissions.xml" /> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2259/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/CustomHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/Photo.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF"> - <include name="jaxws-endpoint-config.xml" /> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/jbws2259/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2268/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2268/*TestCase.class" /> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/jbws2268/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - </war> -  <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"> @@ -876,30 +512,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2307-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2307/ClientServlet.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2307/Hello.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2307/HelloService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-client"> - <include name="wsdl/**" /> - <include name="*.xml" /> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2307-service.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-service/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2307/Hello.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2307/HelloImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2307/HelloService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-service"> - <include name="wsdl/**" /> - <include name="*.xml" /> - </webinf> - </war> -  <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"> @@ -911,23 +523,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2419.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2419/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml" /> - <include name="org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2419/WEB-INF"> - <include name="wsdl/*" /> - </webinf> - </war> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2449.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -947,65 +542,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2527-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2527/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2527/ClientServlet.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2527/Hello.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2527/HelloService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2527/WEB-INF-client"> - <include name="wsdl/**" /> - <include name="*.xml" /> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2527-service.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2527/WEB-INF-service/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2527/Hello.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2527/HelloImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2527/HelloService.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2527/WEB-INF-service"> - <include name="wsdl/**" /> - <include name="*.xml" /> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2634.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/**/*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> - </fileset> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2634/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging" /> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF"> - <include name="ejb-jar.xml" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging" /> - </manifest> - </jar> - <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF/application.xml" earfile="${tests.output.dir}/test-libs/jaxws-jbws2634.ear"> - <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634.jar" /> - <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar" /> - <fileset file="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war" /> - </ear> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2701.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -1014,45 +550,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2717.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2717/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2934-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2934/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" /> - </classes> - </war> - - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2934-ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" /> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2937.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2937/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2937/UserType.class" /> - </fileset> - </jar> - - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2937-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2937/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2937/EndpointImpl.class" /> - </fileset> - </jar> -  <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"> @@ -1064,40 +561,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2956.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2956/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2956/OnewayEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2956/OnewayEndpointImpl.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2956/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2957-ejbinwarwebinflib_ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2957/common/*.class" /> - </fileset> - </jar> - - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2957-ejbinwarwebinflib_web.war" needxmlfile="false"> - <lib dir="${tests.output.dir}/test-libs/"> - <include name="jaxws-jbws2957-ejbinwarwebinflib_ejb.jar" /> - </lib> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2957/WEB-INF"> - <include name="wsdl/**" /> - <include name="ejb-jar.xml" /> - </webinf> - </war> - - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2957-ejbinwarwebinflib.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws2957-ejbinwarwebinflib_web.war" /> - </fileset> - </jar> -  <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"> @@ -1111,19 +574,6 @@ </webinf> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2999.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2999/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2999/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2999/META-INF"> - <include name="ejb-jar.xml" /> - <include name="webservices.xml" /> - <include name="wsdl/**" /> - </metainf> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -1141,76 +591,6 @@ </zipfileset> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3034.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3034/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3034/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3034/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3034/ServerSOAPHandler.class" /> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/jbws3034"> - <include name="handlers.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3034/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3114.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3114/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3114/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3114/EndpointImpl.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3114/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jbws3140-server.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3140/*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3140/*.xml" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3140/*EndpointService.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server"> - <include name="*.xml" /> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jbws3140-responses-server.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3140/*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3140/*.xml" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Responses-Server"> - <include name="*.xml" /> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140"> - <include name="wsdl/*.wsdl" /> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jbws3140-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Client/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3140/*.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3140/*.xml" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" /> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/jbws3140"> - <include name="*.jpg" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Client"> - <include name="jboss-web.xml" /> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140"> - <include name="wsdl/*.wsdl" /> - </webinf> - </war> -  <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"> @@ -1242,83 +622,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3282.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3282/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3282/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3282/*Handler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3282/jaxws-handlers-server.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF"> - <include name="**/jaxws-endpoint-config.xml" /> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3287-A.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF/web-A.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/*Handler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF"> - <include name="**/jaxws-endpoint-config.xml" /> - <include name="**/jboss-webservices.xml" /> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3287-B.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF/web-B.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/*Handler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF"> - <include name="**/jaxws-endpoint-config.xml" /> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3287-C.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3287/EJB3EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/*Handler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3287/META-INF"> - <include name="**/*" /> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3276/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3276/POJOImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class" /> - </classes> - </war> - - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase2.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3293.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3293/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3293/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3293/EndpointBean.class" /> - </classes> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3401.war" needxmlfile="false"> <classes dir="${tests.output.dir}/test-classes"> @@ -1330,50 +633,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3477.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3477/TestServlet.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3477/Helper.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3441.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3441/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3441/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3441/WEB-INF"> - <include name="beans.xml" /> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/jbws3441/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3477-custom-provider.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3477/TestServlet.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3477/Helper.class" /> - <include name="org/jboss/test/ws/jaxws/jbws3477/DummyProvider.class" /> - </classes> - <classes dir="${tests.output.dir}/test-resources/jaxws/jbws3477"> - <include name="META-INF/services/*" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-as3581.war" webxml="${tests.output.dir}/test-resources/jaxws/as3581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/as3581/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/as3581/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/as3581/EndpointImpl2.class" /> - <include name="org/jboss/test/ws/jaxws/as3581/EndpointIface2.class" /> - </classes> - </war> -  <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"> @@ -1386,22 +645,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3552.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3552/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3552/*TestCase.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3556.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3556/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3556/*TestCase.class" /> - </classes> - </war> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws3736.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -1430,31 +673,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" manifest="${tests.output.dir}/test-resources/jaxws/endpoint/META-INF/MANIFEST.MF" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class" /> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF"> - <include name="wsdl/**" /> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-ws.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web-ws.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/endpoint/WSClientEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/endpoint/WSClientEndpointInterface.class" /> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class" /> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/endpoint/META-INF" prefix="META-INF"> - <include name="permissions.xml" /> - </zipfileset> - </war> -  <jar jarfile="${tests.output.dir}/test-libs/jaxws-misc.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -1463,20 +681,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/namespace/CustomHandler.class" /> - <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class" /> - <include name="org/jboss/test/ws/jaxws/namespace/*.xml" /> - <include name="org/jboss/test/helper/DOMWriter.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> -  <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"> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.anonymous; +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,24 @@ private String targetNS = "http://anonymous.jaxws.ws.test.jboss.org/"; private Anonymous proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-anonymous.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.anonymous.Anonymous.class) + .addClass(org.jboss.test.ws.jaxws.anonymous.AnonymousImpl.class) + .addClass(org.jboss.test.ws.jaxws.anonymous.AnonymousRequest.class) + .addClass(org.jboss.test.ws.jaxws.anonymous.AnonymousResponse.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/anonymous/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(AnonymousTestCase.class, "jaxws-anonymous.war"); + return new JBossWSTestSetup(AnonymousTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.as3581; +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; /** @@ -39,10 +44,24 @@ */ public class AS3581TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-as3581.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.as3581.EndpointIface.class) + .addClass(org.jboss.test.ws.jaxws.as3581.EndpointIface2.class) + .addClass(org.jboss.test.ws.jaxws.as3581.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.as3581.EndpointImpl2.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/as3581/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(AS3581TestCase.class, "jaxws-as3581.war"); + return new JBossWSTestSetup(AS3581TestCase.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/binding/SOAPBindingTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,8 +21,10 @@ */ package org.jboss.test.ws.jaxws.binding; +import java.io.File; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import javax.wsdl.Binding; @@ -41,6 +43,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; /** @@ -53,9 +57,24 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-binding"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-binding.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.binding.SOAPEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.binding.SOAPEndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.binding.ServerHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/binding/jaxws-server-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/binding/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(SOAPBindingTestCase.class, "jaxws-binding.war"); + return new JBossWSTestSetup(SOAPBindingTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } // [JBWS-1761] - WSProvide ignores SOAPBinding declaration Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,12 +21,18 @@ */ package org.jboss.test.ws.jaxws.clientConfig; +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,44 @@ */ public class ClientConfigurationTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-clientConfig-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig-inContainer-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") + .addClass(org.jboss.test.helper.ClientHelper.class) + .addClass(org.jboss.test.helper.TestServlet.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.CustomHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.Helper.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.RoutingHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.TestUtils.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.UserHandler.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/permissions.xml"), "permissions.xml"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.EndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ClientConfigurationTestCase.class, "jaxws-clientConfig.war,jaxws-clientConfig-client.jar, jaxws-clientConfig-inContainer-client.war"); + return new JBossWSTestSetup(ClientConfigurationTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } /** Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCaseForked.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,13 +21,19 @@ */ package org.jboss.test.ws.jaxws.clientConfig; +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.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Verifies client configuration setup (in-container tests, relying on AS model) @@ -37,9 +43,44 @@ */ public class ClientConfigurationTestCaseForked extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-clientConfig-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig-inContainer-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") + .addClass(org.jboss.test.helper.ClientHelper.class) + .addClass(org.jboss.test.helper.TestServlet.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.CustomHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.Helper.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.RoutingHandler.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.TestUtils.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.UserHandler.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/permissions.xml"), "permissions.xml"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-clientConfig.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.clientConfig.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.clientConfig.EndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ClientConfigurationTestCaseForked.class, "jaxws-clientConfig.war,jaxws-clientConfig-client.jar, jaxws-clientConfig-inContainer-client.war"); + return new JBossWSTestSetup(ClientConfigurationTestCaseForked.class, JBossWSTestHelper.writeToFile(createDeployments())); } /** Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.endpoint; +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; @@ -34,6 +37,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; /** @@ -44,10 +49,35 @@ */ public class EndpointTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-endpoint-servlet.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.endpoint.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.endpoint.EndpointInterface.class) + .addClass(org.jboss.test.ws.jaxws.endpoint.EndpointServlet.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/endpoint/WEB-INF/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-endpoint-ws.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.endpoint.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.endpoint.EndpointInterface.class) + .addClass(org.jboss.test.ws.jaxws.endpoint.WSClientEndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.endpoint.WSClientEndpointInterface.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/endpoint/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/endpoint/WEB-INF/web-ws.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war jaxws-endpoint-ws.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/enventry/EnvEntryJSETestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.enventry; +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,9 +44,21 @@ */ public class EnvEntryJSETestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-enventry-jse.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/enventry/WEB-INF/jse-web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry-jse.war"); + return new JBossWSTestSetup(EnvEntryJSETestCase.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/enventry/EnvEntryServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,12 +21,17 @@ */ package org.jboss.test.ws.jaxws.enventry; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -37,9 +42,21 @@ */ public class EnvEntryServletTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-enventry-servlet.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.enventry.EnvEntryServlet.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/enventry/WEB-INF/servlet-web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(EnvEntryServletTestCase.class, "jaxws-enventry-servlet.war"); + return new JBossWSTestSetup(EnvEntryServletTestCase.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/handlerauth/HandlerAuthTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.handlerauth; +import java.io.File; import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -32,6 +35,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,42 @@ */ public class HandlerAuthTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-handlerauth2.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.handlerauth.LogicalSimpleHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerauth.SecureEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.handlerauth.SecureEndpointImpl2.class) + .addAsResource("org/jboss/test/ws/jaxws/handlerauth/handlers2.xml"); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-handlerauth.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.handlerauth.SecureEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.handlerauth.SecureEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.handlerauth.SimpleHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/handlerauth/handlers.xml"); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-handlerauth3.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.handlerauth.SecureEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.handlerauth.SecureEndpointImpl3.class) + .addClass(org.jboss.test.ws.jaxws.handlerauth.SimpleHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/handlerauth/handlers.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/handlerauth/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - JBossWSTestSetup testSetup = new JBossWSTestSetup(HandlerAuthTestCase.class, "jaxws-handlerauth.jar,jaxws-handlerauth2.jar,jaxws-handlerauth3.jar"); + JBossWSTestSetup testSetup = new JBossWSTestSetup(HandlerAuthTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); Map<String, String> authenticationOptions = new HashMap<String, String>(); authenticationOptions.put("usersProperties", getResourceFile("jaxws/handlerauth/jbossws-users.properties").getAbsolutePath()); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.handlerscope; +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; /** @@ -40,9 +45,34 @@ */ public class HandlerScopeTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-handlerscope.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.handlerscope.GeneralServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.InvalidPortServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.InvalidServiceServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.PortServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.PortWildcardServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.SOAP11ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.SOAP12ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.SOAPEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.SOAPEndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.SOAPServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.ServiceServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.handlerscope.ServiceWildcardServerHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/handlerscope/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(HandlerScopeTestCase.class, "jaxws-handlerscope.war"); + return new JBossWSTestSetup(HandlerScopeTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testClientAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,9 +21,12 @@ */ package org.jboss.test.ws.jaxws.jbws1178; +import java.io.File; import java.net.Inet6Address; import java.net.InetAddress; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.management.Attribute; @@ -37,6 +40,8 @@ import org.jboss.ws.common.ObjectNameFactory; 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,10 +53,21 @@ */ public class JBWS1178TestCaseForked extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1178.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1178.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1178/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - TestSetup testSetup = new JBossWSTestSetup(JBWS1178TestCaseForked.class, "jaxws-jbws1178.war") + TestSetup testSetup = new JBossWSTestSetup(JBWS1178TestCaseForked.class, JBossWSTestHelper.writeToFile(createDeployments())) { private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); private String webServiceHost; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,11 +21,18 @@ */ package org.jboss.test.ws.jaxws.jbws1190; +import java.io.File; +import java.util.LinkedList; +import java.util.List; + import javax.management.MBeanServerConnection; import javax.management.ObjectName; + 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 +46,24 @@ */ public class JBWS1190TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1190.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1190.ConfidentialEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1190.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1190.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1190.JBWS1190Exception.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1190/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(JBWS1190TestCase.class, "jaxws-jbws1190.war"); + return new JBossWSTestSetup(JBWS1190TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEndpointAddress() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -24,6 +24,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; @@ -39,6 +40,8 @@ import org.jboss.ws.api.handler.GenericSOAPHandler; 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 +52,25 @@ private final String targetNS = "http://org.jboss.test.ws/jbws1283"; private JBWS1283Endpoint port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1283.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1283.AttachmentHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws1283.JBWS1283Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1283.JBWS1283EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1283.JBWS1283TestCase.VerifyAttachmentHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws1283.JBWS1283TestCase.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar"); + return new JBossWSTestSetup(JBWS1283TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws1357; +import java.io.File; 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 +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,23 @@ private String targetNS = "http://jbws1357.jaxws.ws.test.jboss.org/"; private JBWS1357 proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1357.war") { { + archive + .addManifest() + .addAsWebResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1357/hello.jsp")) + .addClass(org.jboss.test.ws.jaxws.jbws1357.JBWS1357.class) + .addClass(org.jboss.test.ws.jaxws.jbws1357.JBWS1357Impl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1357/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1357TestCase.class, "jaxws-jbws1357.war"); + return new JBossWSTestSetup(JBWS1357TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,13 +22,18 @@ package org.jboss.test.ws.jaxws.jbws1446; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -41,9 +46,21 @@ */ public class JBWS1446TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1446.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws1446.EJB3Bean.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar"); + return new JBossWSTestSetup(JBWS1446TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testObjectAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -23,6 +23,8 @@ 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; @@ -33,6 +35,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,11 +48,25 @@ */ public class JBWS1529TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1529.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1529.JBWS1529.class) + .addClass(org.jboss.test.ws.jaxws.jbws1529.JBWS1529Impl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1529.UserException.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1529/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + private JBWS1529 proxy; public static Test suite() { - return new JBossWSTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); + return new JBossWSTestSetup(JBWS1529TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.jbws1582; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -29,6 +30,8 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -37,6 +40,8 @@ import org.jboss.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; /** @@ -46,6 +51,33 @@ */ public class JBWS1582TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1582-attacked.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1582.AttackedEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws1582.Endpoint.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl"), "wsdl/attack-service.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1582/WEB-INF/attack-web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1582.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1582.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1582.EndpointImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl"), "wsdl/service.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1582/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + static { + JBossWSTestHelper.writeToFile(createDeployments()); + } + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jbws1582/TestService"; private String targetNS = "http://jbws1582.jaxws.ws.test.jboss.org/"; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws1611; +import java.io.File; import java.io.StringReader; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.transform.Source; @@ -36,6 +39,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; @@ -51,9 +56,21 @@ { private static final String targetNS = "http://jbws1611.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1611.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1611.PingEndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1611/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1611TestCase.class, "jaxws-jbws1611.war"); + return new JBossWSTestSetup(JBWS1611TestCase.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/jbws1666/JBWS1666TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -25,13 +25,17 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.util.LinkedList; +import java.util.List; import javax.xml.ws.spi.Provider; import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -48,6 +52,40 @@ java.util.Properties props = System.getProperties(); + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1666.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1666/WEB-INF/web.xml")); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1666-client.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Main-Class: org.jboss.test.ws.jaxws.jbws1666.TestClient\n" + + "Dependencies: javax.jws.api,javax.xml.ws.api\n")) + .addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class) + .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1666-b-client.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Main-Class: org.jboss.test.ws.jaxws.jbws1666.TestClient\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class) + .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + static { + JBossWSTestHelper.writeToFile(createDeployments()); + } + public static Test suite() { return new JBossWSTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1694; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Holder; @@ -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; /** @@ -37,9 +41,26 @@ */ public class JBWS1694TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1694.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1694.Basket.class) + .addClass(org.jboss.test.ws.jaxws.jbws1694.BasketEntries.class) + .addClass(org.jboss.test.ws.jaxws.jbws1694.Header.class) + .addClass(org.jboss.test.ws.jaxws.jbws1694.JBWS1694Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1694.JBWS1694EndpointSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1694.JBWS1694TestCase.class) + .addClass(org.jboss.test.ws.jaxws.jbws1694.Receipt.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1694TestCase.class, "jaxws-jbws1694.jar"); + return new JBossWSTestSetup(JBWS1694TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testInheritanceRpc() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,12 @@ */ package org.jboss.test.ws.jaxws.jbws1702; +import static org.jboss.wsf.test.JBossWSTestHelper.getTestResourcesDir; + +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; @@ -34,6 +39,8 @@ import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC; 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 +50,33 @@ */ public class JBWS1702TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1702.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1702.JBWS1702TestCase.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSBareSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSRpcSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithDocument_Bare.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithDocument_Wrapped.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWithRPC_Bare.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.SampleWSWrappedSEI.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassA.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassB.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ClassC.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB.class) + .addClass(org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC.class) + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws1702/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1702/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1702TestCase.class, "jaxws-jbws1702.war"); + return new JBossWSTestSetup(JBWS1702TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testInheritanceRpc() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws1807; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.transform.Source; @@ -35,6 +38,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; @@ -50,9 +55,23 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1807"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1807.war") { { + archive + .addManifest() + .addClass(org.jboss.test.helper.DOMWriter.class) + .addClass(org.jboss.test.ws.jaxws.jbws1807.ProviderImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1807/WEB-INF/wsdl/provider.wsdl"), "wsdl/provider.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1807/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1807TestCase.class, "jaxws-jbws1807.war"); + return new JBossWSTestSetup(JBWS1807TestCase.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/jbws1809/JBWS1809TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,13 +21,18 @@ */ package org.jboss.test.ws.jaxws.jbws1809; +import java.io.File; import java.net.URL; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; 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; @@ -42,9 +47,24 @@ */ public class JBWS1809TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1809.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1809.DocRequest.class) + .addClass(org.jboss.test.ws.jaxws.jbws1809.DocResponse.class) + .addClass(org.jboss.test.ws.jaxws.jbws1809.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1809.EndpointImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1809/META-INF/jaxb-intros.xml"), "jaxb-intros.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1809TestCase.class, "jaxws-jbws1809.jar"); + return new JBossWSTestSetup(JBWS1809TestCase.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/jbws1843/JBWS1843TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,9 @@ */ package org.jboss.test.ws.jaxws.jbws1843; +import java.io.File; import java.net.URL; +import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; @@ -30,9 +32,11 @@ import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; import org.jboss.test.ws.jaxws.jbws1843.generated.Service; -import org.jboss.test.ws.jaxws.jbws1843.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; /** @@ -48,9 +52,25 @@ private String targetNS = "http://jbws1843.jaxws.ws.test.jboss.org/"; private Service proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1843.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1843.ServiceImpl.class) + .addPackage("org.jboss.test.ws.jaxws.jbws1843.generated") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd"), "wsdl/BaseComponents.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd"), "wsdl/CoreComponentTypes.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1843/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1843TestCase.class, "jaxws-jbws1843.war"); + return new JBossWSTestSetup(JBWS1843TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1845; 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; /** @@ -40,9 +44,22 @@ */ public final class JBWS1845TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1845.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1845.SpamComplaintWS.class) + .addClass(org.jboss.test.ws.jaxws.jbws1845.SpamComplaintWSIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1845.SpamResult.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1845TestCase.class, "jaxws-jbws1845.jar"); + return new JBossWSTestSetup(JBWS1845TestCase.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/jbws1872/JBWS1872TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1872; 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,9 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.JarDeployment; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -38,9 +43,24 @@ */ public class JBWS1872TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JarDeployment("jaxws-jbws1872.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1872.EJB3Bean1.class) + .addClass(org.jboss.test.ws.jaxws.jbws1872.EJB3Bean2.class) + .addClass(org.jboss.test.ws.jaxws.jbws1872.EJB3Bean3.class) + .addClass(org.jboss.test.ws.jaxws.jbws1872.LocalIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws1872.RemoteIface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1872TestCase.class, "jaxws-jbws1872.jar"); + return new JBossWSTestSetup(JBWS1872TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testEJB1() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws1969; +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,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; /** @@ -39,9 +44,23 @@ */ public class JBWS1969TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1969.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1969.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws1969.EndpointImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl"), "wsdl/echo/TestService.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd"), "wsdl/echo/TestService.xsd"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS1969TestCase.class, "jaxws-jbws1969.jar"); + return new JBossWSTestSetup(JBWS1969TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testSubDirectory() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,9 @@ */ package org.jboss.test.ws.jaxws.jbws2009; +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.jbws2009.generated.CountryCodeType; import org.jboss.test.ws.jaxws.jbws2009.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws2009.generated.GetCountryCodesResponse.Response; import org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType; -import org.jboss.test.ws.jaxws.jbws2009.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://jbws2009.jaxws.ws.test.jboss.org/"; private ServiceType proxy; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2009.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2009.ServiceImpl.class) + .addPackage("org.jboss.test.ws.jaxws.jbws2009.generated") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd"), "wsdl/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"), "wsdl/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2009/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2009TestCase.class, "jaxws-jbws2009.war"); + return new JBossWSTestSetup(JBWS2009TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2183/JBWS2183TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -23,6 +23,7 @@ import java.net.URL; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import javax.wsdl.Binding; @@ -35,7 +36,10 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -44,9 +48,22 @@ */ public class JBWS2183TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2183.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2183.TestService.class) + .addClass(org.jboss.test.ws.jaxws.jbws2183.TestServiceImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2183TestCase.class, "jaxws-jbws2183.jar"); + return new JBossWSTestSetup(JBWS2183TestCase.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/jbws2257/AddressingTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2257; +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,9 +44,26 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-jbws2257/AddressingService/ServiceImpl"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2257.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2257.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2257.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2257.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2257.jaxws.SayHelloResponse.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2257/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2257/META-INF/wsdl/AddressingService.wsdl"), "wsdl/AddressingService.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2257/META-INF/wsdl/AddressingService_schema1.xsd"), "wsdl/AddressingService_schema1.xsd"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-jbws2257.jar"); + return new JBossWSTestSetup(AddressingTestCase.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/jbws2259/JBWS2259TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -23,6 +23,8 @@ import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -35,6 +37,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; /** @@ -46,10 +50,26 @@ */ public class JBWS2259TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2259.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2259.CustomHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2259.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2259.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2259.Photo.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2259/META-INF/permissions.xml"), "permissions.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2259/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); + return new JBossWSTestSetup(JBWS2259TestCase.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/jbws2268/JBWS2268TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -25,6 +25,8 @@ import java.io.File; import java.io.FileInputStream; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -33,6 +35,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; /** @@ -41,6 +45,23 @@ */ public final class JBWS2268TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2268.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2268.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2268.EndpointInterface.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2268/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2268/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + static { + JBossWSTestHelper.writeToFile(createDeployments()); + } public static Test suite() { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,12 +21,20 @@ */ package org.jboss.test.ws.jaxws.jbws2307; +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -36,13 +44,49 @@ */ public class JBWS2307MTOMTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-service.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2307-client.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); + return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true); } public void testMTOM() throws Exception { assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); } + + public void testClient() throws Exception + { + HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection(); + BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); + assertEquals("true", isr.readLine()); + } } Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws2307; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * JBWS-2307 testcase - * - * @author alessio.soldano(a)jboss.com - */ -public class JBWS2307TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); - } - - public void testClient() throws Exception - { - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); - } -} Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,11 +22,13 @@ package org.jboss.test.ws.jaxws.jbws2419; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import javax.activation.DataHandler; @@ -39,6 +41,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; /** @@ -51,9 +55,29 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2419"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2419.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP11Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP11EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP11ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP12Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP12EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws2419.SOAP12ServerHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl"), "wsdl/SOAP12Service.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2419/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2419TestCase.class, "jaxws-jbws2419.war"); + return new JBossWSTestSetup(JBWS2419TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testSOAP12ClientAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,12 +21,17 @@ */ package org.jboss.test.ws.jaxws.jbws2527; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -36,6 +41,39 @@ */ public class JBWS2527TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2527-service.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2527.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2527-client.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2527.ClientServlet.class) + .addClass(org.jboss.test.ws.jaxws.jbws2527.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + static { + JBossWSTestHelper.writeToFile(createDeployments()); + } + public static Test suite() { return new JBossWSTestSetup(JBWS2527TestCase.class, "", true); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2634; +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.jbws2634.webservice.EndpointIface; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,6 +42,46 @@ */ public final class JBWS2634TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2634-pojo.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.POJOBean.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/WEB-INF/web.xml")); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2634.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.BeanIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.BeanImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.shared.handlers.TestHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.AbstractEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EndpointIface.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2634-ejb3.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.jbws2634.webservice.EJB3Bean.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/ejb-jar.xml"), "ejb-jar.xml"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2634.ear") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2634/META-INF/application.xml"), "application.xml") + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2634-pojo.war")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2634-ejb3.jar")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2634.jar")); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS2634TestCase.class, "jaxws-jbws2634.ear"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,13 +22,18 @@ package org.jboss.test.ws.jaxws.jbws2717; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.InputStream; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -38,10 +43,21 @@ */ public class JBWS2717TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2717.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2717.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2717/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(JBWS2717TestCase.class, "jaxws-jbws2717.war"); + return new JBossWSTestSetup(JBWS2717TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testXmlDeclarationInWSDL() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,8 +21,13 @@ */ package org.jboss.test.ws.jaxws.jbws2934; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -34,9 +39,22 @@ { private final String ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2934-ejb"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2934-ejb.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2934.AbstractEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2934.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2934.EndpointEJB.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2934EJBTestCase.class, "jaxws-jbws2934-ejb.jar"); + return new JBossWSTestSetup(JBWS2934EJBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,8 +21,14 @@ */ package org.jboss.test.ws.jaxws.jbws2934; +import java.io.File; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -34,9 +40,23 @@ { private final String ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2934-jse"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2934-jse.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2934.AbstractEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2934.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2934.EndpointJSE.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2934/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2934JSETestCase.class, "jaxws-jbws2934-jse.war"); + return new JBossWSTestSetup(JBWS2934JSETestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -23,6 +23,8 @@ import java.io.StringReader; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -34,15 +36,19 @@ 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.WebServiceFeature; -import javax.xml.ws.Service.Mode; import javax.xml.ws.soap.AddressingFeature; import junit.framework.Test; import org.jboss.logging.Logger; +import org.jboss.shrinkwrap.api.ArchivePath; +import org.jboss.shrinkwrap.api.Filter; 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.Node; @@ -71,9 +77,33 @@ private EndpointReference epr; private UserType user; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2937-client.jar") { { + archive + .addManifest() + .addPackages(false, new Filter<ArchivePath>() { + @Override + public boolean include(ArchivePath path) + { + return !path.get().contains("TestCase"); + } + }, "org.jboss.test.ws.jaxws.jbws2937"); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2937.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2937.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2937.UserType.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS2937TestCase.class, "jaxws-jbws2937.jar, jaxws-jbws2937-client.jar"); + return new JBossWSTestSetup(JBWS2937TestCase.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/jbws2956/JBWS2956TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2956/JBWS2956TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,21 +21,39 @@ */ package org.jboss.test.ws.jaxws.jbws2956; +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 JBWS2956TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2956"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2956.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2956.OnewayEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws2956.OnewayEndpointImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2956/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2956/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2956TestCase.class, "jaxws-jbws2956.war"); + return new JBossWSTestSetup(JBWS2956TestCase.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/jbws2957/JBWS2957TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws2957; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -28,11 +29,11 @@ import junit.framework.Test; +import org.jboss.test.ws.jaxws.jbws2957.common.HelloIface; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.test.ws.jaxws.jbws2957.common.HelloIface; - /** * [JBWS-2957] Tests EJB3 service in web inf lib directory. * @@ -40,6 +41,28 @@ */ public class JBWS2957TestCase extends JBossWSTest { + static { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2957-ejbinwarwebinflib_ejb.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2957.common.HelloIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws2957.common.HelloImpl.class); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws2957-ejbinwarwebinflib_web.war") { { + archive + .addManifest() + .addAsLibrary(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2957-ejbinwarwebinflib_ejb.jar")) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2957/WEB-INF/ejb-jar.xml"), "ejb-jar.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws2957-ejbinwarwebinflib.ear") { { + archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2957-ejbinwarwebinflib_web.war")); + } + }); + } + public static Test suite() { return new JBossWSTestSetup(JBWS2957TestCase.class, "jaxws-jbws2957-ejbinwarwebinflib.ear"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws2999; +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,9 +44,25 @@ */ public class JBWS2999TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws2999.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2999.CustomHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws2999.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2999.HelloBean.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2999/META-INF/ejb-jar.xml"), "ejb-jar.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2999/META-INF/webservices.xml"), "webservices.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2999/META-INF/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2999TestCase.class, "jaxws-jbws2999.jar"); + return new JBossWSTestSetup(JBWS2999TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } private Hello getPort() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3034/JBWS3034TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3034; +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,16 +32,33 @@ 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 JBWS3034TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3034.war") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3034/handlers.xml"), "handlers.xml") + .addClass(org.jboss.test.ws.jaxws.jbws3034.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3034.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3034.ServerSOAPHandler.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3034/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3034/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3034"; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS3034TestCase.class, "jaxws-jbws3034.war"); + return new JBossWSTestSetup(JBWS3034TestCase.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/jbws3114/JBWS3114TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3114/JBWS3114TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,13 +21,18 @@ */ package org.jboss.test.ws.jaxws.jbws3114; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.ws.BindingProvider; 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; /** * https://jira.jboss.org/browse/JBWS-3114 @@ -35,12 +40,25 @@ */ public class JBWS3114TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3114.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3114.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3114.EndpointImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3114/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3114/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3114"; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS3114TestCase.class, "jaxws-jbws3114.war"); + return new JBossWSTestSetup(JBWS3114TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testConfigureTimeout() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,16 +21,91 @@ */ package org.jboss.test.ws.jaxws.jbws3140; +import static org.jboss.wsf.test.JBossWSTestHelper.getTestResourcesDir; + +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.WarDeployment; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; public class JBWS3140TestCase extends JBossWSTest { public final String servletClientURL = "http://" + getServerHost() + ":8080/jbws3140-client/ServletTest"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new WarDeployment("jbws3140-server.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.DataType.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTest.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTestImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ObjectFactory.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ResponseType.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ServerHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3140/client-handlers.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws3140/server-handlers.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Server/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Server/web.xml"), "web.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Server/webservices.xml"), "webservices.xml") + .setWebXML(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Server/web.xml")); + } + }); + list.add(new WarDeployment("jbws3140-responses-server.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.DataType.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTest.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTestImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ObjectFactory.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ResponseType.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ServerHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3140/client-handlers.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws3140/server-handlers.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/wsdl/TestEndpoint.wsdl"), "wsdl/TestEndpoint.wsdl") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Responses-Server/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Responses-Server/web.xml"), "web.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Responses-Server/webservices.xml"), "webservices.xml") + .setWebXML(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Server/web.xml")); + } + }); + list.add(new WarDeployment("jbws3140-client.war") { { + archive + .addManifest() + .addAsResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/large.jpg")) + .addAsResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/small.jpg")) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ClientHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.DataType.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTest.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.MTOMTestImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ObjectFactory.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ResponseType.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3140.ServletTestClient.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3140/client-handlers.xml") + .addAsResource("org/jboss/test/ws/jaxws/jbws3140/server-handlers.xml") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/wsdl/TestEndpoint.wsdl"), "wsdl/TestEndpoint.wsdl") + .addAsWebInfResource(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Client/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(getTestResourcesDir() + "/jaxws/jbws3140/WEB-INF-Client/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + + static { + JBossWSTestHelper.writeToFile(createDeployments()); + } + public void testWsaResponses() throws Exception { try { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase1TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.jbws3276; +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; /** @@ -39,10 +44,23 @@ */ public class Usecase1TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3276-usecase1.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3276.AnonymousPOJO.class) + .addClass(org.jboss.test.ws.jaxws.jbws3276.POJOIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws3276.POJOImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3276/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(Usecase1TestCase.class, "jaxws-jbws3276-usecase1.war"); + return new JBossWSTestSetup(Usecase1TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testAnonymousEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3276/Usecase2TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -23,6 +23,8 @@ package org.jboss.test.ws.jaxws.jbws3276; 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 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,21 @@ */ public class Usecase2TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3276-usecase2.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3276.AnonymousPOJO.class) + .addClass(org.jboss.test.ws.jaxws.jbws3276.POJOIface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(Usecase2TestCase.class, "jaxws-jbws3276-usecase2.war"); + return new JBossWSTestSetup(Usecase2TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testAnonymousEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3282; +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; /** @@ -43,9 +48,28 @@ { private static final String targetNS = "http://jbws3282.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3282.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3282.AuthorizationHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3282.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3282.EndpointHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3282.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3282.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3282.RoutingHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3282/jaxws-handlers-server.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3282/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3282/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(HandlerChainTestCase.class, "jaxws-jbws3282.war"); + return new JBossWSTestSetup(HandlerChainTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testHandlerChain() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3287; +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; /** @@ -43,9 +48,57 @@ { private static final String targetNS = "http://jbws3287.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws3287-C.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.EJB3EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.EndpointHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.RoutingHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/META-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/META-INF/jboss-webservices.xml"), "jboss-webservices.xml"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3287-B.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.EndpointHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.RoutingHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/web-B.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3287-A.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.EndpointHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.jbws3287.RoutingHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/jboss-webservices.xml"), "jboss-webservices.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3287/WEB-INF/web-A.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3287TestCase.class, "jaxws-jbws3287-A.war, jaxws-jbws3287-B.war, jaxws-jbws3287-C.jar"); + return new JBossWSTestSetup(JBWS3287TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testJBossWebservicesXmlDD() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,9 +21,11 @@ */ package org.jboss.test.ws.jaxws.jbws3293; +import java.io.File; import java.io.IOException; import java.io.StringReader; import java.net.MalformedURLException; +import java.util.LinkedList; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -43,6 +45,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; @@ -58,9 +62,22 @@ private Exception handlerException; private boolean asyncHandlerCalled; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3293.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3293.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.jbws3293.EndpointBean.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3293/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3293DispatchTestCase.class, "jaxws-jbws3293.war"); + return new JBossWSTestSetup(JBWS3293DispatchTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testInvokeAsynch() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3441/JBWS3441TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3441/JBWS3441TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3441/JBWS3441TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws3441; +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,28 @@ */ public class JBWS3441TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3441.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3441.EJB3EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3441.EJBInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.jbws3441.EJBInterceptorImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3441.EndpointIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws3441.POJOEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3441.POJOInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.jbws3441.POJOInterceptorImpl.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3441/META-INF/permissions.xml"), "permissions.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws3441/WEB-INF/beans.xml"), "beans.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS3441TestCase.class, "jaxws-jbws3441.war"); + return new JBossWSTestSetup(JBWS3441TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } private EndpointIface getPojo() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,12 +21,19 @@ */ package org.jboss.test.ws.jaxws.jbws3477; +import static org.jboss.wsf.test.JBossWSTestHelper.getTestResourcesDir; + +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,9 +46,30 @@ { private String defaultProvider; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3477-custom-provider.war") { { + archive + .addManifest() + .addAsManifestResource(new File(getTestResourcesDir() + "/jaxws/jbws3477/META-INF/services/javax.xml.ws.spi.Provider"), "services/javax.xml.ws.spi.Provider") + .addClass(org.jboss.test.ws.jaxws.jbws3477.DummyProvider.class) + .addClass(org.jboss.test.ws.jaxws.jbws3477.Helper.class) + .addClass(org.jboss.test.ws.jaxws.jbws3477.TestServlet.class); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3477.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3477.Helper.class) + .addClass(org.jboss.test.ws.jaxws.jbws3477.TestServlet.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JaxWsSpiProviderTestCase.class, "jaxws-jbws3477-custom-provider.war,jaxws-jbws3477.war"); + return new JBossWSTestSetup(JaxWsSpiProviderTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } protected void setUp() { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,13 +22,19 @@ package org.jboss.test.ws.jaxws.jbws3552; 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.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; /** @@ -44,8 +50,25 @@ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a> */ public class JBWS3552TestCase extends JBossWSTest { + + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3552.war") { { + archive + .addManifest() + .addPackages(false, new Filter<ArchivePath>() { + @Override + public boolean include(ArchivePath path) + { + return !path.get().contains("TestCase"); + }}, "org.jboss.test.ws.jaxws.jbws3552"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3552TestCase.class, "jaxws-jbws3552.war"); + return new JBossWSTestSetup(JBWS3552TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } private EndpointIface getProxy() throws Exception { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3556/JBWS3556TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3556/JBWS3556TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3556/JBWS3556TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws3556; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -29,14 +31,30 @@ 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; /** * @author <a href="ropalka(a)redhat.com">Richard Opalka</a> */ public class JBWS3556TestCase extends JBossWSTest { + + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws3556.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws3556.EndpointIface.class) + .addClass(org.jboss.test.ws.jaxws.jbws3556.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws3556.MyException.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3556TestCase.class, "jaxws-jbws3556.war"); + return new JBossWSTestSetup(JBWS3556TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } private EndpointIface getProxy() throws Exception { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.jbws860; +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; @@ -31,6 +34,9 @@ import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.WarDeployment; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -41,9 +47,23 @@ */ public class JBWS860TestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new WarDeployment("jaxws-jbws860.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws860.InventoryWebService.class) + .addClass(org.jboss.test.ws.jaxws.jbws860.UserServlet.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws860/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws860/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS860TestCase.class, "jaxws-jbws860.war"); + return new JBossWSTestSetup(JBWS860TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testAccessInventoryServiceWsdl() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -22,6 +22,8 @@ package org.jboss.test.ws.jaxws.jbws944; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; @@ -34,6 +36,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; /** @@ -49,9 +53,23 @@ { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws944/FooBean01"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws944.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws944.EJB3Bean01.class) + .addClass(org.jboss.test.ws.jaxws.jbws944.EJB3RemoteBusinessInterface.class) + .addClass(org.jboss.test.ws.jaxws.jbws944.EJB3RemoteHome.class) + .addClass(org.jboss.test.ws.jaxws.jbws944.EJB3RemoteInterface.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JBWS944TestCase.class, "jaxws-jbws944.jar"); + return new JBossWSTestSetup(JBWS944TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testRemoteAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.namespace; +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,9 +44,26 @@ */ public class MultipleNamespacesTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-namespace.war") { { + archive + .addManifest() + .addClass(org.jboss.test.helper.DOMWriter.class) + .addClass(org.jboss.test.ws.jaxws.namespace.CustomHandler.class) + .addClass(org.jboss.test.ws.jaxws.namespace.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.namespace.EndpointInterface.class) + .addAsResource("org/jboss/test/ws/jaxws/namespace/handler-chain.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/namespace/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/namespace/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(MultipleNamespacesTestCase.class, "jaxws-namespace.war"); + return new JBossWSTestSetup(MultipleNamespacesTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } /** Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2014-06-19 08:43:26 UTC (rev 18748) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2014-06-19 17:14:09 UTC (rev 18749) @@ -27,6 +27,8 @@ import java.net.URL; import java.util.Arrays; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.soap.AttachmentPart; @@ -41,6 +43,8 @@ import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestHelper.WarDeployment; import org.jboss.wsf.test.JBossWSTestSetup; @@ -52,23 +56,25 @@ */ public class JBWS3084TestCase extends JBossWSTest { - private static WarDeployment createWarDeployment(String name) { - return new WarDeployment(name) { { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new WarDeployment("saaj-soap-connection.war") { { archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) - .addClass(ServiceIface.class) - .addClass(ServiceImpl.class) - .addClass(InputStreamDataSource.class) - .addAsWebInfResource(new File(getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl"), "wsdl/SaajService.wsdl") - .setWebXML(new File(getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/web.xml")); + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(ServiceIface.class) + .addClass(ServiceImpl.class) + .addClass(InputStreamDataSource.class) + .addAsWebInfResource(new File(getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl"), "wsdl/SaajService.wsdl") + .setWebXML(new File(getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/web.xml")); } - }; + }); + return list.toArray(new BaseDeployment<?>[list.size()]); } public static Test suite() { - return new JBossWSTestSetup(JBWS3084TestCase.class, createWarDeployment("saaj-soap-connection.war").writeToFile().getName()); + return new JBossWSTestSetup(JBWS3084TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testSoapConnectionPostWithoutChunkedEncoding() throws Exception

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18748 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-06-19 04:43:26 -0400 (Thu, 19 Jun 2014) New Revision: 18748 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java Log: [JBWS-3800]:Only check existence of endpoint config in standalone.xml when it is specified in annotaion or decriptor Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-06-18 23:47:01 UTC (rev 18747) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-06-19 08:43:26 UTC (rev 18748) @@ -124,6 +124,7 @@ // 1) default values String configName = org.jboss.wsf.spi.metadata.config.EndpointConfig.STANDARD_ENDPOINT_CONFIG; String configFile = null; + boolean specifiedConfig = false; // 2) annotation contribution EndpointConfig epConfigAnn = implementor.getClass().getAnnotation(EndpointConfig.class); if (epConfigAnn != null) @@ -136,11 +137,13 @@ { configFile = epConfigAnn.configFile(); } + specifiedConfig = true; } // 3) descriptor overrides (jboss-webservices.xml or web.xml) if (epConfigName != null && !epConfigName.isEmpty()) { configName = epConfigName; + specifiedConfig = true; } if (epConfigFile != null && !epConfigFile.isEmpty()) { @@ -154,6 +157,9 @@ org.jboss.wsf.spi.metadata.config.EndpointConfig config = sc.getEndpointConfig(configName); if (config != null) { endpoint.setEndpointConfig(config); + } + if (config == null && specifiedConfig) { + throw Messages.MESSAGES.couldNotFindEndpointConfigName(configName); } } else

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18747 - stack/cxf/trunk/modules/client.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-06-18 19:47:01 -0400 (Wed, 18 Jun 2014) New Revision: 18747 Modified: stack/cxf/trunk/modules/client/pom.xml Log: [JBWS-3799]:Remove transitive dependency Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2014-06-18 23:34:52 UTC (rev 18746) +++ stack/cxf/trunk/modules/client/pom.xml 2014-06-18 23:47:01 UTC (rev 18747) @@ -233,7 +233,17 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> + </dependency>  <dependency>

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18746 - common/trunk/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-06-18 19:34:52 -0400 (Wed, 18 Jun 2014) New Revision: 18746 Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java Log: [JBWS-3733]:Temporarily restore EndpointMetricsDeploymentAspect to fix AS8.x build; Look at if we need to move this DA function in EndpointService later Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java 2014-06-18 23:34:52 UTC (rev 18746) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 021101301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.common.deployment; + +import org.jboss.ws.common.configuration.ConfigHelper; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointMetrics; +import org.jboss.wsf.spi.management.EndpointMetricsFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.config.EndpointConfig; + +/** + * A deployer that assigns the metrics to the Endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 20Jun2007 + */ +public class EndpointMetricsDeploymentAspect extends AbstractDeploymentAspect +{ + @Override + public void start(Deployment dep) + { + EndpointMetricsFactory factory = SPIProvider.getInstance().getSPI(EndpointMetricsFactory.class); + ServerConfigFactory scf = SPIProvider.getInstance().getSPI(ServerConfigFactory.class); + EndpointConfig defaultConfig = scf.getServerConfig().getEndpointConfig(EndpointConfig.STANDARD_ENDPOINT_CONFIG); + boolean enabled = Boolean.valueOf(defaultConfig.getProperty(EndpointConfig.STATISTICS_ENABLED)); + if (enabled) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + + EndpointMetrics metrics = factory.newEndpointMetrics(); + ep.setEndpointMetrics(metrics); + } + } + } +} Property changes on: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18745 - projects/shrinkwrapConverter/src/main/java/processor.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-06-18 11:15:40 -0400 (Wed, 18 Jun 2014) New Revision: 18745 Modified: projects/shrinkwrapConverter/src/main/java/processor/CodeBlockGenerator.java Log: Fix a couple of bugs Modified: projects/shrinkwrapConverter/src/main/java/processor/CodeBlockGenerator.java =================================================================== --- projects/shrinkwrapConverter/src/main/java/processor/CodeBlockGenerator.java 2014-06-18 10:09:08 UTC (rev 18744) +++ projects/shrinkwrapConverter/src/main/java/processor/CodeBlockGenerator.java 2014-06-18 15:15:40 UTC (rev 18745) @@ -61,14 +61,22 @@ if (archive instanceof JarDeclaration) { JarDeclaration jar = (JarDeclaration)archive; for (String clazz : getClassesFromFilesetsOrClasses(jar.getFilesets())) { - sb.append(" .addClass("); - sb.append(clazz); - sb.append(")\n"); + if (clazz.endsWith(".class")) { + sb.append(" .addClass("); + sb.append(clazz); + sb.append(")\n"); + } else { + sb.append(" .addAsResource(\""); + sb.append(clazz); + sb.append("\")\n"); + } } for (Entry<String, List<String>> entry : resolveWebOrMetaInfRes(jar.getMetaInfItems()).entrySet()) { for (String file : entry.getValue()) { sb.append(" .addAsManifestResource(new File(getTestResourcesDir() + \""); sb.append(entry.getKey()); + sb.append(File.separator); + sb.append(file); sb.append("\"), \""); sb.append(file); sb.append("\")\n"); @@ -77,15 +85,23 @@ } else if (archive instanceof WarDeclaration) { WarDeclaration war = (WarDeclaration)archive; for (String clazz : getClassesFromFilesetsOrClasses(war.getClasses())) { - sb.append(" .addClass("); - sb.append(clazz); - sb.append(")\n"); + if (clazz.endsWith(".class")) { + sb.append(" .addClass("); + sb.append(clazz); + sb.append(")\n"); + } else { + sb.append(" .addAsResource(\""); + sb.append(clazz); + sb.append("\")\n"); + } } for (Entry<String, List<String>> entry : resolveZipFileset(war).entrySet()) { String dir = entry.getKey(); for (String file : entry.getValue()) { sb.append(" .addAsManifestResource(new File(getTestResourcesDir() + \""); sb.append(dir); + sb.append(File.separator); + sb.append(file); sb.append("\"), \""); sb.append(file); sb.append("\")\n"); @@ -95,6 +111,8 @@ for (String file : entry.getValue()) { sb.append(" .addAsWebInfResource(new File(getTestResourcesDir() + \""); sb.append(entry.getKey()); + sb.append(File.separator); + sb.append(file); sb.append("\"), \""); sb.append(file); sb.append("\")\n"); @@ -103,9 +121,11 @@ if (war.getWebXmlFile() != null) { sb.append(" .setWebXML(new File(getTestResourcesDir() + \""); sb.append(getTestResourcesDirChild(war.getWebXmlFile())); - sb.append("\"));\n"); + sb.append("\"))\n"); } } + sb.deleteCharAt(sb.length() - 1); + sb.append(";\n"); sb.append(" }\n"); sb.append(" });\n"); @@ -150,7 +170,11 @@ String[] files = scanner.getIncludedFiles(); for (String f : files) { // result.add(convertFullPathToClassName(dir, f)); - result.add(f.replace(File.separatorChar, '.')); + if (f.endsWith(".class")) { + result.add(f.replace(File.separatorChar, '.')); + } else { + result.add(f); + } } } return result;

10 years, 6 months

1
0
0 / 0

JBossWS SVN: r18744 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2014-06-18 06:09:08 -0400 (Wed, 18 Jun 2014) New Revision: 18744 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java Log: [JBWS-3800]:Make endpoint config optional Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-06-18 06:07:36 UTC (rev 18743) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-06-18 10:09:08 UTC (rev 18744) @@ -154,8 +154,6 @@ org.jboss.wsf.spi.metadata.config.EndpointConfig config = sc.getEndpointConfig(configName); if (config != null) { endpoint.setEndpointConfig(config); - } else { - throw Messages.MESSAGES.couldNotFindEndpointConfigName(configName); } } else

10 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2014