[jbossws-commits] JBossWS SVN: r6574 - stack/native/trunk/ant-import-tests.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Apr 21 10:41:53 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-04-21 10:41:53 -0400 (Mon, 21 Apr 2008)
New Revision: 6574

Modified:
   stack/native/trunk/ant-import-tests/build-benchmark.xml
   stack/native/trunk/ant-import-tests/build-jars-interop.xml
   stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml
   stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
   stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml
   stack/native/trunk/ant-import-tests/build-samples-jaxws.xml
   stack/native/trunk/ant-import-tests/build-testsuite-artifacts.xml
   stack/native/trunk/ant-import-tests/build-testsuite.xml
Log:
switch test output to maven layout

Modified: stack/native/trunk/ant-import-tests/build-benchmark.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-benchmark.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-benchmark.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -30,4 +30,4 @@
     <antcall target="tests-report"/>
   </target>
   
-</project>
+</project>
\ No newline at end of file

Modified: stack/native/trunk/ant-import-tests/build-jars-interop.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-interop.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-jars-interop.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -18,248 +18,245 @@
   
   <target name="build-jars-interop">
     
-    <mkdir dir="${tests.output.dir}/libs"/>
+    <mkdir dir="${tests.output.dir}/test-libs"/>
     
     <!-- Root.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war" webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml">
-      <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-root.war" webxml="${tests.output.dir}/test-resources/interop/root/WEB-INF/web.xml">
+      <webinf dir="${tests.output.dir}/test-resources/interop/root/WEB-INF">
         <include name="jboss-web.xml"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/root">
+      <fileset dir="${tests.output.dir}/test-resources/interop/root">
         <include name="*.*"/>
       </fileset>
     </war>
     
     <!-- jbossws-interop-BaseDataTypesDocLitB.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war"
-      webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-BaseDataTypesDocLitB.war"
+      webxml="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF">
         <include name="wsdl/**.*"/>
         <include name="jboss-web.xml"/>
         <include name="scenarios.xml"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB">
+      <fileset dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitB">
         <include name="*.*"/>
       </fileset>
     </war>
     
     <!-- jbossws-interop-BaseDataTypesDocLitW.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war"
-      webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-BaseDataTypesDocLitW.war"
+      webxml="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jboss-web.xml"/>
         <include name="scenarios.xml"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW">
+      <fileset dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitW">
         <include name="*.*"/>
       </fileset>
     </war>
     
     <!-- jbossws-interop-BaseDataTypesRpcLit.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war"
-      webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-BaseDataTypesRpcLit.war"
+      webxml="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jboss-web.xml"/>
         <include name="scenarios.xml"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit">
+      <fileset dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesRpcLit">
         <include name="*.*"/>
       </fileset>
     </war>
     
     <!-- jbossws-interop-wsa10.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-wsa10.war" webxml="${tests.output.dir}/test-resources/interop/wsa/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/wsa/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/wsa/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jboss-web.xml"/>
         <include name="scenarios.xml"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/wsa">
+      <fileset dir="${tests.output.dir}/test-resources/interop/wsa">
         <include name="*.*"/>
       </fileset>
     </war>
     
     <!-- jbossws-interop-wsse10Encrypt.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/test-resources/interop/wsse/encrypt/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
       
-      <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/wsse/encrypt/WEB-INF">
         <include name="wsdl/**.*"/>
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss-web.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/wsse/shared/META-INF">
         <include name="alice.jks"/>
         <include name="wsse10.truststore"/>
       </webinf>
       
-      <fileset dir="${tests.output.dir}/resources/interop/wsse/">
+      <fileset dir="${tests.output.dir}/test-resources/interop/wsse/">
         <include name="*.*"/>
       </fileset>
     </war>
     <!-- jbossws-interop-wsse10Encrypt-client.jar -->
-    <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
-      <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"/>
+    <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Encrypt-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/interop/wsse/encrypt/META-INF"/>
     </jar>
     
     <!-- jbossws-interop-wsse10Sign.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/test-resources/interop/wsse/sign/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/wsse/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
       
-      <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/wsse/sign/WEB-INF">
         <include name="wsdl/**.*"/>
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss-web.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/wsse/shared/META-INF">
         <include name="alice.jks"/>
         <include name="wsse10.truststore"/>
       </webinf>
       
-      <fileset dir="${tests.output.dir}/resources/interop/wsse/">
+      <fileset dir="${tests.output.dir}/test-resources/interop/wsse/">
         <include name="*.*"/>
       </fileset>
     </war>
     <!-- jbossws-interop-wsse10Sign-client.jar -->
-    <jar destfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar">
-      <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"/>
+    <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Sign-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/interop/wsse/sign/META-INF"/>
     </jar>
-
-
+    
     <!-- WCF Interoperability Plug-fest November 2007 -->
-		
+    
     <!-- jbossws-interop-nov2007-wsaSoap12.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsaSoap12.war"
-      webxml="${tests.output.dir}/resources/interop/nov2007/wsaSoap12/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsaSoap12.war"
+      webxml="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/nov2007/wsaSoap12/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsaSoap12/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jboss-web.xml"/>
         <include name="scenarios.xml"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/nov2007/wsaSoap12">
+      <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12">
         <include name="*.*"/>
       </fileset>
     </war>
     <!-- jbossws-interop-nov2007-wsaSoap12-client.jar -->
-    <jar destfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsaSoap12-client.jar">
-			<metainf dir="${tests.output.dir}/resources/interop/nov2007/wsaSoap12/META-INF"/>
+    <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsaSoap12-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12/META-INF"/>
     </jar>
-		
+    
     <!-- jbossws-interop-nov2007-wsseEncrypt.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseEncrypt.war"
-      webxml="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt.war"
+      webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt/WEB-INF">
+      
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/WEB-INF">
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss-web.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/WEB-INF">
         <include name="wsdl/**/*"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/META-INF">
         <include name="bob-sign_enc.jks"/>
         <include name="wsse10.truststore"/>
       </webinf>
-
-      <fileset dir="${tests.output.dir}/resources/interop/nov2007/wsse/">
+      
+      <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/">
         <include name="*.*"/>
       </fileset>
     </war>
     <!-- jbossws-interop-nov2007-wsseEncrypt.jar -->
-    <jar destfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseEncrypt-client.jar">
-      <metainf dir="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt/META-INF"/>
+    <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/META-INF"/>
     </jar>
-		
-		
+    
     <!-- jbossws-interop-nov2007-wsseEncrypt3DES.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseEncrypt3DES.war"
-      webxml="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt3DES.war"
+      webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt3DES/WEB-INF">
+      
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/WEB-INF">
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss-web.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/WEB-INF">
         <include name="wsdl/**/*"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/META-INF">
         <include name="bob-sign_enc.jks"/>
         <include name="wsse10.truststore"/>
       </webinf>
-
-      <fileset dir="${tests.output.dir}/resources/interop/nov2007/wsse/">
+      
+      <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/">
         <include name="*.*"/>
       </fileset>
     </war>
     <!-- jbossws-interop-nov2007-wsseEncrypt3DES.jar -->
-    <jar destfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseEncrypt3DES-client.jar">
-      <metainf dir="${tests.output.dir}/resources/interop/nov2007/wsse/encrypt3DES/META-INF"/>
+    <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt3DES-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/META-INF"/>
     </jar>
-		
+    
     <!-- jbossws-interop-nov2007-wsseUsernameTokenHTTPS.war -->
-    <war warfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseUsernameTokenHTTPS.war"
-      webxml="${tests.output.dir}/resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseUsernameTokenHTTPS.war"
+      webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/>
         <include name="org/jboss/test/ws/interop/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF">
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss-web.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/interop/nov2007/wsse/shared/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/WEB-INF">
         <include name="wsdl/**/*"/>
       </webinf>
-      <fileset dir="${tests.output.dir}/resources/interop/nov2007/wsse/">
+      <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/">
         <include name="*.*"/>
       </fileset>
     </war>
     <!-- jbossws-interop-nov2007-wsseUsernameTokenHTTPS-client.jar -->
-    <jar destfile="${tests.output.dir}/libs/jbossws-interop-nov2007-wsseUsernameTokenHTTPS-client.jar">
-      <metainf dir="${tests.output.dir}/resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF"/>
+    <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseUsernameTokenHTTPS-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF"/>
     </jar>
     
-
     <!-- wrap up in an *.ear for easier deployment -->
-    <ear destfile="${tests.output.dir}/libs/jbossws-interop.ear" appxml="${tests.output.dir}/resources/interop/root/META-INF/application.xml">
-      <fileset dir="${tests.output.dir}/libs" includes="*interop*.war"/>
+    <ear destfile="${tests.output.dir}/test-libs/jbossws-interop.ear" appxml="${tests.output.dir}/test-resources/interop/root/META-INF/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs" includes="*interop*.war"/>
     </ear>
     
   </target>
-</project>
+</project>
\ No newline at end of file

Modified: stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxrpc.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -18,26 +18,26 @@
   
   <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments">
     
-    <mkdir dir="${tests.output.dir}/libs"/>
+    <mkdir dir="${tests.output.dir}/test-libs"/>
     
     <!-- jaxrpc-addressrewrite -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-addressrewrite.war" webxml="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-addressrewrite.war" webxml="${tests.output.dir}/test-resources/jaxrpc/addressrewrite/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/addressrewrite/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-addressrewrite-sec.war" webxml="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-addressrewrite-sec.war" webxml="${tests.output.dir}/test-resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/addressrewrite/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
