[jbossws-commits] JBossWS SVN: r3381 - in trunk: build/hudson/hudson-home/jobs/AS-Tests-AS-5.0 and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-01 15:59:34 -0400 (Fri, 01 Jun 2007)
New Revision: 3381

Modified:
   trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
   trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
   trunk/integration/xfire/ant-import/build-bin-dist.xml
   trunk/integration/xfire/src/main/etc/bindist-build.xml
Log:
Fix xfire bin-dist

Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml	2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml	2007-06-01 19:59:34 UTC (rev 3381)
@@ -71,6 +71,9 @@
     </hudson.tasks.Shell>
   </builders>
   <publishers class="vector">
+    <hudson.tasks.junit.JUnitResultArchiver>
+      <testResults>test-reports/*.xml</testResults>
+    </hudson.tasks.junit.JUnitResultArchiver>
     <hudson.tasks.Mailer>
       <recipients>@hudson.mail.recipients@</recipients>
       <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>

Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml	2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml	2007-06-01 19:59:34 UTC (rev 3381)
@@ -71,6 +71,9 @@
     </hudson.tasks.Shell>
   </builders>
   <publishers class="vector">
+    <hudson.tasks.junit.JUnitResultArchiver>
+      <testResults>test-reports/*.xml</testResults>
+    </hudson.tasks.junit.JUnitResultArchiver>
     <hudson.tasks.Mailer>
       <recipients>@hudson.mail.recipients@</recipients>
       <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>

Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml	2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml	2007-06-01 19:59:34 UTC (rev 3381)
@@ -33,7 +33,7 @@
 		<delete dir="${bindist.dir}"/>
 		<mkdir dir="${bindist.build.dir}"/>
 		<mkdir dir="${bindist.bin.dir}"/>
-		<mkdir dir="${bindist.lib.dir}/thirdparty/client"/>
+		<mkdir dir="${bindist.lib.dir}/client"/>
 		<mkdir dir="${bindist.docs.dir}"/>
 		<mkdir dir="${bindist.tests.dir}"/>
 
@@ -106,9 +106,14 @@
 				<include name="jbossws-xfire50.sar"/>
 				<include name="jbossws-xfire50-deployer.zip"/>
 			</fileset>
-
-			<!-- TODO: Verify this doesnt clash -->
 			<fileset dir="${int.xfire.dir}/thirdparty"/>
+		</copy>
+    
+		<!--
+				Cannot use XFire client
+				[JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
+	  -->
+		<copy todir="${bindist.lib.dir}/client" overwrite="true">
 			<fileset dir="${int.sunri.dir}/thirdparty"/>
 		</copy>
 

Modified: trunk/integration/xfire/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bindist-build.xml	2007-06-01 19:21:31 UTC (rev 3380)
+++ trunk/integration/xfire/src/main/etc/bindist-build.xml	2007-06-01 19:59:34 UTC (rev 3381)
@@ -85,8 +85,7 @@
 		<!--
 				Cannot use XFire client
 				[JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
-			 -->
-
+	  -->
 		<path id="sunri.classpath">
 			<pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/>
 			<pathelement location="${thirdparty.dir}/client/http.jar"/>