April 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6584 - framework/trunk/hudson.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:47:03 -0400 (Mon, 21 Apr 2008) New Revision: 6584 Modified: framework/trunk/hudson/ant.properties.example Log: docs Modified: framework/trunk/hudson/ant.properties.example =================================================================== --- framework/trunk/hudson/ant.properties.example 2008-04-21 15:42:15 UTC (rev 6583) +++ framework/trunk/hudson/ant.properties.example 2008-04-21 15:47:03 UTC (rev 6584) @@ -14,8 +14,8 @@ #java.home.jdk16=/usr/java/jdk1.6 # Hudson QA Environment -hudson.username=hudson -hudson.password=deadbeefjboss +hudson.username=changeme +hudson.password=changeme hudson.root=/home/tdiesler/workspace hudson.host=jbws.dyndns.org @@ -51,4 +51,4 @@ # Hudson setup apache-tomcat=5.5.20 -sun-hudson=1.160 \ No newline at end of file +sun-hudson=1.160

18 years

1
0
0 / 0

JBossWS SVN: r6583 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2.2 and 54 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:42:15 -0400 (Mon, 21 Apr 2008) New Revision: 6583 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml Log: switch test output to maven layout Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ # rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports -cp -r ./output/reports/*.xml $WORKSPACE/test-reports +cp -r ./output/test-reports/*.xml $WORKSPACE/test-reports # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ # rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports -cp -r ./output/reports/*.xml $WORKSPACE/test-reports +cp -r ./output/test-reports/*.xml $WORKSPACE/test-reports # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ # rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports -cp -r ./output/reports/*.xml $WORKSPACE/test-reports +cp -r ./output/test-reports/*.xml $WORKSPACE/test-reports # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ # rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports -cp -r ./output/reports/*.xml $WORKSPACE/test-reports +cp -r ./output/test-reports/*.xml $WORKSPACE/test-reports # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -59,7 +59,7 @@ # rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports -cp -r ./output/reports/*.xml $WORKSPACE/test-reports +cp -r ./output/test-reports/*.xml $WORKSPACE/test-reports # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/jbossws-cxf-dist/output/reports/*.xml</testResults> + <testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/jbossws-cxf-dist/output/reports/*.xml</testResults> + <testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/jbossws-cxf-dist/output/reports/*.xml</testResults> + <testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/jbossws-cxf-dist/output/reports/*.xml</testResults> + <testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/reports/*.xml</testResults> + <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -65,7 +65,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/jbossws-metro-dist/output/reports/*.xml</testResults> + <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -65,7 +65,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/jbossws-metro-dist/output/reports/*.xml</testResults> + <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -65,7 +65,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/jbossws-metro-dist/output/reports/*.xml</testResults> + <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -65,7 +65,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/jbossws-metro-dist/output/reports/*.xml</testResults> + <testResults>stack-metro/output/jbossws-metro-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Integration-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -58,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-metro/output/tests/reports/*.xml</testResults> + <testResults>stack-metro/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -74,7 +74,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -74,7 +74,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -74,7 +74,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -74,7 +74,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/reports/*.xml</testResults> + <testResults>stack-native/output/jbossws-native-dist/output/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml 2008-04-21 15:34:18 UTC (rev 6582) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml 2008-04-21 15:42:15 UTC (rev 6583) @@ -67,7 +67,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/reports/*.xml</testResults> + <testResults>stack-native/output/tests/test-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients>

18 years

1
0
0 / 0