@@ -45,60 +45,60 @@
     </war>
     
     <!-- jaxrpc-anonymous -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war" webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxrpc/anonymous/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/anonymous/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-anonymous-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-anonymous-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
         <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/anonymous/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/anonymous/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/anonymous/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-benchmark -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -106,43 +106,43 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -150,15 +150,15 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/>
         <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -167,145 +167,146 @@
     </jar>
     
     <!-- jaxrpc-encoded-href.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-href-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/href/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-encoded-marshalltest.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-marshalltest.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/marshalltest/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-marshalltest-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/marshalltest/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/marshalltest/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-encoded-parametermode.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-parametermode.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/parametermode/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-encoded-parametermode-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/parametermode/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/encoded/parametermode/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-enventry.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-enventry.war" webxml="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-enventry.war" webxml="${tests.output.dir}/test-resources/jaxrpc/enventry/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/enventry/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-enventry.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-enventry.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/enventry/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/enventry/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-enventry-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-enventry-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/enventry/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/enventry/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbas897 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbas897.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
@@ -313,55 +314,55 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbas897-fail.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF">
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF-FAIL">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF-FAIL">
         <include name="ejb-jar.xml"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbas897.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbas897/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/WEB-INF">
         <include name="webservices.xml"/>
       </webinf>
     </war>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web-fail.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbas897-fail.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbas897/WEB-INF/web-fail.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/WEB-INF">
         <include name="webservices.xml"/>
       </webinf>
     </war>
     
     <!-- jaxrpc-jbws64 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws64.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws64.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws64/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws64/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws64/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws64/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -369,127 +370,127 @@
     </war>
     
     <!-- jaxrpc-jbws68 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws68.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws68.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws68/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws68/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws68/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws68-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws68/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws68/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws68/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws70 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws70/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws70/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws70/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws70-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws70/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws70/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws70/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws71 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-types.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-types.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/>
       </fileset>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws71.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws71.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws71/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws71/HelloJavaBean.class"/>
       </classes>
-      <lib dir="${tests.output.dir}/libs">
+      <lib dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws71-types.jar"/>
       </lib>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws71/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws71/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws71/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws71/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws79 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws79/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOneJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwoJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws79/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping-one.xml"/>
         <include name="jaxrpc-mapping-two.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws79-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws79/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws79/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws79/WEB-INF">
         <include name="jaxrpc-mapping-one.xml"/>
         <include name="jaxrpc-mapping-two.xml"/>
         <include name="wsdl/**"/>
