[jbossws-commits] JBossWS SVN: r3887 - in trunk: build/hudson/hudson-home and 4 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-07-16 07:47:27 -0400 (Mon, 16 Jul 2007)
New Revision: 3887

Removed:
   trunk/build/hudson/hudson-home/users/heiko.braun at jboss.com/
   trunk/build/hudson/hudson-home/users/thomas.diesler at jboss.com/
Modified:
   trunk/build/ant-import/build-testsuite.xml
   trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
   trunk/integration/native/ant-import/build-testsuite.xml
   trunk/integration/sunri/ant-import/build-testsuite.xml
   trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Fix as50 test classpath

Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml	2007-07-16 10:39:58 UTC (rev 3886)
+++ trunk/build/ant-import/build-testsuite.xml	2007-07-16 11:47:27 UTC (rev 3887)
@@ -116,9 +116,16 @@
       <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
     </path>
     
-    <!-- This classpath MUST NOT contain any local jars from thirdparty -->
+    <!-- 
+      The 'tests.client.classpath' contains jars that are available in the target container's client directory.
+      There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+      
+      The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+      The 'tests.extra.classpath' contains stack specific jars that are needed for 
+    -->
     <path id="tests.client.classpath">
       <path refid="ws.stack.classpath"/>
+      <path refid="tests.extra.classpath"/>
       <pathelement location="${jboss.client}/activation.jar"/>
       <pathelement location="${jboss.client}/javassist.jar"/>
       <pathelement location="${jboss.client}/jaxb-api.jar"/>
@@ -131,9 +138,8 @@
       <pathelement location="${jboss.client}/jbossws-jboss50.jar"/>
       <pathelement location="${jboss.client}/log4j.jar"/>
       <pathelement location="${jboss.client}/mail.jar"/>
-      <pathelement location="${jboss.client}/policy.jar"/>
       <pathelement location="${jboss.client}/stax-api.jar"/>
-      <pathelement location="${jboss.client}/wsdl4j.jar"/>
+      <!-- FIXME jars should be available in the client dir -->
       <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
       <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
       <pathelement location="${jboss.server.lib}/jboss.jar"/>

Modified: trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml	2007-07-16 10:39:58 UTC (rev 3886)
+++ trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml	2007-07-16 11:47:27 UTC (rev 3887)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <hudson.tasks.Mailer-DescriptorImpl>
-  <defaultSuffix>@jboss.com</defaultSuffix>
+  <defaultSuffix></defaultSuffix>
   <hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson/</hudsonUrl>
   <adminAddress>thomas.diesler at jboss.com</adminAddress>
   <smtpHost>@hudson.smtp.host@</smtpHost>

Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml	2007-07-16 10:39:58 UTC (rev 3886)
+++ trunk/integration/native/ant-import/build-testsuite.xml	2007-07-16 11:47:27 UTC (rev 3887)
@@ -39,8 +39,8 @@
     
     <path id="tests.extra.classpath">
       <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
-      <pathelement location="${core.dir}/thirdparty/policy.jar"/>
-      <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+      <pathelement location="${jboss.client}/policy.jar"/>
+      <pathelement location="${jboss.client}/wsdl4j.jar"/>
     </path>
     
   </target>

Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml	2007-07-16 10:39:58 UTC (rev 3886)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml	2007-07-16 11:47:27 UTC (rev 3887)
@@ -27,6 +27,7 @@
   <target name="tests-init" depends="tests-classpath">
 
     <path id="ws.stack.classpath">
+      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
       <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
       <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
       <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
@@ -47,7 +48,6 @@
     
     <path id="tests.extra.classpath">
       <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/>
-      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
     </path>
     
   </target>

Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml	2007-07-16 10:39:58 UTC (rev 3886)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml	2007-07-16 11:47:27 UTC (rev 3887)
@@ -62,11 +62,11 @@
     </path>
     
     <path id="ws.stack.classpath">
+      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
       <path refid="sunri.classpath"/>
     </path>
     
     <path id="tests.extra.classpath">
-      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
     </path>
     
   </target>