JBossWS SVN: r6582 - stack/cxf/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:34:18 -0400 (Mon, 21 Apr 2008) New Revision: 6582 Modified: stack/cxf/trunk/ant-import-tests/build-testsuite.xml Log: switch test output to maven layout Modified: stack/cxf/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 15:27:21 UTC (rev 6581) +++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 15:34:18 UTC (rev 6582) @@ -10,12 +10,12 @@ <project> - <property name="tests.output.dir" value="${int.cxf.dir}/test-output/tests"/> + <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> - <import file="${int.cxf.dir}/test-src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/>  - <property name="excludesfile" value="${int.cxf.dir}/test-src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>   @@ -24,30 +24,30 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-common.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/jaxb-api.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/jdom-${cxf.jdom}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/neethi-${cxf.neethi}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/spring-context-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/spring-core-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/wsdl4j.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/wstx.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.cxf.dir}/test-output/lib/cxf-${cxf.version}.jar"/> - <pathelement location="${int.cxf.dir}/test-output/lib/jbossws-cxf-client.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.cxf.dir}/test-thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/> + <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> </path> </target> @@ -73,8 +73,8 @@  <target name="tests-compile" depends="wsconsume" description="Compile sources"> - <macro-compile-classes srcdir="${int.cxf.dir}/test-src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.cxf.dir}/test-src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> </target>  @@ -83,15 +83,15 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.cxf.dir}/test-src/test-framework"/> - <macro-copy-resources srcdir="${int.cxf.dir}/test-src/test"/> + <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.cxf.dir}/test-ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> - <ant antfile="${int.cxf.dir}/test-ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${int.cxf.dir}/test-src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.cxf.dir}/test-src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> + <ant antfile="${int.cxf.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.cxf.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."/>

18 years

1
0
0 / 0

JBossWS SVN: r6581 - stack/metro/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:27:21 -0400 (Mon, 21 Apr 2008) New Revision: 6581 Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml Log: switch test output to maven layout Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 15:24:55 UTC (rev 6580) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 15:27:21 UTC (rev 6581) @@ -20,10 +20,10 @@ <property name="tests.dir" value="${metro.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/test-resources"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/> - <property name="tests.framework.resources.dir" value="${tests.framework.dir}/test-resources"/> + <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/> <!-- Init the various classpaths

18 years

1
0
0 / 0

JBossWS SVN: r6580 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:24:55 -0400 (Mon, 21 Apr 2008) New Revision: 6580 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java Log: Remove tests.execution.dir Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-21 15:06:31 UTC (rev 6579) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-21 15:24:55 UTC (rev 6580) @@ -397,7 +397,6 @@ <jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/--> <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> - <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="interop" value="${interop}"/> @@ -446,7 +445,6 @@ <jvmarg value="-Dcom.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true"/--> <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> - <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="interop" value="${interop}"/> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-21 15:06:31 UTC (rev 6579) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-21 15:24:55 UTC (rev 6580) @@ -54,7 +54,7 @@ super.setUp(); JBOSS_HOME = System.getProperty("jboss.home"); - TEST_EXEC_DIR = System.getProperty("test.execution.dir"); + TEST_EXEC_DIR = new File(".").getCanonicalPath(); JDK_HOME = System.getProperty("jdk.home"); OS = System.getProperty("os.name").toLowerCase(); }

18 years

1
0
0 / 0