@@ -497,204 +498,204 @@
     </jar>
     
     <!-- jaxrpc-jbws82 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws82/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws82/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws82/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws82-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws82/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws82/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws82/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws83 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws83/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws83/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws83/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws83-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws83/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws83/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws83/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws84 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/*.wsdl"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws84-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*JavaBean.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws84/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/*.wsdl"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws124 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws124/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws124/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws124/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws124-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws124-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws124/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws124/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws124/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws128 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-service.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws128-service.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws128/WEB-INF-service/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws128/WEB-INF-service">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-client.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws128-client.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws128/WEB-INF-client/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloClientServlet.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws128/WEB-INF-client">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws128.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws128/META-INF/application.xml">
-      <fileset dir="${tests.output.dir}/libs">
+    <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws128.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws128/META-INF/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws128-service.war"/>
         <include name="jaxrpc-jbws128-client.war"/>
       </fileset>
     </ear>
     
     <!-- jaxrpc-jbws153 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws153.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws153.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws153/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws153/OrderJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws153/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jaxrpc-deployment.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws153-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws153-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws153/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws153/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws153/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jaxrpc-deployment.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws163 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws163.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws163.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws163/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws163/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws163/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws163-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws163-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws163/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws163/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws163/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws165 -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-none.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws165-none.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-none">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws165/META-INF-none">
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
@@ -702,12 +703,12 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-pcuri.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws165-pcuri.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-pcuri">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws165/META-INF-pcuri">
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
@@ -715,12 +716,12 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-ctxroot.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws165-ctxroot.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-ctxroot">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws165/META-INF-ctxroot">
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
@@ -728,12 +729,12 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-both.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws165-both.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-both">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws165/META-INF-both">
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
@@ -741,8 +742,8 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws165.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF/application.xml">
-      <fileset dir="${tests.output.dir}/libs">
+    <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws165.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws165/META-INF/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws165-none.jar"/>
         <include name="jaxrpc-jbws165-pcuri.jar"/>
         <include name="jaxrpc-jbws165-ctxroot.jar"/>
@@ -751,13 +752,13 @@
     </ear>
     
     <!-- jaxrpc-jbws167 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws167.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws167.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws167/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws167/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws167/HeaderHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws167/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -765,8 +766,8 @@
     </war>
     
     <!-- jaxrpc-jbws168 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws168.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws168.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws168/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/>
@@ -774,25 +775,25 @@
         <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws168/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jaxrpc-deployment.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws168-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws168-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws168/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws168/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws168/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jaxrpc-deployment.xml"/>
         <include name="wsdl/**"/>
@@ -800,129 +801,129 @@
     </jar>
     
     <!-- jaxrpc-jbws217 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws217.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws217.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws217/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws217/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws217/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws217-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws217/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws217/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws217/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws231 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws231/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws231/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws231-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws231/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws231/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws231/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws251 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws251/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws251/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws251-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws251/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws251/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws251/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jbws-314 -->
-    <copy todir="${tests.output.dir}/resources/META-INF" file="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/>
+    <copy todir="${tests.output.dir}/test-resources/META-INF" file="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/>
     
     <!-- jaxrpc-jbws316 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws316.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws316.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws316/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws316/WEB-INF">
         <include name="webservices.xml"/>
         <include name="TestBusinessFacadeMapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws316-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBFBean.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws316/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws316/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws316/WEB-INF">
         <include name="TestBusinessFacadeMapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws331 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ws.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ws.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
@@ -930,33 +931,33 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ejb.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ejb.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloSLSB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/EJB-META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/EJB-META-INF">
         <include name="ejb-jar.xml"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF/application.xml">
-      <fileset dir="${tests.output.dir}/libs">
+    <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws331/META-INF/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws331-ejb.jar"/>
         <include name="jaxrpc-jbws331-ws.jar"/>
         <include name="jaxrpc-jbws331-client.jar"/>
@@ -964,40 +965,40 @@
     </ear>
     
     <!-- jaxrpc-jbws349 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws349-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*EndpointImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws349/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws349/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws358 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws358/HelloBean.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
@@ -1005,172 +1006,172 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/>
-    <unjar dest="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/libs/jaxrpc-jbws358.jar"/>
-    <copy todir="${tests.output.dir}/libs/jaxrpc-jbws358.ear">
-      <fileset dir="${tests.output.dir}/resources/jaxrpc/jbws358">
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/>
+    <unjar dest="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"/>
+    <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear">
+      <fileset dir="${tests.output.dir}/test-resources/jaxrpc/jbws358">
         <include name="META-INF/application.xml"/>
       </fileset>
-      <fileset dir="${tests.output.dir}/libs">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws358-client.jar"/>
       </fileset>
     </copy>
     
     <!-- jaxrpc-jbws377 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws377/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws377/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws377-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws377/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws377/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws377/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws381 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws381/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws381/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws381-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws381/WeatherForecastSoapImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws381/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws381/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws381/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws383 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws383/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws383/TestJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws383/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws383-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws383/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws383/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws383/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws413 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws413/TestJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws413-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws413/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws413/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws414 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws414/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/TestJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws414/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jaxrpc-deployment.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws414-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws414/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws414/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws414/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jaxrpc-deployment.xml"/>
         <include name="wsdl/**"/>
@@ -1178,242 +1179,242 @@
     </jar>
     
     <!-- jaxrpc-jbws423 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws423/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws423/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws423-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws423/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws423/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws423/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws424 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws424/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws424/TestJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws424/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws424-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws424/TestHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws424/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws424/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws424/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws425 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws425/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws425/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws425/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws425-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws425/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws425/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws425/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws434 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws434/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws434/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws434-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws434/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws434/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws434/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws456 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws456/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws456/TestJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws456/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws456-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws456/TestHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws456/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws456/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws456/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws463 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws463/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws463/TestJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws463/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws463-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws463/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws463/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws463/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws464 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws464/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws464/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws464/SAAJTestHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws464/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws464-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws464/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws464/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws464/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws484 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws484/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws484/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws484-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws484/TestServiceBean.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws484/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws484/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws484/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws626 -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws626.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -1421,64 +1422,64 @@
         <include name="wsdl/TestService.wsdl"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws626-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF/application.xml">
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF">
+    <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF/application.xml">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF">
         <include name="jboss-app.xml"/>
       </metainf>
-      <fileset dir="${tests.output.dir}/libs">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws626.jar"/>
         <include name="jaxrpc-jbws626-client.jar"/>
       </fileset>
     </ear>
     
     <!-- jaxrpc-jbws632 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws632.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws632.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws632/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws632/TestJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws632/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws632-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws632/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws632/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws632/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws637 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws637-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws637/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws637/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -1487,264 +1488,264 @@
     </jar>
     
     <!-- jaxrpc-jbws643 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws643/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws643/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws643-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws643/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws643/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws643/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws663 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663b/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663b/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663b-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663b/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663b/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663bb-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663w/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663w/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663w-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663w/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663w/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663wb-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws706 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws706/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws706/ClientHandler.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws706/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws706-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws706/DemoServicePortTypeImpl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws706/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws706/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws706/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws707 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws707/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws707/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws707-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws707/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws707/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws707/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws710 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws710/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws710/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws710-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws710/HelloBean.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws710/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws710/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws710/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws720 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws720/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws720/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws720-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws720/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws720/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws720/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws723 -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
@@ -1752,13 +1753,13 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -1767,28 +1768,28 @@
     </jar>
     
     <!-- jaxrpc-jbws732 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF">
         <include name="bare-mapping.xml"/>
         <include name="wrapped-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws732-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws732/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws732/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF">
         <include name="bare-mapping.xml"/>
         <include name="wrapped-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -1796,40 +1797,40 @@
     </jar>
     
     <!-- jaxrpc-jbws751 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws751/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws751/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws751-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws751-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*Impl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws751/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws751/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws751/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jws772 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-endpoint.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-endpoint.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
@@ -1837,29 +1838,29 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-remote.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-remote.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloRemote.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-TWO">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-TWO">
         <include name="ejb-jar.xml"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE/application.xml">
-      <fileset dir="${tests.output.dir}/libs">
+    <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws772-endpoint.jar"/>
         <include name="jaxrpc-jbws772-remote.jar"/>
         <include name="jaxrpc-jbws772-client.jar"/>
@@ -1867,40 +1868,40 @@
     </ear>
     
     <!-- jaxrpc-jws775 -->
-    <war destfile="${tests.output.dir}/libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws775/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws775/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws775-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws775/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws775/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws775/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws801 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws801/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws801/WEB-INF">
         <include name="wsdl/LargeAttachment.wsdl"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
@@ -1908,67 +1909,67 @@
     </war>
     
     <!-- jaxrpc-jbws807 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws807.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws807.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws807/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws807-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws807/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws812 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws812/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws812/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws812-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws812/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws812/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws812/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws950 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws950/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws950/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws950/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -1976,14 +1977,14 @@
     </war>
     
     <!-- jaxrpc-jbws956 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws956.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws956.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws956/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArray.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArrayArray.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws956/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -1991,43 +1992,43 @@
     </war>
     
     <!-- jaxrpc-jbws1010 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1010.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1010.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1010/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1010/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1010/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1010-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1010-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1010/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1010/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws1011 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpointBean.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1011/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jbosscmp-jdbc.xml"/>
@@ -2036,11 +2037,11 @@
         <include name="wsdl/TestService.wsdl"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1011/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -2049,105 +2050,105 @@
     </jar>
     
     <!-- jbossws-jbws1093 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1093/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1093/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1093-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1093-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1093/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1093/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws1107 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1107/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1107/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1107-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1107-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1107/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1107/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws1121 -->
-    <war destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-wsse-server.xml"/>
         <include name="wsdl/*"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1121">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1121-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/*"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </metainf>
     </jar>
-    <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
-      <fileset dir="${tests.output.dir}/libs">
+    <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws1121-client.jar"/>
         <include name="jaxrpc-jbws1121.war"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF">
         <include name="jboss-app.xml"/>
       </metainf>
     </ear>
     
     <!-- jaxrpc-jbws1124one -->
-    <copy todir="${tests.output.dir}/resources" overwrite="true">
+    <copy todir="${tests.output.dir}/test-resources" overwrite="true">
       <fileset dir="${tests.resources.dir}">
         <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/>
         <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/>
@@ -2156,22 +2157,22 @@
         <filter token="jbws1124.domain" value="jbws1124one"/>
       </filterset>
     </copy>
-     <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxrpc/jbws1124/" overwrite="true">
-        <fileset dir="${tests.resources.dir}/jaxrpc/jbws1124/WEB-INF/">
-           <include name="test-resource.txt"/>
-        </fileset>
-        <filterset>
-           <filter token="jbws1124.domain" value="jbws1124one"/>
-        </filterset>
-     </copy>
-
-     <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124one.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <copy todir="${tests.output.dir}/test-classes/org/jboss/test/ws/jaxrpc/jbws1124/" overwrite="true">
+      <fileset dir="${tests.resources.dir}/jaxrpc/jbws1124/WEB-INF/">
+        <include name="test-resource.txt"/>
+      </fileset>
+      <filterset>
+        <filter token="jbws1124.domain" value="jbws1124one"/>
+      </filterset>
+    </copy>
+    
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1124one.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="test-resource.txt"/>
@@ -2180,7 +2181,7 @@
       </webinf>
     </war>
     <!-- jaxrpc-jbws1124two -->
-    <copy todir="${tests.output.dir}/resources" overwrite="true">
+    <copy todir="${tests.output.dir}/test-resources" overwrite="true">
       <fileset dir="${tests.resources.dir}">
         <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/>
         <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/>
@@ -2189,22 +2190,22 @@
         <filter token="jbws1124.domain" value="jbws1124two"/>
       </filterset>
     </copy>
-     <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxrpc/jbws1124/" overwrite="true">
-        <fileset dir="${tests.resources.dir}/jaxrpc/jbws1124/WEB-INF/">
-           <include name="test-resource.txt"/>
-        </fileset>
-        <filterset>
-           <filter token="jbws1124.domain" value="jbws1124two"/>
-        </filterset>
-     </copy>
-
-     <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124two.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <copy todir="${tests.output.dir}/test-classes/org/jboss/test/ws/jaxrpc/jbws1124/" overwrite="true">
+      <fileset dir="${tests.resources.dir}/jaxrpc/jbws1124/WEB-INF/">
+        <include name="test-resource.txt"/>
+      </fileset>
+      <filterset>
+        <filter token="jbws1124.domain" value="jbws1124two"/>
+      </filterset>
+    </copy>
+    
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1124two.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1124/test-resource.txt"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1124/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="test-resource.txt"/>
@@ -2214,97 +2215,97 @@
     </war>
     
     <!-- jaxrpc-jbws1125 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1125.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1125/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1125/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1125-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1125-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1125/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1125/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws1148 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1148/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1148/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1148-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1148-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1148/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1148/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jbossws-jbws1179 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1179-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jbossws-jbws1186 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1186/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1186/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -2312,8 +2313,8 @@
     </war>
     
     <!-- jaxrpc-jbws1190 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1190/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
@@ -2321,42 +2322,42 @@
         <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/WEB-INF">
         <include name="webservices.xml"/>
         <include name="test-mapping.xml"/>
         <include name="confidential-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1190-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1190/WEB-INF">
         <include name="test-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpcws-jbws1205 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
         <include name="webservices.xml"/>
         <include name="simple-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-test.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
@@ -2365,93 +2366,93 @@
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
         <include name="webservices.xml"/>
         <include name="test-mapping.xml"/>
         <include name="wsdl/**"/>
         <include name="jboss-web.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
         <include name="simple-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1205-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1205-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/Client/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/Client/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
         <include name="test-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws1303 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1303/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1303/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1303-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1303-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1303/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1303/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
-
+    
     <!-- jaxrpc-jbws1316 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1316.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1316/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1316/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
-      	<include name="jboss-wsse-server.xml"/>      	
+        <include name="jboss-wsse-server.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1316-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1316/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1316/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1316/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
-  	
+    
     <!-- jaxrpc-jbws1378 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1378/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1378/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1378/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1378/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -2459,12 +2460,12 @@
     </war>
     
     <!-- jaxrpc-jbws1384 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1384/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1384/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1384/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1384/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -2472,12 +2473,12 @@
     </war>
     
     <!-- jaxrpc-jbws1386 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1386/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1386/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -2485,12 +2486,12 @@
     </war>
     
     <!-- jaxrpc-jbws1410 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1410/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1410/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -2498,12 +2499,12 @@
     </war>
     
     <!-- jaxrpc-jbws1427 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1427.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1427/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/jbws1427/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1427/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1427/META-INF">
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -2512,48 +2513,48 @@
     </jar>
     
     <!-- jbossws-jbws1619 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1619/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1619/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1619-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jbws1619/ClientHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1619/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1619/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jbossws-jbws1647 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1647-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1647/rpclit/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1647-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/>
@@ -2561,7 +2562,7 @@
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1647/doclit/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -2569,191 +2570,195 @@
     </war>
     
     <!-- jbossws-jbws1653 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1653-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jbws1653/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-jbws1762 -->
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="ejb-jar.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/packaged">
         <include name="jboss.xml"/>
       </metainf>
     </jar>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
-    <unjar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
-    <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar/META-INF" file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml" 
-      overwrite="true"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar"/>
+    <unjar src="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar"/>
+    <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar/META-INF"
+      file="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml" overwrite="true"/>
     
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1762/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-web.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
-    <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.war"/>
+    <unwar src="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.war"/>
     
-    <ear jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml">
-      <fileset dir="${tests.output.dir}/libs">
+    <ear jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.ear"
+      appxml="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/packaged/application.xml">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws1762-packaged.jar"/>
         <include name="jaxrpc-jbws1762-packaged.war"/>
       </fileset>
     </ear>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear"/>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
-    <copy file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/>
-    <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war">
-      <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
+    <copy file="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/exploded/application.xml"
+      todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/>
+    <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war">
+      <fileset dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.war"/>
     </copy>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/>
-    <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar">
-      <fileset dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/>
+    <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar">
+      <fileset dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.jar"/>
     </copy>
     
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar">
-      <fileset dir="${tests.output.dir}/libs">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.sar">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-jbws1762-packaged.war"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF">
         <include name="jboss-service.xml"/>
       </metainf>
     </jar>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/>
-    <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
-    <copy todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF" file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"/>
-    <unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar"/>
+    <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
+    <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar/META-INF"
+      file="${tests.output.dir}/test-resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"/>
+    <unwar src="${tests.output.dir}/test-libs/jaxrpc-jbws1762-packaged.war"
+      dest="${tests.output.dir}/test-libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/>
     
     <!-- jaxrpc-jbws1792 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1792/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1792/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1792/TestHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="custom-endpoint-config.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1792-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jbws1792/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1792/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1792/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1792/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-marshall-doclit.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/*ResponseStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-marshall-rpclit.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/marshall-rpclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-rpclit-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/marshall-rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/marshall-rpclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-outparam.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-outparam.war" webxml="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-outparam.war" webxml="${tests.output.dir}/test-resources/jaxrpc/outparam/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/outparam/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
@@ -2761,66 +2766,66 @@
     </war>
     
     <!-- jaxrpc-overloaded -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-overloaded.war" webxml="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-overloaded.war" webxml="${tests.output.dir}/test-resources/jaxrpc/overloaded/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
         <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/overloaded/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-overloaded-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-overloaded-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
         <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/overloaded/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/overloaded/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/overloaded/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-utf16 -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/test-resources/jaxrpc/utf16/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/utf16/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/utf16/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-utf16-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-utf16-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/utf16/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/utf16/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsdlpublish -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsdlpublish/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsdlpublish/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-web.xml"/>
@@ -2829,8 +2834,8 @@
     </war>
     
     <!-- jaxrpc-wsse-account-signup.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/>
@@ -2839,293 +2844,293 @@
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="jboss-wsse-server.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsse-rpc.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="jboss-wsse-server.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-none-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF">
         <include name="application-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsse-simple-sign-encrypt -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-web.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/simple-sign-encrypt">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/simple-sign-encrypt">
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsse-sign-fault.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-web.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-fault">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-fault">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-fault">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-fault">
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsse-sign-encrypt-fault.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-web.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-encrypt-fault">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-encrypt-fault">
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war -->
-    <replace file="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <replace file="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-web.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-wsse-web-client.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-web-client.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/webclient/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="jboss-wsse-server.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/webclient/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
     
     <!-- jaxrpc-wsse-username -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/>
       </fileset>
-      <fileset dir="${tests.output.dir}/resources">
+      <fileset dir="${tests.output.dir}/test-resources">
         <include name="*.properties"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/username/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -3133,18 +3138,18 @@
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/username/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -3154,120 +3159,120 @@
     </jar>
     
     <!-- jaxrpc-xop-doclit without handlers -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-xop-doclit with handlers -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
         <include name="webservices.xml"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-xop-rpclit without handlers -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-xop-rpclit with handlers -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
         <include name="webservices.xml"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
         <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>

Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -22,63 +22,63 @@
   
   <target name="build-jars-jaxws" description="Build the deployments.">
     
-    <mkdir dir="${tests.output.dir}/libs"/>
+    <mkdir dir="${tests.output.dir}/test-libs"/>
     
     <!-- jaxws-benchmark-doclit -->
-    <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
         <include name="org/jboss/test/ws/benchmark/jaxws/**/*.xml"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/WEB-INF">
         <include name="wsdl/**"/>
       </webinf>
     </war>
     
