[jbossws-commits] JBossWS SVN: r6575 - framework/trunk/testsuite/test/ant-import.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 21 10:42:11 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-21 10:42:11 -0400 (Mon, 21 Apr 2008)
New Revision: 6575
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
switch test output to maven layout
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-21 14:41:53 UTC (rev 6574)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575)
@@ -18,11 +18,11 @@
<target name="build-jars-jaxws" description="Build the deployments.">
- <mkdir dir="${tests.output.dir}/libs"/>
+ <mkdir dir="${tests.output.dir}/test-libs"/>
<!-- jaxws-anonymous -->
- <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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"/>
@@ -31,23 +31,23 @@
</war>
<!-- jaxws-binding -->
- <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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"/>
</classes>
</war>
<!-- jaxws-classloading-service -->
- <jar destfile="${tests.output.dir}/libs/jaxws-classloading-service.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class"/>
</fileset>
</jar>
<!-- jaxws-classloading-types -->
- <jar destfile="${tests.output.dir}/libs/jaxws-classloading-types.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class"/>
<include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class"/>
<include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class"/>
@@ -55,8 +55,8 @@
</jar>
<!-- jaxws-complex -->
- <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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">
<include name="org/jboss/test/ws/jaxws/complex/*.class"/>
<include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/>
<include name="org/jboss/test/ws/jaxws/complex/types/*.class"/>
@@ -65,20 +65,20 @@
</war>
<!-- jaxws-endpoint-servlet -->
- <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" 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}/resources/jaxws/endpoint/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF">
<include name="wsdl/**"/>
</webinf>
</war>
<!-- jaxws-handlerscope -->
- <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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/ProtocolHandler.class"/>
@@ -87,26 +87,26 @@
</war>
<!-- jaxws-holder -->
- <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-holder.war" webxml="${tests.output.dir}/test-resources/jaxws/holder/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/>
</classes>
</war>
<!-- jaxws-jbws860 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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}/resources/jaxws/jbws860/WEB-INF">
+ <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}/libs/jaxws-jbws944.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <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"/>
@@ -115,8 +115,8 @@
</jar>
<!-- jaxws-jbws981 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws981.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
<include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
@@ -124,15 +124,15 @@
</jar>
<!-- jaxws-jbws1178 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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"/>
@@ -141,49 +141,49 @@
</war>
<!-- jaxws-jbws1283 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <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}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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}/resources/jaxws/jbws1357">
+ <fileset dir="${tests.output.dir}/test-resources/jaxws/jbws1357">
<include name="hello.jsp"/>
</fileset>
</war>
<!-- jaxws-jbws1422 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1422.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1422/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws1422/*TestCase.class"/>
</fileset>
</jar>
<!-- jaxws-jbws1446 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1446.jar">
+ <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}/libs/jaxws-jbws1505.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1505.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1505/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws1505/*TestCase.class"/>
</fileset>
</jar>
<!-- jaxws-jbws1529 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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"/>
@@ -191,247 +191,247 @@
</war>
<!-- jaxws-jbws1556 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class"/>
</fileset>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear">
- <fileset dir="${tests.output.dir}/libs">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1556.jar"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1556/META-INF">
<include name="application.xml"/>
<include name="jboss-app.xml"/>
</metainf>
</jar>
<!-- jaxws-jbws1566-->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1566.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
</fileset>
</jar>
<!-- jaxws-jbws1581 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear">
- <fileset dir="${tests.output.dir}/libs">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1581.war"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF">
<include name="application.xml"/>
<include name="jboss-app.xml"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF">
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxws-jbws1611 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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-jbws1694 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1694.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <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}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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}/resources/jaxws/jbws1702/WEB-INF"/>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1702/WEB-INF"/>
</war>
<!-- jaxws-jbws1733 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1733/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/>
</classes>
</war>
<!-- jaxws-jbws1762 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/>
</fileset>
</jar>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
- <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/>
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/>
+ <unjar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1762/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
- <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar">
- <fileset dir="${tests.output.dir}/libs">
+ <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.war"/>
+ <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.war"/>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1762-packaged.war"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
- <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/>
- <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear">
- <fileset dir="${tests.output.dir}/libs">
+ <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar"/>
+ <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/META-INF"/>
+ <copy file="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/META-INF"/>
+ <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1762-packaged.jar"/>
<include name="jaxws-jbws1762-packaged.war"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/packaged">
<include name="application.xml"/>
</metainf>
</jar>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/>
- <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
- <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
+ <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear"/>
+ <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <copy file="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/META-INF"/>
+ <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
+ <unjar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
<!-- jaxws-jbws1797 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1797/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/>
</classes>
</war>
<!-- jaxws-jbws1798 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF">
<include name="wsdl/**"/>
</webinf>
</war>
<!-- jaxws-jbws1799 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1799.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1799.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1799/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws1799/*TestCase.class"/>
</fileset>
</jar>
<!-- jaxws-jbws1807 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1807/WEB-INF">
<include name="wsdl/**"/>
</webinf>
</war>
<!-- jaxws-jbws1813 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF">
<include name="jboss.xml"/>
</metainf>
</jar>
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.ear">
- <fileset dir="${tests.output.dir}/libs">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1813.jar"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF">
<include name="application.xml"/>
</metainf>
</jar>
<!-- jaxws-jbws1815 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1815.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1815/META-INF">
<include name="wsdl/my-service.wsdl"/>
</metainf>
</jar>
<!-- jaxws-jbws1822 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/>
</fileset>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb3-inside.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/>
</fileset>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/>
</fileset>
</jar>
- <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml"
- earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear">
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF">
+ <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml"
+ earfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb-modules.ear">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1822/two-ejb-modules/META-INF">
<include name="jboss-app.xml"/><!-- this fixes the problem -->
</metainf>
- <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"/>
- <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"/>
+ <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar"/>
+ <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb3-inside.jar"/>
</ear>
- <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml"
- earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear">
- <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"/>
+ <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml"
+ earfile="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb-module.ear">
+ <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar"/>
</ear>
<!-- jaxws-jbws1840 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1840.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1840.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/>
</fileset>
</jar>
<!-- jaxws-jbws1841 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF">
<include name="wsdl/*"/>
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
@@ -439,45 +439,45 @@
</jar>
<!-- jaxws-jbws1843 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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}/resources/jaxws/jbws1843/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1843/WEB-INF">
<include name="wsdl/**"/>
</webinf>
</war>
<!-- jaxws-jbws1845 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <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-jbws1854 -->
- <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1854/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1854.sar">
- <fileset dir="${tests.output.dir}/libs">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-jbws1854.war"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
<!-- jaxws-jbws1872 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1872.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <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"/>
@@ -485,58 +485,58 @@
</jar>
<!-- jaxws-jbws1904 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1904.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws1904/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/>
</fileset>
</jar>
<!-- jaxws-jbws1969 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws1969.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <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}/resources/jaxws/jbws1969/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1969/META-INF">
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxws-jbws2000 -->
- <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2000.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class"/>
</fileset>
</jar>
<!-- jaxws-jbws2009 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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}/resources/jaxws/jbws2009/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2009/WEB-INF">
<include name="wsdl/**"/>
<include name="schema/**"/>
</webinf>
</war>
<!-- jaxws namespace -->
- <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <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/EndpointBean.class"/>
<include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
+ <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}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-webfault.war" webxml="${tests.output.dir}/test-resources/jaxws/webfault/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/webfault/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/webfault/EndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/webfault/CustomException.class"/>
@@ -545,8 +545,8 @@
</war>
<!-- jaxws-wrapped-accessor -->
- <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/test-resources/jaxws/wrapped/accessor/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/>
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 14:41:53 UTC (rev 6574)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575)
@@ -18,74 +18,74 @@
<target name="build-samples-jaxws" description="Build the deployments.">
- <mkdir dir="${tests.output.dir}/libs"/>
+ <mkdir dir="${tests.output.dir}/test-libs"/>
<!-- jaxws-samples-asynchronous -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.class"/>
</classes>
</war>
<!-- jaxws-samples-context -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-context.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-context.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/context/META-INF">
<include name="jboss.xml"/>
</metainf>
</jar>
<!-- jaxws-samples-eardeployment -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF">
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF">
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.ear">
- <fileset dir="${tests.output.dir}/libs">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-samples-eardeployment.jar"/>
<include name="jaxws-samples-eardeployment.war"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF">
<include name="jboss-app.xml"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment42.ear">
- <fileset dir="${tests.output.dir}/libs">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment42.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-samples-eardeployment.jar"/>
<include name="jaxws-samples-eardeployment.war"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF">
<include name="application.xml"/>
</metainf>
</jar>
<!-- jaxws-samples-exception -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/exception/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/>
@@ -96,8 +96,8 @@
</war>
<!-- jaxws-samples-handlerchain -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
@@ -106,31 +106,31 @@
</war>
<!-- jaxws-samples-httpbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/>
<include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/shared">
<include name="wsdl/HttpBinding.wsdl"/>
</webinf>
</war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/>
<include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/shared">
<include name="wsdl/HttpBinding.wsdl"/>
</webinf>
</war>
<!-- jaxws-samples-logicalhandler -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-logicalhandler-source.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/>
@@ -141,9 +141,9 @@
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/>
</classes>
</war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-logicalhandler-jaxb.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/>
@@ -157,94 +157,94 @@
</war>
<!-- jaxws-samples-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
</classes>
</war>
<!-- jaxws-samples-provider -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
<include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/WEB-INF">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/message/WEB-INF">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
<include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/payload/WEB-INF">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
<!-- jaxws-samples-retail -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-retail.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/advanced/retail/**/*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/retail/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/advanced/retail/META-INF">
<include name="wsdl/*"/>
</metainf>
</jar>
<!-- jaxws-samples-serviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/>
</classes>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-client.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF">
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-ejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-ejb-client.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="wsdl/**"/>
@@ -252,8 +252,8 @@
</jar>
<!-- jaxws-samples-soapbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/>
<include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/>
<include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
@@ -267,8 +267,8 @@
</war>
<!-- jaxws-samples-swaref -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-swaref.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/swaref/jaxws/**"/>
<include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.class"/>
@@ -281,16 +281,16 @@
</jar>
<!-- jaxws-samples-webmethod -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webmethod/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.class"/>
</classes>
</war>
<!-- jaxws-samples-webparam -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webparam/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
@@ -298,8 +298,8 @@
</war>
<!-- jaxws-samples-webresult -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webresult/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
@@ -307,42 +307,42 @@
</war>
<!-- jaxws-samples-webservice -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF01/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
</classes>
</war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF02/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF02">
<include name="wsdl/**"/>
</webinf>
</war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF03/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
</classes>
</war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-ejb3.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
</fileset>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice02-ejb3.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webservice/META-INF02">
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice03-ejb3.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
@@ -350,18 +350,18 @@
</jar>
<!-- jaxws-samples-webserviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.class"/>
</classes>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="wsdl/**"/>
@@ -370,24 +370,24 @@
<attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne"/>
</manifest>
</jar>
- <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-servlet-client.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF">
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client">
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
- <fileset dir="${tests.output.dir}/classes">
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/>
@@ -395,15 +395,15 @@
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF">
<include name="jboss.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxws-samples-xop-doclit -->
- <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
+ <war jarfile="${tests.output.dir}/test-libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/>
<include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/>
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-21 14:41:53 UTC (rev 6574)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-21 14:42:11 UTC (rev 6575)
@@ -9,7 +9,7 @@
<!-- $Id: build-testsuite.xml 4142 2007-08-03 09:32:46Z thomas.diesler at jboss.com $ -->
<project>
-
+
<!-- Define jboss.home -->
<condition property="jboss.home" value="${jboss421.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
@@ -30,10 +30,10 @@
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<!-- Verify required properties that must be set before this file is imported -->
<fail message="Tests output dir not set." unless="tests.output.dir"/>
-
+
<!-- Verify availabililty of tools.jar -->
<condition property="tools.jar" value="${java.home}/lib/tools.jar">
<available file="${java.home}/lib/tools.jar"/>
@@ -43,10 +43,10 @@
</condition>
<!-- [JBWS-2113] tools.jar not available on Mac OS X -->
<condition property="tools.jar" value="${java.home}/../Classes/classes.jar">
- <available file="${java.home}/../Classes/classes.jar"/>
+ <available file="${java.home}/../Classes/classes.jar"/>
</condition>
<fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/>
-
+
<!-- Use -Ddebug=true for remote debugging -->
<condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005">
<isset property="debug"/>
@@ -56,7 +56,7 @@
<isset property="debug"/>
</not>
</condition>
-
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -73,21 +73,21 @@
<os family="windows"/>
</not>
</condition>
-
+
<!-- node0 defaults -->
<property name="node0" value="${jboss.bind.address}"/>
<property name="node0.http.url" value="http://${node0}:8080"/>
<property name="node0.jndi.url" value="jnp://${node0}:1099"/>
<property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="tests-prepare">
- <mkdir dir="${tests.output.dir}/log"/>
- <delete file="${tests.output.dir}/log/test.log"/>
+ <mkdir dir="${tests.output.dir}/test-log"/>
+ <delete file="${tests.output.dir}/test-log/test.log"/>
<property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
@@ -113,18 +113,18 @@
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
</target>
-
+
<target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42">
- <path id="tests.javac.classpath">
- <path refid="ws.stack.classpath"/>
- <path refid="tests.extra.classpath"/>
- <path refid="integration.target.javac.classpath"/>
- </path>
- <path id="tests.client.classpath">
- <path refid="ws.stack.classpath"/>
- <path refid="tests.extra.classpath"/>
- <path refid="integration.target.client.classpath"/>
- </path>
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <path refid="integration.target.javac.classpath"/>
+ </path>
+ <path id="tests.client.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <path refid="integration.target.client.classpath"/>
+ </path>
</target>
<target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42">
@@ -150,11 +150,11 @@
</path>
<!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ The 's.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
<pathelement location="${jboss.client}/activation.jar"/>
@@ -261,13 +261,13 @@
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
-
+
<macrodef name="macro-compile-classes">
<attribute name="excludesfile"/>
<attribute name="srcdir"/>
<sequential>
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ <mkdir dir="${tests.output.dir}/test-classes"/>
+ <javac destdir="${tests.output.dir}/test-classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="@{srcdir}"/>
<classpath refid="tests.javac.classpath"/>
@@ -284,7 +284,7 @@
<sequential>
<!-- copy etc -->
- <copy todir="${tests.output.dir}/classes">
+ <copy todir="${tests.output.dir}/test-classes">
<fileset dir="@{srcdir}/etc">
<include name="jndi.properties"/>
<include name="tst.policy"/>
@@ -296,14 +296,14 @@
</copy>
<!-- copy handler definitions -->
- <copy todir="${tests.output.dir}/classes">
+ <copy todir="${tests.output.dir}/test-classes">
<fileset dir="@{srcdir}/java">
<include name="**/*.xml"/>
</fileset>
</copy>
<!-- copy non binary files -->
- <copy todir="${tests.output.dir}/resources">
+ <copy todir="${tests.output.dir}/test-resources">
<fileset dir="@{srcdir}/resources">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
@@ -314,12 +314,12 @@
<filter token="java.home" value="${java.home}"/>
<filter token="jboss.bind.address" value="${node0}"/>
<filter token="tests.output.dir" value="${tests.output.dir}"/>
- <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/test-wsdl-publish"/>
</filterset>
</copy>
<!-- Copy binary files -->
- <copy todir="${tests.output.dir}/resources">
+ <copy todir="${tests.output.dir}/test-resources">
<fileset dir="@{srcdir}/resources">
<exclude name="**/*.wsdl"/>
<exclude name="**/*.xml"/>
@@ -341,28 +341,28 @@
</antcall>
<antcall target="tests-report"/>
</target>
-
+
<!-- Run smoke test cases -->
<target name="tests-smoke" depends="tests-init" description="Run smoke unit tests">
<antcall target="tests-run-internal">
<param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
<param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
<!--
- According to our commit policy, haltonfailure MUST be be true for tests-smoke
- It is a prerequisite for any commit that this target passes without failure.
+ According to our commit policy, haltonfailure MUST be be true for tests-smoke
+ It is a prerequisite for any commit that this target passes without failure.
-->
<param name="haltonfailure" value="true"/>
</antcall>
<antcall target="tests-report"/>
</target>
-
+
<!-- Run samples test cases -->
<target name="tests-samples" depends="tests-init" description="Run samples unit tests">
<antcall target="tests-run-internal">
<param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
- <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
+ <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
<param name="haltonfailure" value="false"/>
- </antcall>
+ </antcall>
</target>
<!-- Run integration test cases -->
@@ -376,8 +376,8 @@
</target>
<!--
- Run a collection of unit tests.
- ant -Dtest=jaxws/samples/provider test
+ Run a collection of unit tests.
+ ant -Dtest=jaxws/samples/provider test
-->
<target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory">
<antcall target="tests-run-internal">
@@ -389,54 +389,54 @@
<!-- Common test target -->
<target name="tests-run-internal" depends="tests-init">
- <mkdir dir="${tests.output.dir}/reports"/>
+ <mkdir dir="${tests.output.dir}/test-reports"/>
<junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}">
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-ea"/>
<!--jvmarg value="-Dcom.sun.xml.ws.transport.http.HttpAdapter.dump=true"/>
<jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/-->
-
+
<sysproperty key="jdk.home" value="${env.JAVA_HOME}"/>
<sysproperty key="test.execution.dir" value="${tests.output.dir}"/>
- <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/>
<sysproperty key="client.scenario" value="${client.scenario}"/>
<sysproperty key="interop" value="${interop}"/>
<sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
- <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
+ <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/>
<sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
<sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/>
<sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
- <sysproperty key="test.archive.directory" value="${tests.output.dir}/libs"/>
- <sysproperty key="test.resources.directory" value="${tests.output.dir}/resources"/>
+ <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/>
+ <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/>
<classpath>
<path refid="tests.client.classpath"/>
- <pathelement location="${tests.output.dir}/classes"/>
+ <pathelement location="${tests.output.dir}/test-classes"/>
</classpath>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <batchtest todir="${tests.output.dir}/reports" fork="true">
- <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/>
+ <batchtest todir="${tests.output.dir}/test-reports" fork="true">
+ <fileset dir="${tests.output.dir}/test-classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/>
</batchtest>
</junit>
</target>
<!--
- Run a single unit test.
- ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
-->
<target name="one-test" depends="tests-init" if="test" description="Run a single unit test">
- <mkdir dir="${tests.output.dir}/reports"/>
+ <mkdir dir="${tests.output.dir}/test-reports"/>
<junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
<jvmarg line="${remote.debug.line}"/>
@@ -444,16 +444,16 @@
<jvmarg value="-ea"/>
<!--jvmarg value="-Dcom.sun.xml.ws.transport.http.HttpAdapter.dump=true"/>
<jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/-->
-
+
<sysproperty key="jdk.home" value="${env.JAVA_HOME}"/>
<sysproperty key="test.execution.dir" value="${tests.output.dir}"/>
- <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/>
<sysproperty key="client.scenario" value="${client.scenario}"/>
<sysproperty key="interop" value="${interop}"/>
<sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
- <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
+ <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/>
<sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
@@ -462,8 +462,8 @@
<sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
<!--
http://jira.jboss.com/jira/browse/JBWS-917
- <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
<sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
<sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
@@ -471,21 +471,21 @@
-->
<!-- HTTPS hostname wrong: should be <localhost> -->
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
- <sysproperty key="test.archive.directory" value="${tests.output.dir}/libs"/>
- <sysproperty key="test.resources.directory" value="${tests.output.dir}/resources"/>
+ <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/>
+ <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/>
<classpath>
<path refid="tests.client.classpath"/>
- <pathelement location="${tests.output.dir}/classes"/>
+ <pathelement location="${tests.output.dir}/test-classes"/>
</classpath>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
+ <test todir="${tests.output.dir}/test-reports" name="${test}" fork="true"/>
</junit>
</target>
@@ -495,15 +495,15 @@
<!-- Build the tests report -->
<target name="tests-report" depends="tests-init" description="Build the tests report">
- <mkdir dir="${tests.output.dir}/reports"/>
- <junitreport todir="${tests.output.dir}/reports">
- <fileset dir="${tests.output.dir}/reports">
+ <mkdir dir="${tests.output.dir}/test-reports"/>
+ <junitreport todir="${tests.output.dir}/test-reports">
+ <fileset dir="${tests.output.dir}/test-reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${tests.output.dir}/reports/html"/>
+ <report format="frames" todir="${tests.output.dir}/test-reports/html"/>
</junitreport>
<zip destfile="${tests.output.dir}/test-report-${build.id}.zip">
- <fileset dir="${tests.output.dir}" includes="reports/**"/>
+ <fileset dir="${tests.output.dir}" includes="test-reports/**"/>
</zip>
</target>
@@ -518,33 +518,29 @@
<!-- ================================================================== -->
<!-- Eclipse conf generation -->
<!-- ================================================================== -->
-
+
<target name="eclipse" depends="tests-jars" description="Generates the JBossWS Testsuite Eclipse project">
- <fail message="Sorry, this target is for src/binary distribution only.">
+ <fail message="Sorry, this target is for src/binary distribution only.">
<condition>
- <not><isset property="build.dir"/></not>
+ <not>
+ <isset property="build.dir"/>
+ </not>
</condition>
</fail>
- <path id="tests.eclipse.classpath">
- <path refid="tests.client.classpath"/>
- <path refid="tests.javac.classpath"/>
- </path>
- <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="ws.stack.classpath"/>
- <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="ws.stack.classpath"/>
- <taskdef name="eclipseJUnitTestGenerator" classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask" classpathref="ws.stack.classpath"/>
- <eclipseClasspathGenerator pathId="tests.eclipse.classpath" excludesFile="${excludesfile}" srcPath="tests/java" />
- <eclipseProjectGenerator projectName="JBossWS Testsuite" />
- <eclipseJUnitTestGenerator projectName="JBossWS Testsuite"
- projectWorkingDir="${tests.output.dir}"
- srcDir="${tests.dir}/java"
- integrationTarget="${jbossws.integration.target}"
- endorsedDir="${jboss.lib}/endorsed"
- jbossHome="${jboss.home}"
- namingProviderUrl="${node0.jndi.url}"
- securityPolicy="${tests.output.dir}/classes/tst.policy"
- >
- <fileset dir="${tests.output.dir}/classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/>
- </eclipseJUnitTestGenerator>
+ <path id="tests.eclipse.classpath">
+ <path refid="tests.client.classpath"/>
+ <path refid="tests.javac.classpath"/>
+ </path>
+ <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="ws.stack.classpath"/>
+ <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="ws.stack.classpath"/>
+ <taskdef name="eclipseJUnitTestGenerator" classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask" classpathref="ws.stack.classpath"/>
+ <eclipseClasspathGenerator pathId="tests.eclipse.classpath" excludesFile="${excludesfile}" srcPath="tests/java"/>
+ <eclipseProjectGenerator projectName="JBossWS Testsuite"/>
+ <eclipseJUnitTestGenerator projectName="JBossWS Testsuite" projectWorkingDir="${tests.output.dir}" srcDir="${tests.dir}/test-java"
+ integrationTarget="${jbossws.integration.target}" endorsedDir="${jboss.lib}/endorsed" jbossHome="${jboss.home}" namingProviderUrl="${node0.jndi.url}"
+ securityPolicy="${tests.output.dir}/test-classes/tst.policy">
+ <fileset dir="${tests.output.dir}/test-classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/>
+ </eclipseJUnitTestGenerator>
</target>
-
+
</project>
\ No newline at end of file
More information about the jbossws-commits
mailing list