[jbossws-commits] JBossWS SVN: r7637 - in stack/native/trunk: src/main/distro and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-06-18 09:19:15 -0400 (Wed, 18 Jun 2008)
New Revision: 7637

Modified:
   stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
   stack/native/trunk/src/main/distro/build-deploy.xml
Log:
synchronize Native trunk with Native QA branch

Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt	2008-06-18 12:46:00 UTC (rev 7636)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt	2008-06-18 13:19:15 UTC (rev 7637)
@@ -16,4 +16,4 @@
 org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
 
 # [JBWS-2170] Fix embedded for maven build
-org/jboss/test/ws/embedded/**
\ No newline at end of file
+org/jboss/test/ws/embedded/**

Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml	2008-06-18 12:46:00 UTC (rev 7636)
+++ stack/native/trunk/src/main/distro/build-deploy.xml	2008-06-18 13:19:15 UTC (rev 7637)
@@ -144,6 +144,8 @@
     <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
     <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
     <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
+    <!-- wsconsume will fail with a LinkageError too -->
+    <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/>
   </target>
   
   <!-- ================================================================== -->