-    <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF">
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/benchmark/jaxws/doclit/ri/WEB-INF">
         <include name="handlers.xml"/>
         <include name="sun-jaxws.xml"/>
       </webinf>
     </war>
     
     <!-- esb adoption -->
-    <jar jarfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.esb">
-      <metainf dir="${tests.output.dir}/resources/benchmark/jaxws/esb/META-INF">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-doclit.esb">
+      <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb/META-INF">
         <include name="*.xml"/>
       </metainf>
-      <fileset dir="${tests.output.dir}/libs">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxws-benchmark-doclit.war"/>
       </fileset>
-      <fileset dir="${tests.output.dir}/resources/benchmark/jaxws/esb">
+      <fileset dir="${tests.output.dir}/test-resources/benchmark/jaxws/esb">
         <include name="*.xml"/>
       </fileset>
     </jar>
     
     <!-- jaxws-epr -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-epr.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/epr/*.class"/>
         <exclude name="org/jboss/test/ws/jaxws/epr/*TestCase.class"/>
       </fileset>
     </jar>
     
     <!-- jaxws-fastinfoset -->
-    <war warfile="${tests.output.dir}/libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/resources/jaxws/fastinfoset/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/test-resources/jaxws/fastinfoset/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class"/>
       </classes>
     </war>
     
     <!-- jaxws-handlerlifecycle -->
-    <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/>
         <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/>
         <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/>
@@ -88,58 +88,58 @@
         <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/>
         <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF">
         <include name="jaxws-endpoint-config.xml"/>
       </webinf>
     </war>
     
-    <jar jarfile="${tests.output.dir}/libs/jaxws-handlerlifecycle-client.jar">
-      <metainf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/META-INF">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/META-INF">
         <include name="*.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxws-json -->
-    <war warfile="${tests.output.dir}/libs/jaxws-json.war" webxml="${tests.output.dir}/resources/jaxws/json/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-json.war" webxml="${tests.output.dir}/test-resources/jaxws/json/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/json/JsonEndpoint.class"/>
       </classes>
     </war>
     
     <!-- jaxws-jaxbintros -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/resources/jaxws/jaxbintros/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jaxbintros/**/*.class"/>
       </classes>
       