JBossWS SVN: r6579 - in framework/trunk: src/main and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:06:31 -0400 (Mon, 21 Apr 2008) New Revision: 6579 Added: framework/trunk/src/main/scripts/assembly-resources.xml framework/trunk/src/main/scripts/assembly-testsuite.xml Removed: framework/trunk/src/main/ant/ framework/trunk/src/main/assembly/ framework/trunk/src/main/scripts/src.xml Modified: framework/trunk/pom.xml Log: assemble testsuite Modified: framework/trunk/pom.xml =================================================================== --- framework/trunk/pom.xml 2008-04-21 15:00:15 UTC (rev 6578) +++ framework/trunk/pom.xml 2008-04-21 15:06:31 UTC (rev 6579) @@ -155,7 +155,7 @@  <property name="version.id" value="${project.version}"/> <property name="jboss.local.repository" value="${jboss.local.repository}"/> - <ant antfile="src/main/ant/build-install.xml" target="install"/> + <ant antfile="src/main/scripts/build-install.xml" target="install"/> </tasks> </configuration> </execution> @@ -165,16 +165,29 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> + <id>resources</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> + <descriptor>src/main/scripts/assembly-resources.xml</descriptor> </descriptors> </configuration> </execution> + <execution> + <id>testsuite</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/scripts/assembly-testsuite.xml</descriptor> + </descriptors> + </configuration> + </execution> </executions> </plugin> </plugins> Added: framework/trunk/src/main/scripts/assembly-resources.xml =================================================================== --- framework/trunk/src/main/scripts/assembly-resources.xml (rev 0) +++ framework/trunk/src/main/scripts/assembly-resources.xml 2008-04-21 15:06:31 UTC (rev 6579) @@ -0,0 +1,18 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>scripts</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.bat</include> + <include>*.sh</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: framework/trunk/src/main/scripts/assembly-resources.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/src/main/scripts/assembly-testsuite.xml =================================================================== --- framework/trunk/src/main/scripts/assembly-testsuite.xml (rev 0) +++ framework/trunk/src/main/scripts/assembly-testsuite.xml 2008-04-21 15:06:31 UTC (rev 6579) @@ -0,0 +1,14 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>testsuite</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>testsuite/test</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: framework/trunk/src/main/scripts/assembly-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: framework/trunk/src/main/scripts/src.xml =================================================================== --- framework/trunk/src/main/scripts/src.xml 2008-04-21 15:00:15 UTC (rev 6578) +++ framework/trunk/src/main/scripts/src.xml 2008-04-21 15:06:31 UTC (rev 6579) @@ -1,18 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - <id>scripts</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>src/main/etc</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.bat</include> - <include>*.sh</include> - </includes> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file

18 years

1
0
0 / 0

JBossWS SVN: r6578 - in framework/trunk/src/main: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 11:00:15 -0400 (Mon, 21 Apr 2008) New Revision: 6578 Added: framework/trunk/src/main/scripts/ framework/trunk/src/main/scripts/build-install.xml Log: Copied: framework/trunk/src/main/scripts (from rev 6577, framework/trunk/src/main/assembly) Copied: framework/trunk/src/main/scripts/build-install.xml (from rev 6577, framework/trunk/src/main/ant/build-install.xml) =================================================================== --- framework/trunk/src/main/scripts/build-install.xml (rev 0) +++ framework/trunk/src/main/scripts/build-install.xml 2008-04-21 15:00:15 UTC (rev 6578) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="framework.dir" value="${basedir}"/> + <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/> + <property name="framework.target.dir" value="${framework.dir}/target"/> + +  +  +  + + <target name="init"> + <property name="repository.id" value="${version.id}"/> + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + <echo message="jboss.local.repository=${jboss.local.repository}"/> + </target> + + <target name="check-properties" depends="init"> + <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> + <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> + </target> + +  +  +  + +  + <target name="install" depends="check-properties" description="Install to jboss.local.repository"> + +  + <available property="jbossws.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/> + <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/> + +  + <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/> + <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/> + <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> + </target> + +</project>

18 years

1
0
0 / 0

