[jbossws-commits] JBossWS SVN: r7636 - in stack/metro/trunk: modules/testsuite and 1 other directories.
Author: richard.opalka(a)jboss.com
Date: 2008-06-18 08:46:00 -0400 (Wed, 18 Jun 2008)
New Revision: 7636
Modified:
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/src/main/distro/build-deploy.xml
Log:
synchronize Metro trunk with Metro QA branch
Modified: stack/metro/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/trunk/modules/client/pom.xml 2008-06-18 12:29:44 UTC (rev 7635)
+++ stack/metro/trunk/modules/client/pom.xml 2008-06-18 12:46:00 UTC (rev 7636)
@@ -83,4 +83,19 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Class-Path>jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar jaxws-tools.jar
jaxws-rt.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar
jbossws-metro-wsit-rt.jar jbossws-metro-wsit-tools.jar jbossws-spi.jar streambuffer.jar
stax-api.jar stax-ex.jar jsr181-api.jar saaj-api.jar saaj-impl.jar stax-api.jar wsdl4j.jar
wstx.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-18 12:29:44 UTC
(rev 7635)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-18 12:46:00 UTC
(rev 7636)
@@ -11,7 +11,7 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-1674] Fix @WebServiceRef with Metro
+# [JBWS-1684] Fix @WebServiceRef with Metro
org/jboss/test/ws/jaxws/samples/webserviceref/**
# [JBWS-2127] Cannot generate WSDL for binding
"http://www.w3.org/2003/05/soap/bindings/HTTP/"
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 12:29:44 UTC
(rev 7635)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 12:46:00 UTC
(rev 7636)
@@ -11,7 +11,7 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-1674] Fix @WebServiceRef with Metro
+# [JBWS-1684] Fix @WebServiceRef with Metro
org/jboss/test/ws/jaxws/samples/webserviceref/**
# [JBWS-2127] Cannot generate WSDL for binding
"http://www.w3.org/2003/05/soap/bindings/HTTP/"
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-18 12:29:44 UTC (rev 7635)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-18 12:46:00 UTC (rev 7636)
@@ -115,6 +115,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>
<!-- ================================================================== -->