-      <webinf dir="${tests.output.dir}/resources/jaxws/jaxbintros/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF">
         <include name="*.xml"/>
         <include name="**/*.wsdl"/>
       </webinf>
     </war>
     
     <!-- jaxws-jbws771 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws771.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws771.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws771/*.class"/>
         <exclude name="org/jboss/test/ws/jaxws/jbws771/*TestCase.class"/>
       </fileset>
     </jar>
     
     <!-- jaxws-jbws871 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
       </classes>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws871-rpc-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
         <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws871/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -148,71 +148,71 @@
     </jar>
     
     <!-- jaxws-jbws1172 -->
-    <war destfile="${tests.output.dir}/libs/jaxws-jbws1172.war" webxml="${tests.output.dir}/resources/jaxws/jbws1172/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1172.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1172/NonValidatingEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/jbws1172/ValidatingEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/jbws1172/types/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/jbws1172/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1172/WEB-INF">
         <include name="wsdl/**"/>
       </webinf>
     </war>
     
     <!-- jaxws-jbws1666 -->
-    <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <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>
     
     <!-- jaxws-jbws1809 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws1809.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <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}/resources/jaxws/jbws1809/META-INF"/>
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF"/>
     </jar>
     
     <!-- jaxws-jbws1814 -->
-    <war warfile="${tests.output.dir}/libs/jaxws-jbws1814.war" webxml="${tests.output.dir}/resources/jaxws/jbws1814/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1814.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1814/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1814/HelloJavaBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/jbws1814/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1814/WEB-INF">
         <include name="*"/>
       </webinf>
     </war>
     
     <!-- jaxws-jbws1850 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws1850.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1850.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.class"/>
       </fileset>
     </jar>
     
     <!-- jaxws-jbws1909 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws1909.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1909.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1909/*.class"/>
         <exclude name="org/jboss/test/ws/jaxws/jbws1909/*TestCase.class"/>
       </fileset>
     </jar>
     
     <!-- jaxws-jbws1988 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws1988.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1988.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1988/*.class"/>
         <exclude name="org/jboss/test/ws/jaxws/jbws1988/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1988/META-INF">
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss.xml"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1988.sar">
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1988.sar">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1988/META-INF">
         <include name="jboss-service.xml"/>
         <include name="login-config.xml"/>
         <include name="jbossws-users.properties"/>
@@ -221,30 +221,30 @@
     </jar>
     
     <!-- jaxws-jbws1991 -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-jbws1991.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1991.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/jbws1991/*.class"/>
         <exclude name="org/jboss/test/ws/jaxws/jbws1991/*TestCase.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/jbws1991/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1991/META-INF">
         <include name="jboss-wsse-server.xml"/>
         <include name="jboss.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxws-webserviceref -->
-    <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
       </classes>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="wsdl/**"/>
@@ -253,23 +253,24 @@
         <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
       </manifest>
     </jar>
-    <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-servlet-client.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF-client/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF">
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF-client">
         <include name="jboss-web.xml"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-ejb3-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
@@ -277,23 +278,23 @@
         <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF">
         <include name="jboss.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/>
       </fileset>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF-secure">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
@@ -301,18 +302,18 @@
         <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/>
       </manifest>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-override-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF-override">
         <include name="jbossws-client-config.xml"/>
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF">
         <include name="wsdl/**"/>
       </metainf>
       <manifest>
@@ -321,18 +322,18 @@
     </jar>
     
     <!-- jaxws-webserviceref-secure -->
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/>
       </fileset>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-secure-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF-secure">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
@@ -340,13 +341,13 @@
         <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/>
       </manifest>
     </jar>
-    <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-webserviceref-override-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/webserviceref/META-INF-override">
         <include name="jbossws-client-config.xml"/>
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
@@ -358,68 +359,71 @@
     </jar>
     
     <!-- jaxws-wsdd -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war" webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wsdd.war" webxml="${tests.output.dir}/test-resources/jaxws/wsdd/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsdd/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/wsdd/WEB-INF">
         <include name="webservices.xml"/>
       </webinf>
     </war>
     
     <!-- jaxws-wsaddressing-action -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
       </classes>
     </war>
     
     <!-- jaxws-wsaddressing-replyto -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
       </classes>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxws-jbossws-client-config.xml"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
       </classes>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jbossws-client-config.xml"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
-    <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/>
         <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
@@ -427,63 +431,63 @@
     </war>
     
     <!-- jaxws-wseventing -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/ws/eventing/*.class"/>
         <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF">
         <include name="wsdl/**"/>
       </webinf>
     </war>
     
     <!-- jaxws-wsrm -->
-    <war warfile="${tests.output.dir}/libs/jaxws-wsrm.war" webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.class"/>
         <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.class"/>
         <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF">
         <include name="wsrm-jaxws-endpoint-config.xml"/>
       </webinf>
-      <zipfileset dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" prefix="WEB-INF/wsdl"/>
-      <zipfileset file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/>
+      <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" prefix="WEB-INF/wsdl"/>
+      <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/>
     </war>
     
-    <war warfile="${tests.output.dir}/libs/jaxws-secured-wsrm.war" webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.class"/>
         <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.class"/>
         <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF">
         <include name="wsrm-jaxws-endpoint-config.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/WEB-INF">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
-      <zipfileset dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/wsdl" prefix="WEB-INF/wsdl"/>
-      <zipfileset file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/>
+      <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/wsdl" prefix="WEB-INF/wsdl"/>
+      <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" prefix="META-INF"/>
     </war>
     
-    <jar jarfile="${tests.output.dir}/libs/jaxws-wsrm-client.jar">
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-wsrm-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF">
         <include name="wsrm-jaxws-client-config.xml"/>
       </metainf>
     </jar>
     
-    <jar jarfile="${tests.output.dir}/libs/jaxws-secured-wsrm-client.jar">
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF">
         <include name="wsrm-jaxws-client-config.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/META-INF">
         <include name="jboss-wsse-client.xml"/>
       </metainf>
     </jar>
@@ -492,4 +496,4 @@
     
   </target>
   
-</project>
+</project>
\ No newline at end of file

Modified: stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -16,187 +16,190 @@
   
   <target name="build-samples-jaxrpc" description="Build the jaxrpc samples deployments">
     
-    <mkdir dir="${tests.output.dir}/libs"/>
+    <mkdir dir="${tests.output.dir}/test-libs"/>
     
     <!-- jaxrpc-samples-docstyle-bare -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-bare.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-bare-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-docstyle-wrapped -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-wrapped.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-dynamichandler -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/dynamichandler/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/dynamichandler/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/dynamichandler/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-exception -->
-    <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-exception-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionService.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/exception/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-handler -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/handler/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-handler-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/handler/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/handler/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-holder -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/holder/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-holder-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/holder/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/holder/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-jmstransport -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jmstransport.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jmstransport/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="webservices.xml"/>
@@ -204,23 +207,23 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar">
-      <fileset dir="${tests.output.dir}/libs">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jmstransport.sar">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxrpc-samples-jmstransport.jar"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jmstransport/META-INF">
         <include name="jboss-service.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-jsr109ejb-rpc -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -228,12 +231,12 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -242,14 +245,14 @@
     </jar>
     
     <!-- jaxrpc-samples-jsr109ejb-doc -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-doc.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jboss.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -257,13 +260,13 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -272,174 +275,176 @@
     </jar>
     
     <!-- jaxrpc-samples-jsr109pojo-rpc -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-rpc.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="jboss-web.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-jsr109pojo-doc -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-doc.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-message -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/message/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/message/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-message-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/message/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/message/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-mtom -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
         <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar">
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-oneway -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-rpcstyle -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-rpcstyle-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-secureejb -->
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="ejb-jar.xml"/>
@@ -447,13 +452,13 @@
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
@@ -462,53 +467,54 @@
     </jar>
     
     <!-- jaxrpc-samples-serviceref -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/serviceref/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF">
         <include name="webservices.xml"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
-    <war destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-servlet-client.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-serviceref-ejb-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejb-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/serviceref/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
         <include name="ejb-jar.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
@@ -516,126 +522,125 @@
     </jar>
     
     <!-- jaxrpc-samples-swa -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/swa/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-swa-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/swa/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/swa/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-store-pass-encrypt.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war"
-      webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-store-pass-encrypt.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-store-pass-encrypt-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="wsdl/**"/>
         <include name="jaxrpc-mapping.xml"/>
       </metainf>
     </jar>
-
+    
     <!-- jaxrpc-samples-wsaddr-hello.war -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello.war"
-      webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-replyto.war"
-      webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-replyto.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
         <include name="replyto-jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
         <include name="replyto-jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
-     </jar>
+    </jar>
     
     <!-- jaxrpc-samples-wsbpel -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
         <include name="webservices.xml"/>
         <include name="classes/bpel-application.xml"/>
       </webinf>
@@ -644,12 +649,12 @@
         <include name="wsdl/**"/>
       </webinf>
     </war>
-    <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
       </metainf>
@@ -659,72 +664,73 @@
     </jar>
     
     <!-- jaxrpc-samples-wssecurity-sign -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-sign">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
     </jar>
     
     <!-- jaxrpc-samples-wssecurity-encrypt -->
-    <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt.war"
+      webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-encrypt">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity">
+      <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
         <include name="application-client.xml"/>
         <include name="jboss-client.xml"/>
         <include name="jboss-wsse-client.xml"/>
       </metainf>
-      <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="wsdl/**"/>
       </metainf>
@@ -734,4 +740,4 @@
     
   </target>
   
-</project>
+</project>
\ No newline at end of file

Modified: stack/native/trunk/ant-import-tests/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-samples-jaxws.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-samples-jaxws.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -16,64 +16,64 @@
   
   <target name="build-samples-jaxws" description="Build the jaxws samples deployments">
     
-    <mkdir dir="${tests.output.dir}/libs"/>
-  	
-  	<!-- jaxws-samples-dar -->
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <mkdir dir="${tests.output.dir}/test-libs"/>
+    
+    <!-- jaxws-samples-dar -->
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/dar/Bus.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/DarRequest.class"/>
-	    <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponse.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/Route.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarRequest.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponse.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/Route.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
       </fileset>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/dar/generated/*.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/ClientHelper.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/ClientHelper.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/Client.class"/>
       </fileset>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar-addressing.jar">
-      <fileset dir="${tests.output.dir}/classes">
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/AsyncProcessRequest.class"/>
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
+        <include name="org/jboss/test/ws/jaxws/samples/dar/AsyncProcessRequest.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/Bus.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/DarMessageBean.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/DarRequest.class"/>
-	    <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponse.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/ReplyConverter.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/Route.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/>
-    	<include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/generated/reply/*.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarMessageBean.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarRequest.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponse.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/ReplyConverter.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/Route.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/generated/reply/*.class"/>
       </fileset>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar-addressing-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/dar/generated/*.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/ClientHelper.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/AddressingClient.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/ClientHelper.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/AddressingClient.class"/>
       </fileset>
     </jar>
-  	<war warfile="${tests.output.dir}/libs/jaxws-samples-dar-addressing-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/dar/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/generated/reply/*.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/DarReplyEndpointImpl.class"/>
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/dar/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
+        <include name="org/jboss/test/ws/jaxws/samples/dar/generated/reply/*.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarReplyEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/ReplyToServlet.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/dar/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/WEB-INF">
         <include name="jboss-web.xml"/>
-      	<include name="wsdl/reply.wsdl"/>
+        <include name="wsdl/reply.wsdl"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar-jms.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/dar/Bus.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/DarJMSEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/>
@@ -84,112 +84,111 @@
         <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/>
       </fileset>
     </jar>
-    <war jarfile="${tests.output.dir}/libs/jaxws-samples-dar-jms-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/dar/WEB-INF-jms/web.xml">
-      <fileset dir="${tests.output.dir}/classes">
+    <war jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/dar/WEB-INF-jms/web.xml">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/dar/generated/*.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/ClientHelper.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/dar/JMSClient.class"/>
       </fileset>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/dar/WEB-INF-jms">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/WEB-INF-jms">
         <include name="jboss-web.xml"/>
       </webinf>
     </war>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar-jms-client.jar">
-      <fileset dir="${tests.output.dir}/classes">
-      	<include name="org/jboss/test/ws/jaxws/samples/dar/DarResponseMessageBean.class"/>
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
+        <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponseMessageBean.class"/>
       </fileset>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-dar-jms-client.sar">
-      <fileset dir="${tests.output.dir}/libs">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client.sar">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxws-samples-dar-jms-client.war"/>
         <include name="jaxws-samples-dar-jms-client.jar"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/samples/dar/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
         <include name="jboss-service.xml"/>
       </metainf>
     </jar>
-  	
     
     <!-- jaxws-samples-jmstransport -->
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jmstransport.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.class"/>
       </fileset>
     </jar>
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jmstransport.sar">
-      <fileset dir="${tests.output.dir}/libs">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar">
+      <fileset dir="${tests.output.dir}/test-libs">
         <include name="jaxws-samples-jmstransport.jar"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/samples/jmstransport/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
         <include name="jboss-service.xml"/>
       </metainf>
     </jar>
-  	
-  	<!-- jaxws-samples-news -->
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-news-step1-newspaper.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    
+    <!-- jaxws-samples-news -->
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-newspaper.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/PressReleaseEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOMEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOMEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/>
       </fileset>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-news-step1-agency.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-agency.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/Agency.class"/>
       </fileset>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-news-step1-printer.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-printer.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/generated/printer/**/*.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/Printer.class"/>
       </fileset>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-news-step2-newspaper.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-newspaper.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/>