JBossWS SVN: r6577 - stack/cxf/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 10:51:31 -0400 (Mon, 21 Apr 2008) New Revision: 6577 Modified: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml stack/cxf/trunk/ant-import-tests/build-testsuite.xml Log: switch test output to maven layout Modified: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) +++ stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:51:31 UTC (rev 6577) @@ -18,36 +18,36 @@ <target name="build-testsuite-jars" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/>  - <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> Modified: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) +++ stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:51:31 UTC (rev 6577) @@ -16,20 +16,20 @@ <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/>  <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"> + 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> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> <zipfileset - dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> Modified: stack/cxf/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:44:07 UTC (rev 6576) +++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:51:31 UTC (rev 6577) @@ -10,12 +10,12 @@ <project> - <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> + <property name="tests.output.dir" value="${int.cxf.dir}/test-output/tests"/> - <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${int.cxf.dir}/test-src/test-framework/ant-import/build-testsuite.xml"/>  - <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${int.cxf.dir}/test-src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>   @@ -24,30 +24,30 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-common.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jaxb-api.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jdom-${cxf.jdom}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/neethi-${cxf.neethi}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/spring-context-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/spring-core-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/wsdl4j.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/wstx.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/> - <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.cxf.dir}/test-output/lib/cxf-${cxf.version}.jar"/> + <pathelement location="${int.cxf.dir}/test-output/lib/jbossws-cxf-client.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jaxws-tools.jar"/> </path> </target> @@ -63,8 +63,8 @@ <classpath refid="tests.client.classpath"/> </taskdef> - <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"/> + <wsconsume wsdl="${tests.framework.resources.dir}/test-jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/test-wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.framework.resources.dir}/test-jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/test-wsconsume/java" keep="true" verbose="false"/> --> </target> @@ -73,8 +73,8 @@  <target name="tests-compile" depends="wsconsume" description="Compile sources"> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/test-src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/test-src/test/java" excludesfile="${excludesfile}"/> </target>  @@ -83,15 +83,15 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> + <macro-copy-resources srcdir="${int.cxf.dir}/test-src/test-framework"/> + <macro-copy-resources srcdir="${int.cxf.dir}/test-src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> - <ant antfile="${int.cxf.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${int.cxf.dir}/test-ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> + <ant antfile="${int.cxf.dir}/test-ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${int.cxf.dir}/test-src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.cxf.dir}/test-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."/>

18 years

1
0
0 / 0

