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>
- <!-- jaxws-anonymous -->
- <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>
-
<!-- jaxws-benchmark-basic -->
<jar
jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basic.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -106,16 +96,6 @@
</fileset>
</jar>
- <!-- jaxws-binding -->
- <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>
-
<!-- jaxws-calendar -->
<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>
- <!-- jaxws-clientConfig -->
- <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>
-
- <!-- jaxws-clientConfig-inContainer-client -->
- <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>
-
- <!-- jaxws-clientConfig-client -->
- <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>
-
<!-- jaxws-complex -->
<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>
- <!-- jaxws-enventry -->
- <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>
-
- <!-- jaxws-handlerauth -->
- <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>
-
- <!-- jaxws-handlerauth2 -->
- <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>
-
- <!-- jaxws-handlerauth3 -->
- <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>
-
- <!-- jaxws-handlerscope -->
- <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>
-
<!-- jaxws-holder -->
<war warfile="${tests.output.dir}/test-libs/jaxws-holder.war"
webxml="${tests.output.dir}/test-resources/jaxws/holder/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -260,27 +148,6 @@
</classes>
</war>
- <!-- jaxws-jbws860 -->
- <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>
-
- <!-- jaxws-jbws944 -->
- <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>
-
<!-- jaxws-jbws981 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws981.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -290,41 +157,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1178 -->
- <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>
-
- <!-- jaxws-jbws1190 -->
- <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>
-
- <!-- jaxws-jbws1283 -->
- <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>
-
- <!-- jaxws-jbws1357 -->
- <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>
-
<!-- jaxws-jbws1422 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1422.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -333,13 +165,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1446 -->
- <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>
-
<!-- jaxws-jbws1505 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1505.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -348,15 +173,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1529 -->
- <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>
-
<!-- jaxws-jbws1556 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -409,33 +225,6 @@
</metainf>
</jar>
- <!-- jaxws-jbws1582 -->
- <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>
-
- <!-- jaxws-jbws1611 -->
- <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>
-
<!-- jaxws-jbws1665 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1665.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -443,41 +232,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1666 -->
- <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>
-
-
- <!-- jaxws-jbws1694 -->
- <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>
-
- <!-- jaxws-jbws1702 -->
- <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>
-
<!-- jaxws-jbws1733 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws1733.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws1733/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -505,26 +259,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1807 -->
- <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>
-
- <!-- jaxws-jbws1809 -->
- <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>
-
<!-- jaxws-jbws1813 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.jar"
manifest="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF/MANIFEST.MF">
<fileset dir="${tests.output.dir}/test-classes">
@@ -603,34 +337,6 @@
</metainf>
</jar>
- <!-- jaxws-jbws1843 -->
- <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>
-
- <!-- jaxws-jbws1845 -->
- <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>
-
- <!-- jaxws-jbws1872 -->
- <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>
-
<!-- jaxws-jbws1904 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1904.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -639,17 +345,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1969 -->
- <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>
-
<!-- jaxws-jbws2000 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2000.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -661,18 +356,6 @@
</metainf>
</jar>
- <!-- jaxws-jbws2009 -->
- <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>
-
<!-- jaxws-jbws2074 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2074-usecase1.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase1/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -783,14 +466,6 @@
</classes>
</war>
- <!-- jaxws-jbws2183 -->
- <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>
-
<!-- jaxws-jbws2218 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2218.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -825,45 +500,6 @@
</webinf>
</war>
- <!-- jbws2257 -->
- <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>
-
- <!-- jaxws-jbws2259 -->
- <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>
-
- <!-- jaxws-jbws2268 -->
- <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>
-
<!-- jaxws-jbws2278 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2278.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2278/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -876,30 +512,6 @@
</webinf>
</war>
- <!-- jbws2307 -->
- <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>
-
<!-- jaxws-jbws2412 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2412.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2412/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -911,23 +523,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2419 -->
- <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>
-
<!-- jaxws-jbws2449 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2449.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -947,65 +542,6 @@
</classes>
</war>
- <!-- jbws2527 -->
- <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>
-
- <!-- jaxws-jbws2634 -->
- <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>
-
<!-- jaxws-jbws2701 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2701.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -1014,45 +550,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws2717 -->
- <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>
-
- <!-- jaxws-jbws2934 -->
- <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>
-
- <!-- jaxws-jbws2937 -->
- <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>
-
<!-- jaxws-jbws2955 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2955.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -1064,40 +561,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2956 -->
- <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>
-
- <!-- jaxws-jbws2957 -->
- <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>
-
<!-- jaxws-jbws2978 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -1111,19 +574,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2999 -->
- <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>
-
<!-- jaxws-jbws3026 -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -1141,76 +591,6 @@
</zipfileset>
</war>
- <!-- jaxws-jbws3034 -->
- <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>
-
- <!-- jaxws-jbws3114 -->
- <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>
-
- <!-- jaxws-jbws3140 -->
- <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>
-
<!-- jaxws-jbws3223 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3223.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws3223/WEB-INF/web-ws.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -1242,83 +622,6 @@
</classes>
</war>
- <!-- jaxws-jbws3282 -->
- <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>
-
- <!-- jaxws-jbws3287-A -->
- <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>
-
- <!-- jaxws-jbws3287-B -->
- <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>
-
- <!-- jaxws-jbws3287-C -->
- <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>
-
- <!-- jaxws-jbws3276 -->
- <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>
-
- <!-- jaxws-jbws3293 -->
- <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>
-
<!-- jaxws-jbws3401 -->
<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>
- <!-- jaxws-jbws3437 -->
- <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>
-
- <!-- jaxws-jbws3441 -->
- <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>
-
- <!-- jaxws-jbws3477-custom-provider -->
- <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>
-
- <!-- jaxws-as3581 -->
- <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>
-
<!-- jaxws-jbws3367 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase1.war"
webxml="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -1386,22 +645,6 @@
</webinf>
</war>
- <!-- jaxws-jbws3552 -->
- <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>
-
- <!-- jaxws-jbws3556 -->
- <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>
-
<!-- jaxws-jbws3736 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws3736.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -1430,31 +673,6 @@
</webinf>
</war>
- <!-- jaxws-endpoint-servlet -->
- <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>
-
- <!-- jaxws-endpoint-ws -->
- <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>
-
<!-- jaxws-misc -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-misc.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -1463,20 +681,6 @@
</fileset>
</jar>
- <!-- jaxws namespace -->
- <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>
-
<!-- jaxws-webfault -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webfault.war"
webxml="${tests.output.dir}/test-resources/jaxws/webfault/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
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