-      	<include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/>
+        <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/>
       </fileset>
-  	  <metainf dir="${tests.output.dir}/resources/jaxws/samples/news/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF">
         <include name="jboss-wsse-server.xml"/>
-  	    <include name="bob-sign_enc.jks"/>
-  	    <include name="wsse10.truststore"/>
+        <include name="bob-sign_enc.jks"/>
+        <include name="wsse10.truststore"/>
       </metainf>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-news-step2-agency.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-agency.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/Agency.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/SecureAgency.class"/>
       </fileset>
-      <metainf dir="${tests.output.dir}/resources/jaxws/samples/news/META-INF">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF">
         <include name="jboss-wsse-client.xml"/>
         <include name="alice-sign_enc.jks"/>
         <include name="wsse10.truststore"/>
       </metainf>
     </jar>
-  	<jar jarfile="${tests.output.dir}/libs/jaxws-samples-news-step2-printer.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-printer.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/news/generated/printer/**/*.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/Printer.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/news/SecurePrinter.class"/>
@@ -197,8 +196,8 @@
     </jar>
     
     <!-- jaxws-samples-wsaddressing -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
@@ -207,11 +206,11 @@
     </war>
     
     <!-- jaxws-samples-wseventing.war -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wseventing/Sysmon**.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF">
         <include name="wsdl/jboss-web.xml"/>
         <include name="wsdl/sysmon.wsdl"/>
         <include name="wsdl/ws-eventing.wsdl"/>
@@ -220,109 +219,104 @@
       </webinf>
     </war>
     
-    <jar destfile="${tests.output.dir}/libs/jaxws-samples-wseventing-sink.jar">
-      <fileset dir="${tests.output.dir}/classes">
+    <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing-sink.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wseventing/EventSink*.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wseventing/SystemStatus.class"/>
       </fileset>
     </jar>
     
     <!-- jaxws-samples-wsrm -->
-    <war
-       warfile="${tests.output.dir}/libs/jaxws-samples-wsrm.war"
-       webxml="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/web.xml">
-       <classes dir="${tests.output.dir}/classes">
-          <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
-       </classes>
-       <zipfileset
-          dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl" 
-          prefix="WEB-INF/wsdl"/>
-        <zipfileset
-          file="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml" 
-          prefix="META-INF"/>
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
+        <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+      </classes>
+      <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/>
+      <zipfileset file="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml" prefix="META-INF"/>
     </war>
-
-    <jar jarfile="${tests.output.dir}/libs/jaxws-samples-wsrm-client.jar">
-      <metainf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/META-INF">
+    
+    <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar">
+      <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/META-INF">
         <include name="wsrm-jaxws-client-config.xml"/>
       </metainf>
     </jar>
-
+    
     <!-- jaxws-samples-wssecurity-encrypt -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-encrypt.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
     
     <!-- jaxws-samples-wssecurity-sign -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-sign/WEB-INF">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
     </war>
     
     <!-- jaxws-samples-wssecurity-username -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-username.war"
-      webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-username/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-username.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-username/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-username/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-username/WEB-INF">
         <include name="jboss-web.xml"/>
         <include name="jboss-wsse-server.xml"/>
       </webinf>
     </war>
     
     <!-- jaxws-samples-wssecurityAnnotatedpolicy-encrypt -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"
-      webxml="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/Hello.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF">
         <include name="Policy.xml"/>
       </webinf>
     </war>
     
     <!-- jaxws-samples-wssecuritypolicy-encrypt -->
-    <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecuritypolicy-encrypt.war"
-      webxml="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/classes">
+    <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecuritypolicy-encrypt.war"
+      webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
         <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/Hello.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.class"/>
         <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/UserType.class"/>
       </classes>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>
       </webinf>
-      <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF">
+      <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF">
         <include name="wsdl/**"/>
       </webinf>
     </war>
@@ -331,4 +325,4 @@
     
   </target>
   
-</project>
+</project>
\ No newline at end of file

Modified: stack/native/trunk/ant-import-tests/build-testsuite-artifacts.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite-artifacts.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-testsuite-artifacts.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -9,206 +9,163 @@
 <!-- $Id$ -->
 
 <project name="JBossWS-Tools" default="build-tools-artifacts" basedir="../..">