JBossWS SVN: r6576 - stack/metro/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 10:44:07 -0400 (Mon, 21 Apr 2008) New Revision: 6576 Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml stack/metro/trunk/ant-import-tests/build-testsuite.xml Log: switch test output to maven layout Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) @@ -22,37 +22,37 @@ <target name="build-jars-jaxws" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/resources/jaxws/jbws1869/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1869/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF"> <include name="**/*"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/resources/jaxws/jbws1871/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1871/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF"> <include name="**/*"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/wsit-rm.war" webxml="${tests.output.dir}/resources/wsit/rm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> <include name="org/jboss/test/ws/wsit/rm/Add.class"/> <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/wsit/rm/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF"> <include name="sun-web.xml"/> <include name="web.xml"/> <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/> Modified: stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575) +++ stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) @@ -16,20 +16,20 @@ <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/>  <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"> + 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> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> <include name="wsit-*.xml"/> </webinf> <zipfileset - dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:42:11 UTC (rev 6575) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:44:07 UTC (rev 6576) @@ -20,10 +20,10 @@ <property name="tests.dir" value="${metro.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <property name="tests.resources.dir" value="${tests.dir}/test-resources"/> <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/> - <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/> + <property name="tests.framework.resources.dir" value="${tests.framework.dir}/test-resources"/> <!-- Init the various classpaths

18 years

1
0
0 / 0

JBossWS SVN: r6575 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 10:42:11 -0400 (Mon, 21 Apr 2008) New Revision: 6575 Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: switch test output to maven layout Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-21 14:41:53 UTC (rev 6574) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575) @@ -18,11 +18,11 @@ <target name="build-jars-jaxws" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/>  - <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> @@ -31,23 +31,23 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-binding.war" webxml="${tests.output.dir}/test-resources/jaxws/binding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> </classes> </war>  - <jar destfile="${tests.output.dir}/libs/jaxws-classloading-service.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class"/> </fileset> </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-classloading-types.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-types.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class"/> <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class"/> <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class"/> @@ -55,8 +55,8 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-complex.war" webxml="${tests.output.dir}/test-resources/jaxws/complex/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> @@ -65,20 +65,20 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF"> <include name="wsdl/**"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerscope/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> @@ -87,26 +87,26 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-holder.war" webxml="${tests.output.dir}/test-resources/jaxws/holder/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws860.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws860/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws860/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws944.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.class"/> @@ -115,8 +115,8 @@ </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws981.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> @@ -124,15 +124,15 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1178/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1178/EndpointImpl.class"/> </classes> </war>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1190/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/EndpointImpl*.class"/> @@ -141,49 +141,49 @@ </war>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1283.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/> </fileset> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1357/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> </classes> - <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> + <fileset dir="${tests.output.dir}/test-resources/jaxws/jbws1357"> <include name="hello.jsp"/> </fileset> </war>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1422.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1422/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1422/*TestCase.class"/> </fileset> </jar>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1446.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.class"/> </fileset> </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1505.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1505/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1505/*TestCase.class"/> </fileset> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1529/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> @@ -191,247 +191,247 @@ </war>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class"/> </fileset> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear"> - <fileset dir="${tests.output.dir}/libs"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1556.ear"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1556.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1556/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> </jar>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1566.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/> </fileset> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/libs"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.ear"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1581.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1581.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> <include name="wsdl/**"/> </metainf> </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1611/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/> </classes> </war>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1694.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1694.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1694/**/*.class"/> </fileset> </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1702/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1702/WEB-INF"/> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1733/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> </classes> </war>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/> </fileset> </jar> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/> + <unjar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.jar"/> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1762/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> - <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar"> - <fileset dir="${tests.output.dir}/libs"> + <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.war"/> + <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.sar"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> - <fileset dir="${tests.output.dir}/libs"> + <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.ear"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1762-packaged.jar"/> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/packaged"> <include name="application.xml"/> </metainf> </jar> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> - <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> + <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear"/> + <mkdir dir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/test-resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <unwar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> + <unjar src="${tests.output.dir}/test-libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/test-libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1797/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1798/WEB-INF"> <include name="wsdl/**"/> </webinf> </war>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1799.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1799.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1799/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1799/*TestCase.class"/> </fileset> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1807/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1807/WEB-INF"> <include name="wsdl/**"/> </webinf> </war>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF"> <include name="jboss.xml"/> </metainf> </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.ear"> - <fileset dir="${tests.output.dir}/libs"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.ear"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1813.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF"> <include name="application.xml"/> </metainf> </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1815.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1815/META-INF"> <include name="wsdl/my-service.wsdl"/> </metainf> </jar>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/> </fileset> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> </fileset> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1822/shared/Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/shared/BeanIface.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> </fileset> </jar> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" - earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> + <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" + earfile="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb-modules.ear"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1822/two-ejb-modules/META-INF"> <include name="jboss-app.xml"/> </metainf> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"/> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"/> + <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-shared.jar"/> + <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb3-inside.jar"/> </ear> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" - earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"/> + <ear appxml="${tests.output.dir}/test-resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" + earfile="${tests.output.dir}/test-libs/jaxws-jbws1822-one-ejb-module.ear"> + <fileset file="${tests.output.dir}/test-libs/jaxws-jbws1822-two-ejb3-inside.jar"/> </ear>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1840.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1840.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/> </fileset> </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1841.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1841/META-INF"> <include name="wsdl/*"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> @@ -439,45 +439,45 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1843/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1843/WEB-INF"> <include name="wsdl/**"/> </webinf> </war>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1845.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1845/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> </fileset> </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1854/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1854.sar"> - <fileset dir="${tests.output.dir}/libs"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-jbws1854.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar>  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1872.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1872.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1872/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1872/*TestCase.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1872/Client*.class"/> @@ -485,58 +485,58 @@ </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1904.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1904/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/> </fileset> </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1969.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1969.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1969/META-INF"> <include name="wsdl/**"/> </metainf> </jar>  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2000.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class"/> </fileset> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2009/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2009/WEB-INF"> <include name="wsdl/**"/> <include name="schema/**"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-webfault.war" webxml="${tests.output.dir}/test-resources/jaxws/webfault/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/webfault/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/webfault/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/webfault/CustomException.class"/> @@ -545,8 +545,8 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/test-resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 14:41:53 UTC (rev 6574) +++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575) @@ -18,74 +18,74 @@ <target name="build-samples-jaxws" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-context.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-context.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/context/META-INF"> <include name="jboss.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF"> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.ear"> - <fileset dir="${tests.output.dir}/libs"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.ear"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment42.ear"> - <fileset dir="${tests.output.dir}/libs"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment42.ear"> + <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF"> <include name="application.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/exception/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/> @@ -96,8 +96,8 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> @@ -106,31 +106,31 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-logicalhandler-source.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> @@ -141,9 +141,9 @@ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> </classes> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-logicalhandler-jaxb.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> @@ -157,94 +157,94 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/message/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/payload/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war>  - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-retail.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/**/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/retail/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/advanced/retail/META-INF"> <include name="wsdl/*"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> </classes> </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-ejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/Endpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/serviceref/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="wsdl/**"/> @@ -252,8 +252,8 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> @@ -267,8 +267,8 @@ </war>  - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-swaref.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/swaref/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.class"/> @@ -281,16 +281,16 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> @@ -298,8 +298,8 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> @@ -307,42 +307,42 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> </classes> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF02"> <include name="wsdl/**"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> </classes> </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-ejb3.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> </fileset> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice02-ejb3.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webservice/META-INF02"> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-webservice03-ejb3.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> @@ -350,18 +350,18 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointImpl.class"/> </classes> </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-client.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointClientOne.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -370,24 +370,24 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.EndpointClientOne"/> </manifest> </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-servlet-client.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/classes"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-webserviceref-ejb3-client.jar"> + <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/> @@ -395,15 +395,15 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> </jar>  - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war jarfile="${tests.output.dir}/test-libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/> Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-21 14:41:53 UTC (rev 6574) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-21 14:42:11 UTC (rev 6575) @@ -9,7 +9,7 @@  <project> - +  <condition property="jboss.home" value="${jboss421.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> @@ -30,10 +30,10 @@    - +  <fail message="Tests output dir not set." unless="tests.output.dir"/> - +  <condition property="tools.jar" value="${java.home}/lib/tools.jar"> <available file="${java.home}/lib/tools.jar"/> @@ -43,10 +43,10 @@ </condition>  <condition property="tools.jar" value="${java.home}/../Classes/classes.jar"> - <available file="${java.home}/../Classes/classes.jar"/> + <available file="${java.home}/../Classes/classes.jar"/> </condition> <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/> - +  <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> <isset property="debug"/> @@ -56,7 +56,7 @@ <isset property="debug"/> </not> </condition> - +  <property name="node0" value="${jboss.bind.address}"/> <property name="node0.http.url" value="http://${node0}:8080"/> <property name="node0.jndi.url" value="jnp://${node0}:1099"/> <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - +    - + <target name="tests-prepare"> - <mkdir dir="${tests.output.dir}/log"/> - <delete file="${tests.output.dir}/log/test.log"/> + <mkdir dir="${tests.output.dir}/test-log"/> + <delete file="${tests.output.dir}/test-log/test.log"/> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> @@ -113,18 +113,18 @@ <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> </target> - + <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"> - <path id="tests.javac.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <path refid="integration.target.javac.classpath"/> - </path> - <path id="tests.client.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <path refid="integration.target.client.classpath"/> - </path> + <path id="tests.javac.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <path refid="integration.target.javac.classpath"/> + </path> + <path id="tests.client.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <path refid="integration.target.client.classpath"/> + </path> </target> <target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42"> @@ -150,11 +150,11 @@ </path>  <path id="integration.target.client.classpath"> <pathelement location="${jboss.client}/activation.jar"/> @@ -261,13 +261,13 @@    - + <macrodef name="macro-compile-classes"> <attribute name="excludesfile"/> <attribute name="srcdir"/> <sequential> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + <mkdir dir="${tests.output.dir}/test-classes"/> + <javac destdir="${tests.output.dir}/test-classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="@{srcdir}"/> <classpath refid="tests.javac.classpath"/> @@ -284,7 +284,7 @@ <sequential>  - <copy todir="${tests.output.dir}/classes"> + <copy todir="${tests.output.dir}/test-classes"> <fileset dir="@{srcdir}/etc"> <include name="jndi.properties"/> <include name="tst.policy"/> @@ -296,14 +296,14 @@ </copy>  - <copy todir="${tests.output.dir}/classes"> + <copy todir="${tests.output.dir}/test-classes"> <fileset dir="@{srcdir}/java"> <include name="**/*.xml"/> </fileset> </copy>  - <copy todir="${tests.output.dir}/resources"> + <copy todir="${tests.output.dir}/test-resources"> <fileset dir="@{srcdir}/resources"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> @@ -314,12 +314,12 @@ <filter token="java.home" value="${java.home}"/> <filter token="jboss.bind.address" value="${node0}"/> <filter token="tests.output.dir" value="${tests.output.dir}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> + <filter token="wsdl-publish-location" value="${tests.output.dir}/test-wsdl-publish"/> </filterset> </copy>  - <copy todir="${tests.output.dir}/resources"> + <copy todir="${tests.output.dir}/test-resources"> <fileset dir="@{srcdir}/resources"> <exclude name="**/*.wsdl"/> <exclude name="**/*.xml"/> @@ -341,28 +341,28 @@ </antcall> <antcall target="tests-report"/> </target> - +  <target name="tests-smoke" depends="tests-init" description="Run smoke unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>  <param name="haltonfailure" value="true"/> </antcall> <antcall target="tests-report"/> </target> - +  <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> + <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <param name="haltonfailure" value="false"/> - </antcall> + </antcall> </target>  @@ -376,8 +376,8 @@ </target>  <target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-run-internal"> @@ -389,54 +389,54 @@  <target name="tests-run-internal" depends="tests-init"> - <mkdir dir="${tests.output.dir}/reports"/> + <mkdir dir="${tests.output.dir}/test-reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-ea"/>  - + <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> + <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="interop" value="${interop}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> - <sysproperty key="test.archive.directory" value="${tests.output.dir}/libs"/> - <sysproperty key="test.resources.directory" value="${tests.output.dir}/resources"/> + <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> + <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> <classpath> <path refid="tests.client.classpath"/> - <pathelement location="${tests.output.dir}/classes"/> + <pathelement location="${tests.output.dir}/test-classes"/> </classpath> <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> - <batchtest todir="${tests.output.dir}/reports" fork="true"> - <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/> + <batchtest todir="${tests.output.dir}/test-reports" fork="true"> + <fileset dir="${tests.output.dir}/test-classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/> </batchtest> </junit> </target>  <target name="one-test" depends="tests-init" if="test" description="Run a single unit test"> - <mkdir dir="${tests.output.dir}/reports"/> + <mkdir dir="${tests.output.dir}/test-reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg line="${remote.debug.line}"/> @@ -444,16 +444,16 @@ <jvmarg value="-ea"/>  - + <sysproperty key="jdk.home" value="${env.JAVA_HOME}"/> <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> + <sysproperty key="build.testlog" value="${tests.output.dir}/test-log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="interop" value="${interop}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> @@ -462,8 +462,8 @@ <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>   <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> - <sysproperty key="test.archive.directory" value="${tests.output.dir}/libs"/> - <sysproperty key="test.resources.directory" value="${tests.output.dir}/resources"/> + <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> + <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> <classpath> <path refid="tests.client.classpath"/> - <pathelement location="${tests.output.dir}/classes"/> + <pathelement location="${tests.output.dir}/test-classes"/> </classpath> <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> - <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/> + <test todir="${tests.output.dir}/test-reports" name="${test}" fork="true"/> </junit> </target> @@ -495,15 +495,15 @@  <target name="tests-report" depends="tests-init" description="Build the tests report"> - <mkdir dir="${tests.output.dir}/reports"/> - <junitreport todir="${tests.output.dir}/reports"> - <fileset dir="${tests.output.dir}/reports"> + <mkdir dir="${tests.output.dir}/test-reports"/> + <junitreport todir="${tests.output.dir}/test-reports"> + <fileset dir="${tests.output.dir}/test-reports"> <include name="TEST-*.xml"/> </fileset> - <report format="frames" todir="${tests.output.dir}/reports/html"/> + <report format="frames" todir="${tests.output.dir}/test-reports/html"/> </junitreport> <zip destfile="${tests.output.dir}/test-report-${build.id}.zip"> - <fileset dir="${tests.output.dir}" includes="reports/**"/> + <fileset dir="${tests.output.dir}" includes="test-reports/**"/> </zip> </target> @@ -518,33 +518,29 @@    - + <target name="eclipse" depends="tests-jars" description="Generates the JBossWS Testsuite Eclipse project"> - <fail message="Sorry, this target is for src/binary distribution only."> + <fail message="Sorry, this target is for src/binary distribution only."> <condition> - <not><isset property="build.dir"/></not> + <not> + <isset property="build.dir"/> + </not> </condition> </fail> - <path id="tests.eclipse.classpath"> - <path refid="tests.client.classpath"/> - <path refid="tests.javac.classpath"/> - </path> - <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="ws.stack.classpath"/> - <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="ws.stack.classpath"/> - <taskdef name="eclipseJUnitTestGenerator" classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask" classpathref="ws.stack.classpath"/> - <eclipseClasspathGenerator pathId="tests.eclipse.classpath" excludesFile="${excludesfile}" srcPath="tests/java" /> - <eclipseProjectGenerator projectName="JBossWS Testsuite" /> - <eclipseJUnitTestGenerator projectName="JBossWS Testsuite" - projectWorkingDir="${tests.output.dir}" - srcDir="${tests.dir}/java" - integrationTarget="${jbossws.integration.target}" - endorsedDir="${jboss.lib}/endorsed" - jbossHome="${jboss.home}" - namingProviderUrl="${node0.jndi.url}" - securityPolicy="${tests.output.dir}/classes/tst.policy" - > - <fileset dir="${tests.output.dir}/classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/> - </eclipseJUnitTestGenerator> + <path id="tests.eclipse.classpath"> + <path refid="tests.client.classpath"/> + <path refid="tests.javac.classpath"/> + </path> + <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="ws.stack.classpath"/> + <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="ws.stack.classpath"/> + <taskdef name="eclipseJUnitTestGenerator" classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask" classpathref="ws.stack.classpath"/> + <eclipseClasspathGenerator pathId="tests.eclipse.classpath" excludesFile="${excludesfile}" srcPath="tests/java"/> + <eclipseProjectGenerator projectName="JBossWS Testsuite"/> + <eclipseJUnitTestGenerator projectName="JBossWS Testsuite" projectWorkingDir="${tests.output.dir}" srcDir="${tests.dir}/test-java" + integrationTarget="${jbossws.integration.target}" endorsedDir="${jboss.lib}/endorsed" jbossHome="${jboss.home}" namingProviderUrl="${node0.jndi.url}" + securityPolicy="${tests.output.dir}/test-classes/tst.policy"> + <fileset dir="${tests.output.dir}/test-classes" includes="org/jboss/test/ws/**/*TestCase.class" excludes="exclude.wildcard"/> + </eclipseJUnitTestGenerator> </target> - + </project> \ No newline at end of file

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008