[jbossws-commits] JBossWS SVN: r6827 - in stack/native/branches/tdiesler/trunk: modules/client and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Apr 30 20:06:46 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-30 20:06:46 -0400 (Wed, 30 Apr 2008)
New Revision: 6827
Modified:
stack/native/branches/tdiesler/trunk/modules/client/pom.xml
stack/native/branches/tdiesler/trunk/modules/core/pom.xml
stack/native/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml
stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/native/branches/tdiesler/trunk/pom.xml
Log:
Modified: stack/native/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-30 23:02:46 UTC (rev 6826)
+++ stack/native/branches/tdiesler/trunk/modules/client/pom.xml 2008-05-01 00:06:46 UTC (rev 6827)
@@ -13,4 +13,13 @@
<version>3.0.2-SNAPSHOT</version>
</parent>
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
Modified: stack/native/branches/tdiesler/trunk/modules/core/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/core/pom.xml 2008-04-30 23:02:46 UTC (rev 6826)
+++ stack/native/branches/tdiesler/trunk/modules/core/pom.xml 2008-05-01 00:06:46 UTC (rev 6827)
@@ -47,50 +47,32 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- jboss provided -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
<scope>provided</scope>
</dependency>
- <!-- jboss provided -->
+ <!-- transitve dependencies -->
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- transitve dependencies -->
- <dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</dependency>
@@ -103,10 +85,22 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss.jaxbintros</groupId>
<artifactId>jboss-jaxb-intros</artifactId>
</dependency>
<dependency>
+ <groupId>jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+ <dependency>
<groupId>wscommons-policy</groupId>
<artifactId>policy</artifactId>
</dependency>
@@ -126,6 +120,10 @@
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
</dependencies>
<!-- Build -->
Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-30 23:02:46 UTC (rev 6826)
+++ stack/native/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-01 00:06:46 UTC (rev 6827)
@@ -93,9 +93,6 @@
http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
<!-- EJB3/Injection excludes -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
@@ -145,9 +142,6 @@
http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
<!-- EJB3/Injection excludes -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
@@ -181,9 +175,6 @@
http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
<!-- Fix BPEL before AS50 goes final -->
<exclude>org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*</exclude>
@@ -226,9 +217,6 @@
http://jira.codehaus.org/browse/SUREFIRE-486
-->
<testExcludes>
- <!-- [JBWS-2163] wsconsume for maven build -->
- <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
<!-- Fix BPEL before AS50 goes final -->
<exclude>org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*</exclude>
Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml 2008-04-30 23:02:46 UTC (rev 6826)
+++ stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml 2008-05-01 00:06:46 UTC (rev 6827)
@@ -34,6 +34,29 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+
+ <!-- [JBWS-2163] wsconsume for maven build -->
+ <exclude>org/jboss/test/ws/benchmark/**</exclude>
+ <exclude>org/jboss/test/ws/interop/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/complex/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/holder/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wssecuritypolicy/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/**</exclude>
+
+ <!-- [JBWS-2164] Fix tools tests with maven build -->
+ <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude>
+
+ <exclude>org/jboss/test/ws/tools/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+
+ </testExcludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-30 23:02:46 UTC (rev 6826)
+++ stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-05-01 00:06:46 UTC (rev 6827)
@@ -28,9 +28,11 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-client</artifactId>
+ <version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
@@ -42,10 +44,6 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
</dependency>
@@ -54,16 +52,6 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: stack/native/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 23:02:46 UTC (rev 6826)
+++ stack/native/branches/tdiesler/trunk/pom.xml 2008-05-01 00:06:46 UTC (rev 6827)
@@ -51,6 +51,7 @@
<jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
@@ -168,25 +169,21 @@
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>3.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
<version>1.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
- <scope>provided</scope>
</dependency>
<!-- jboss provided -->
@@ -194,29 +191,30 @@
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss.common</groupId>
<artifactId>jboss-common</artifactId>
<version>${jboss.common.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
<version>${jboss.remoting.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${jboss.microcontainer.version}</version>
- <scope>provided</scope>
</dependency>
<!-- transitve dependencies -->
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${sun.fastinfoset.version}</version>
More information about the jbossws-commits
mailing list