-   
-   <description>JBossWS testsuite artifacts builder</description>
-   
-   <import file="build.xml"/>  
-   <path id="tools.classpath">
-      <path refid="jbossws.client.classpath"/>
-      <pathelement location="${jboss.testsuite}/output/classes"/>
-   </path>
-   
-   <!-- Define a taskdef for the wstools ant task -->
-   <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"
-      classpathref="tools.classpath"/>  
-   
-   <target name="build-tools-artifacts" description="Build the deployments.">
-      <!-- jaxrpc-rpclit  -->
-      <echo>Working on jbws64-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws64/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws64-config.xml"/>
-
-      <echo>Working on jbws68-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws68/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws68-config.xml"/>
-
-      <echo>Working on jbws70-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws70/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws70-config.xml"/>
-
-      <echo>Working on jbws71-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws71/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws71-config.xml"/>
-      
-      <echo>Working on jbws82-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws82/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws82-config.xml"/>
-      
-      <echo>Working on jbws124-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws124/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws124-config.xml"/>
-      
-      <echo>Working on jbws128-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws128/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws128-config.xml"/>
-      
-      <echo>Working on jbws163-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws163/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws163-config.xml"/>
-      <echo>Working on jbws165-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws165/META-INF-both"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws165-config.xml"/>
-      
-      <echo>Working on jbws167-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws167/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws167-config.xml"/>
-<!-- FIXME: JBWS-603 -->
-      <echo>Working on jbws251-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws251/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws251-config.xml"/>
-      
-      <echo>Working on jbws309-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws309/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws309-config.xml"/>
-<!-- FIXME: JBWS-605-->      
-      <echo>Working on jbws316-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws316/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws316-config.xml"/>
-
-      <echo>Working on jbws331-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws331/WS-META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws331-config.xml"/>
-
-      <echo>Working on jbws358-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws358/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws358-config.xml"/>
-      
-      <echo>Working on jbws377-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws377/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws377-config.xml"/>
-      
-      <echo>Working on jbws383-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws383/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws383-config.xml"/>
-
-      <echo>Working on jbws423-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws423/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws423-config.xml"/>
-<!-- FIXME: JBWS-608 -->
-      <echo>Working on jbws424-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws424/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws424-config.xml"/>
-
-      <echo>Working on jbws425-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws425/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws425-config.xml"/>
-      
-      <echo>Working on jbws456-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws456/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws456-config.xml"/>
-
-      <echo>Working on jbws463-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws463/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws463-config.xml"/>
-
-      <echo>Working on jbws464-config.xml</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws464/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws464-config.xml"/>
-      
-      <echo>Working on addressrewrite</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/addressrewrite/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/addressrewrite-config.xml"/>
-      
-      <echo>Working on admindevel</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/admindevel/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/admindevel-config.xml"/>
-<!-- FIXME: JBWS-613       
-      <echo>Working on attachment</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/attachment/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/attachment-config.xml"/>
-      </wstools>
--->
-
-      <echo>Working on encstyle/document</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/encstyle/document/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/encstyle-document-config.xml"/>
-      
-      <echo>Working on encstyle/rpc</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/encstyle/rpc/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/encstyle-rpc-config.xml"/>
-
-<!-- FIXME: JBWS-615 -->
-      <echo>Working on exception</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/exception/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/exception-config.xml"/>
-
-      <echo>Working on handlerflow</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/handlerflow/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/handlerflow-config.xml"/>
-<!-- FIXME: JBWS-617    -->   
-      <echo>Working on marshalltest-doclit</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-doclit/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/marshalltest-doclit-config.xml"/>
-<!-- FIXME: JBWS-618 -->   
-      <echo>Working on marshalltest-rpclit</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-rpclit/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/marshalltest-rpclit-config.xml"/>
-
-      <echo>Working on message</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/message/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/message-config.xml"/>
-
-      <echo>Working on samples/common</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/samples/common/META-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/samples-common-config.xml"/>
-      
-      <echo>Working on samples2/rpclit</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/samples2/rpclit"
-         config="${test.resources.dir}/tools/testsuite-configs/samples2-rpclit-config.xml"/>
-      
-      <echo>Working on samples2/doclit</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit"
-         config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-config.xml"/>
-      
-      <echo>Working on samples2/doclit-bare</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit-bare"
-         config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-bare-config.xml"/>
-      
-      <echo>Working on utf16</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/utf16/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/utf16-config.xml"/>
-      
-      <echo>Working on ws4eesimple</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple/WEB-INF"
-         config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-config.xml"/>
-
-      <echo/>
-      <echo>WSDL->Java</echo>
-      <echo>----------</echo>
-      <echo>Working on ws4eesimple-client</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple-client"
-         config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-client-config.xml"/>
-
-<!-- FIXME:JBWS-623 -->
-      <echo>Working on jbws-349</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws349"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws349-config.xml"/>
-
-<!-- FIXME: JBWS-624  -->
-      <echo>Working on jbws381</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws381"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws381-config.xml"/>
-<!-- FIXME: JBWS-625 -->
-      <echo>Working on jbws484</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws484"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws484-config.xml"/>
-      
-      <echo>Working on jbws153</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/jbws153"
-         config="${test.resources.dir}/tools/testsuite-configs/jbws153-config.xml"/>
-
-      <echo>Working on samples/client-appl</echo>
-      <wstools dest="${build.test.resources.dir}/testsuite/samples/client-appl"
-         config="${test.resources.dir}/tools/testsuite-configs/samples-client-config.xml"/>
-   </target>
+  
+  <description>JBossWS testsuite artifacts builder</description>
+  
+  <import file="build.xml"/>
+  <path id="tools.classpath">
+    <path refid="jbossws.client.classpath"/>
+    <pathelement location="${jboss.testsuite}/output/classes"/>
+  </path>
+  
+  <!-- Define a taskdef for the wstools ant task -->
+  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools" classpathref="tools.classpath"/>
+  
+  <target name="build-tools-artifacts" description="Build the deployments.">
+    <!-- jaxrpc-rpclit  -->
+    <echo>Working on jbws64-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws64/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws64-config.xml"/>
+    
+    <echo>Working on jbws68-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws68/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws68-config.xml"/>
+    
+    <echo>Working on jbws70-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws70/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws70-config.xml"/>
+    
+    <echo>Working on jbws71-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws71/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws71-config.xml"/>
+    
+    <echo>Working on jbws82-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws82/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws82-config.xml"/>
+    
+    <echo>Working on jbws124-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws124/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws124-config.xml"/>
+    
+    <echo>Working on jbws128-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws128/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws128-config.xml"/>
+    
+    <echo>Working on jbws163-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws163/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws163-config.xml"/>
+    <echo>Working on jbws165-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws165/META-INF-both" config="${test.resources.dir}/tools/testsuite-configs/jbws165-config.xml"/>
+    
+    <echo>Working on jbws167-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws167/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws167-config.xml"/>
+    <!-- FIXME: JBWS-603 -->
+    <echo>Working on jbws251-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws251/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws251-config.xml"/>
+    
+    <echo>Working on jbws309-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws309/META-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws309-config.xml"/>
+    <!-- FIXME: JBWS-605-->
+    <echo>Working on jbws316-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws316/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws316-config.xml"/>
+    
+    <echo>Working on jbws331-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws331/WS-META-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws331-config.xml"/>
+    
+    <echo>Working on jbws358-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws358/META-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws358-config.xml"/>
+    
+    <echo>Working on jbws377-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws377/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws377-config.xml"/>
+    
+    <echo>Working on jbws383-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws383/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws383-config.xml"/>
+    
+    <echo>Working on jbws423-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws423/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws423-config.xml"/>
+    <!-- FIXME: JBWS-608 -->
+    <echo>Working on jbws424-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws424/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws424-config.xml"/>
+    
+    <echo>Working on jbws425-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws425/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws425-config.xml"/>
+    
+    <echo>Working on jbws456-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws456/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws456-config.xml"/>
+    
+    <echo>Working on jbws463-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws463/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws463-config.xml"/>
+    
+    <echo>Working on jbws464-config.xml</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws464/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/jbws464-config.xml"/>
+    
+    <echo>Working on addressrewrite</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/addressrewrite/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/addressrewrite-config.xml"/>
+    
+    <echo>Working on admindevel</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/admindevel/META-INF" config="${test.resources.dir}/tools/testsuite-configs/admindevel-config.xml"/>
+    <!-- FIXME: JBWS-613       
+    <echo>Working on attachment</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/attachment/WEB-INF"
+    config="${test.resources.dir}/tools/testsuite-configs/attachment-config.xml"/>
+    </wstools>
+    -->
+    
+    <echo>Working on encstyle/document</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/encstyle/document/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/encstyle-document-config.xml"/>
+    
+    <echo>Working on encstyle/rpc</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/encstyle/rpc/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/encstyle-rpc-config.xml"/>
+    
+    <!-- FIXME: JBWS-615 -->
+    <echo>Working on exception</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/exception/META-INF" config="${test.resources.dir}/tools/testsuite-configs/exception-config.xml"/>
+    
+    <echo>Working on handlerflow</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/handlerflow/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/handlerflow-config.xml"/>
+    <!-- FIXME: JBWS-617    -->
+    <echo>Working on marshalltest-doclit</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-doclit/META-INF"
+      config="${test.resources.dir}/tools/testsuite-configs/marshalltest-doclit-config.xml"/>
+    <!-- FIXME: JBWS-618 -->
+    <echo>Working on marshalltest-rpclit</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-rpclit/META-INF"
+      config="${test.resources.dir}/tools/testsuite-configs/marshalltest-rpclit-config.xml"/>
+    
+    <echo>Working on message</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/message/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/message-config.xml"/>
+    
+    <echo>Working on samples/common</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/samples/common/META-INF" config="${test.resources.dir}/tools/testsuite-configs/samples-common-config.xml"/>
+    
+    <echo>Working on samples2/rpclit</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/samples2/rpclit" config="${test.resources.dir}/tools/testsuite-configs/samples2-rpclit-config.xml"/>
+    
+    <echo>Working on samples2/doclit</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit" config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-config.xml"/>
+    
+    <echo>Working on samples2/doclit-bare</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit-bare" config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-bare-config.xml"/>
+    
+    <echo>Working on utf16</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/utf16/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/utf16-config.xml"/>
+    
+    <echo>Working on ws4eesimple</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple/WEB-INF" config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-config.xml"/>
+    
+    <echo/>
+    <echo>WSDL->Java</echo>
+    <echo>----------</echo>
+    <echo>Working on ws4eesimple-client</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple-client" config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-client-config.xml"/>
+    
+    <!-- FIXME:JBWS-623 -->
+    <echo>Working on jbws-349</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws349" config="${test.resources.dir}/tools/testsuite-configs/jbws349-config.xml"/>
+    
+    <!-- FIXME: JBWS-624  -->
+    <echo>Working on jbws381</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws381" config="${test.resources.dir}/tools/testsuite-configs/jbws381-config.xml"/>
+    <!-- FIXME: JBWS-625 -->
+    <echo>Working on jbws484</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws484" config="${test.resources.dir}/tools/testsuite-configs/jbws484-config.xml"/>
+    
+    <echo>Working on jbws153</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/jbws153" config="${test.resources.dir}/tools/testsuite-configs/jbws153-config.xml"/>
+    
+    <echo>Working on samples/client-appl</echo>
+    <wstools dest="${build.test.resources.dir}/testsuite/samples/client-appl" config="${test.resources.dir}/tools/testsuite-configs/samples-client-config.xml"/>
+  </target>
 </project>

Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite.xml	2008-04-21 13:56:55 UTC (rev 6573)
+++ stack/native/trunk/ant-import-tests/build-testsuite.xml	2008-04-21 14:41:53 UTC (rev 6574)
@@ -9,235 +9,256 @@
 <!-- $Id$ -->
 
 <project>
-
+  
   <property name="tests.output.dir" value="${core.dir}/output/tests"/>
   
   <import file="${core.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
-
-	<!-- Define excluded tests -->
-	<property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
+  
+  <!-- Define excluded tests -->
+  <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
   <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
   
-	<property name="tests.dir" value="${core.dir}/src/test"/>
-	<property name="tests.java.dir" value="${tests.dir}/java"/>
-	<property name="tests.resources.dir" value="${tests.dir}/resources"/>
+  <property name="tests.dir" value="${core.dir}/src/test"/>
+  <property name="tests.java.dir" value="${tests.dir}/java"/>
+  <property name="tests.resources.dir" value="${tests.dir}/resources"/>
   
-	<property name="tests.framework.dir" value="${core.dir}/src/test-framework"/>
-	<property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/>
-
-	<!--
-	  Init the various classpaths
-	-->
-	<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
-
-		<path id="ws.stack.classpath">
-			<pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/>
-         <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
-         <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
-         <pathelement location="${core.dir}/output/lib/jbossws-embedded.jar"/>
-         <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
-         <pathelement location="${core.dir}/output/lib/jboss-jaxws-ext.jar"/>
-         <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
-			<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
-			<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
-		</path>
-
+  <property name="tests.framework.dir" value="${core.dir}/src/test-framework"/>
+  <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/>
+  
+  <!--
+  Init the various classpaths
+  -->
+  <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
+    
+    <path id="ws.stack.classpath">
+      <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
+      <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
+      <pathelement location="${core.dir}/output/lib/jbossws-embedded.jar"/>
+      <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
+      <pathelement location="${core.dir}/output/lib/jboss-jaxws-ext.jar"/>
+      <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
+      <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
+      <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+    </path>
+    
     <path id="tests.extra.classpath">
-
-       <!-- embedded tests -->
-       <pathelement location="${core.dir}/thirdparty/jboss-kernel.jar"/>
-       <pathelement location="${core.dir}/thirdparty/jboss-dependency.jar"/>
-       <pathelement location="${core.dir}/thirdparty/jboss-reflect.jar"/>
-       <pathelement location="${core.dir}/thirdparty/jboss-mdr.jar"/>
-       <pathelement location="${core.dir}/thirdparty/jboss-common-core.jar"/>
-       <pathelement location="${core.dir}/thirdparty/servlet-api.jar"/>
-       <pathelement location="${core.dir}/thirdparty/webserver.jar"/>
-       <!-- / embedded tests -->
-
-         <pathelement location="${core.dir}/thirdparty/FastInfoset.jar"/>
-			<pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/>
-			<pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/>
-			<pathelement location="${core.dir}/thirdparty/jettison.jar"/>
-			<pathelement location="${core.dir}/thirdparty/policy.jar"/>
-         <pathelement location="${core.dir}/thirdparty/qdox.jar"/>
-         <pathelement location="${core.dir}/thirdparty/stax-api.jar"/>
-			<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
-         <pathelement location="${core.dir}/thirdparty/wstx.jar"/>
-         <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/>
+      
+      <!-- embedded tests -->
+      <pathelement location="${core.dir}/thirdparty/jboss-kernel.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jboss-dependency.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jboss-reflect.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jboss-mdr.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jboss-common-core.jar"/>
+      <pathelement location="${core.dir}/thirdparty/servlet-api.jar"/>
+      <pathelement location="${core.dir}/thirdparty/webserver.jar"/>
+      <!-- / embedded tests -->
+      
+      <pathelement location="${core.dir}/thirdparty/FastInfoset.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jettison.jar"/>
+      <pathelement location="${core.dir}/thirdparty/policy.jar"/>
+      <pathelement location="${core.dir}/thirdparty/qdox.jar"/>
+      <pathelement location="${core.dir}/thirdparty/stax-api.jar"/>
+      <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+      <pathelement location="${core.dir}/thirdparty/wstx.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jboss-jaxb-intros.jar"/>
     </path>
-
+    
     <!-- The jBPM BPEL classpath -->
-		<path id="jbpm.bpel.classpath">
-			<path refid="ws.stack.classpath"/>
-			<pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
-			<pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" />
-			<pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" />
-			<pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" />
-			<pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
-			<pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
-			<pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
-			<pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
-			<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
-			<pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
-		</path>
-
-	</target>
-
-	<!-- ================================================================== -->
-	<!-- Generating sources                                                 -->
-	<!-- ================================================================== -->
-
-	<target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">
-
-		<!-- Define the JAX-WS wsconsume task -->
-		<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">			
+    <path id="jbpm.bpel.classpath">
+      <path refid="ws.stack.classpath"/>
+      <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
+      <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar"/>
+      <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/>
+      <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/>
+      <pathelement location="${core.dir}/thirdparty/dom4j.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jaxen.jar"/>
+      <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+      <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/>
+    </path>
+    
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Generating sources                                                 -->
+  <!-- ================================================================== -->
+  
+  <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">
+    
+    <!-- Define the JAX-WS wsconsume task -->
+    <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
       <classpath refid="tests.client.classpath"/>
     </taskdef>
-
-		<wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true" fork="false"/>
-		<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-		<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-		<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-		<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-		<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-		<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
     
-		<wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-		<wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
-	</target>
-
-	<!--
-		 Generate BPEL sources
-	  -->
-	<target name="servicegen" depends="tests-compile" description="Generate the BPEL resources.">
-		<!-- create jbpm process archives -->
-		<mkdir dir="${tests.output.dir}/libs"/>
-		<zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
-			<fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" />
-		</zip>
-		<!-- Copy the BPEL sar -->
-		<copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>
-
-		<!-- generate wsdl binding and service definitions for bpel processes -->
-		<taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
-			<classpath refid="jbpm.bpel.classpath"/>
-		</taskdef>
-		<servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
-						outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"
-						bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" />
-	</target>
-
-	<!--
-		 Generate JAX-RPC sources
-	  -->
-	<target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts.">
-
-		<!-- Define the JAX-RPC tools task -->
-		<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
-			<classpath refid="ws.stack.classpath"/>
-			<classpath refid="thirdparty.classpath"/>
-			<classpath location="${core.dir}/thirdparty/concurrent.jar"/>
-			<classpath location="${tests.output.dir}/classes"/>
-			<classpath location="${tests.output.dir}"/>
-		</taskdef>
-
-		<!-- Generate JAX-RPC artifacts -->
-		<mkdir dir="${tests.output.dir}/wstools/java"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
-    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
-		<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
-		<move todir="${tests.output.dir}/wstools/java">
-			<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
-		</move>
+    <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="true" fork="false"/>
+    <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl"
+      package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    
+    <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder"
+      sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+  </target>
+  
+  <!--
+  Generate BPEL sources
+  -->
+  <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources.">
+    <!-- create jbpm process archives -->
+    <mkdir dir="${tests.output.dir}/test-libs"/>
+    <zip destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-process.zip">
+      <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel"/>
+    </zip>
+    <!-- Copy the BPEL sar -->
+    <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/test-libs"/>
+    
+    <!-- generate wsdl binding and service definitions for bpel processes -->
+    <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+      <classpath refid="jbpm.bpel.classpath"/>
+    </taskdef>
+    <servicegen processfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello-process.zip"
+      outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl"/>
+  </target>
+  
+  <!--
+  Generate JAX-RPC sources
+  -->
+  <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts.">
+    
+    <!-- Define the JAX-RPC tools task -->
+    <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
+      <classpath refid="ws.stack.classpath"/>
+      <classpath refid="thirdparty.classpath"/>
+      <classpath location="${core.dir}/thirdparty/concurrent.jar"/>
+      <classpath location="${tests.output.dir}/test-classes"/>
+      <classpath location="${tests.output.dir}"/>
+    </taskdef>
+    
+    <!-- Generate JAX-RPC artifacts -->
+    <mkdir dir="${tests.output.dir}/wstools/java"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
+      config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
+    <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
     <move todir="${tests.output.dir}/wstools/java">
+      <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+    </move>
+    <move todir="${tests.output.dir}/wstools/java">
       <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/>
     </move>
     <move todir="${tests.output.dir}/wstools/java">
       <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/>
     </move>
-
-		<!-- Copy generated resources -->
-		<copy todir="${tests.output.dir}/resources">
-			<fileset dir="${tests.output.dir}/wstools/resources">
-				<include name="**/*.wsdl"/>
-				<include name="**/*.xml"/>
-			</fileset>
-		</copy>
-		<!-- Copy resources that cannot (yet) be generated -->
-		<copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true">
-			<fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
-			<filterset>
-				<filter token="jboss.bind.address" value="${node0}"/>
-			</filterset>
-		</copy>
-	</target>
-
-	<!--
-		 Generate JAX-WS sources
-	  -->
-	<target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts.">
-
-		<!-- Define the JAX-WS wsprovide task -->
-		<taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
-			<classpath refid="tests.client.classpath"/>
-			<classpath location="${tests.output.dir}/classes"/>
-			<classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
-		</taskdef>
-
-		<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/>
-		<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
-	</target>
-
-	<target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
-		<macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/>
-	</target>
-
-	<!-- ================================================================== -->
-	<!-- Compiling                                                          -->
-	<!-- ================================================================== -->
-
-	<target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
-		<macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
-		<macro-compile-classes srcdir="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
-		<macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/>
-	</target>
-
-	<!-- ================================================================== -->
-	<!-- Building                                                           -->
-	<!-- ================================================================== -->
-
-	<!-- Copy resources -->
-	<target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
-		<macro-copy-resources srcdir="${core.dir}/src/test-framework"/>
-		<macro-copy-resources srcdir="${core.dir}/src/test"/>
-	</target>
-
-	<target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
-		<ant antfile="${core.dir}/ant-import-tests/build-jars-interop.xml" target="build-jars-interop"/>
-		<ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/>
-		<ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
-		<ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
-		<ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
-		<ant antfile="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
-		<ant antfile="${core.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
-	</target>
-
-	<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
-
+    
+    <!-- Copy generated resources -->
+    <copy todir="${tests.output.dir}/test-resources">
+      <fileset dir="${tests.output.dir}/wstools/resources">
+        <include name="**/*.wsdl"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+    <!-- Copy resources that cannot (yet) be generated -->
+    <copy todir="${tests.output.dir}/test-resources/jaxrpc/samples" overwrite="true">
+      <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/>
+      <filterset>
+        <filter token="jboss.bind.address" value="${node0}"/>
+      </filterset>
+    </copy>
+  </target>
+  
+  <!--
+  Generate JAX-WS sources
+  -->
+  <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts.">
+    
+    <!-- Define the JAX-WS wsprovide task -->
+    <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+      <classpath refid="tests.client.classpath"/>
+      <classpath location="${tests.output.dir}/test-classes"/>
+      <classpath location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
+    </taskdef>
+    
+    <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true"
+      sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/>
+    <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true"
+      sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
+  </target>
+  
+  <target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
+    <macro-compile-classes srcdir="${tests.output.dir}/wstools/java" excludesfile="${excludesfile}"/>
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Compiling                                                          -->
+  <!-- ================================================================== -->
+  
+  <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources">
+    <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/>
+    <macro-compile-classes srcdir="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+    <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/>
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Building                                                           -->
+  <!-- ================================================================== -->
+  
+  <!-- Copy resources -->
+  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+    <macro-copy-resources srcdir="${core.dir}/src/test-framework"/>
+    <macro-copy-resources srcdir="${core.dir}/src/test"/>
+  </target>
+  
+  <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
+    <ant antfile="${core.dir}/ant-import-tests/build-jars-interop.xml" target="build-jars-interop"/>
+    <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/>
+    <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
+    <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+    <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+    <ant antfile="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+    <ant antfile="${core.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
+  </target>
+  
+  <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+  
 </project>




More information about the jbossws-commits mailing list