[jboss-cvs] JBossAS SVN: r99544 - in trunk: build/docs and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 18 10:58:46 EST 2010
Author: richard.opalka at jboss.com
Date: 2010-01-18 10:58:45 -0500 (Mon, 18 Jan 2010)
New Revision: 99544
Modified:
trunk/build/build.xml
trunk/build/docs/readme.html
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/server/pom.xml
trunk/testsuite/build.xml
Log:
[JBAS-7629] Upgrading to JBossWS 3.3.0.Beta1, JAXB 2.2 and JAXWS 2.2
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-01-18 15:44:14 UTC (rev 99543)
+++ trunk/build/build.xml 2010-01-18 15:58:45 UTC (rev 99544)
@@ -1812,8 +1812,7 @@
<target name="install-jbossws-to-endorsed">
<!-- Endorse JBossWS jars on JDK1.6 and above -->
<copy todir="${install.lib}/endorsed" flatten="true" overwrite="true">
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-saaj:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
<mapper refid="remove-versions" />
</copy>
</target>
@@ -1949,10 +1948,9 @@
<fileset refid="org.jboss.xnio:xnio-api:jar"/>
<fileset refid="javax.xml.ws:jaxws-api:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxrpc:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws-ext:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-saaj:jar"/>
+ <fileset refid="javax.xml:jaxrpc-api:jar"/>
+ <fileset refid="javax.xml.soap:saaj-api:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
@@ -2176,10 +2174,9 @@
<fileset refid="javax.jws:jsr181-api:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxrpc:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws-ext:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-saaj:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
+ <fileset refid="javax.xml:jaxrpc-api:jar"/>
+ <fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
Modified: trunk/build/docs/readme.html
===================================================================
--- trunk/build/docs/readme.html 2010-01-18 15:44:14 UTC (rev 99543)
+++ trunk/build/docs/readme.html 2010-01-18 15:58:45 UTC (rev 99544)
@@ -112,10 +112,10 @@
<h2><a name="Compatibility">Compatibility Issues</a></h2>JBossAS 5.0.0.CR2 can be compiled with both Java5 & Java6. The Java5 compiled
binary is our primary/recommended binary distribution. It has undergone rigorous
testing and can run under both a Java 5 and a Java 6 runtime. When running under
-Java 6 you need to manually copy the following libraries from the
+Java 6 you need to manually copy the following library from the
JBOSS_HOME/client directory to the JBOSS_HOME/lib/endorsed directory, so that
-the JAX-WS 2.0 apis supported by JBossWS are used:
-<ul><li>jbossws-native-saaj.jar</li><li>jbossws-native-jaxrpc.jar</li><li>jbossws-native-jaxws.jar</li><li>jbossws-native-jaxws-ext.jar</li></ul>The
+the JAX-WS 2.2 apis supported by JBossWS are used:
+<ul><li>jbossws-native-factories.jar</li></ul>The
other option is to download the jdk6 distribution
(jboss-5.0.0.CR2-jdk6.zip) in which case no configuration changes are
required. If you still have problems using JBoss with a Sun Java 6
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-01-18 15:44:14 UTC (rev 99543)
+++ trunk/build/pom.xml 2010-01-18 15:58:45 UTC (rev 99544)
@@ -613,30 +613,25 @@
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
+ <artifactId>jbossws-native-factories</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws</artifactId>
+ <artifactId>jbossws-native-resources</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws-ext</artifactId>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
<optional>true</optional>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-01-18 15:44:14 UTC (rev 99543)
+++ trunk/component-matrix/pom.xml 2010-01-18 15:58:45 UTC (rev 99544)
@@ -37,14 +37,18 @@
<version.javassist>3.11.0.GA</version.javassist>
<version.javax.faces>2.0.2-FCS</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
+ <version.jboss.jbossts>4.9.0.GA</version.jboss.jbossts>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
- <version.jboss.jbossts>4.9.0.GA</version.jboss.jbossts>
- <version.jaxws.api>2.1</version.jaxws.api>
+ <version.sun-jaxws>2.1.7</version.sun-jaxws>
+ <version.sun.jaxb>2.2</version.sun.jaxb>
+ <version.jaxws.api>2.2</version.jaxws.api>
+ <version.jaxrpc.api>1.1</version.jaxrpc.api>
+ <version.saaj.api>1.3</version.saaj.api>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
- <version.jboss.jbossws-common>1.2.2.GA</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.2.2.GA</version.jboss.jbossws-framework>
- <version.jboss.jbossws-spi>1.2.2.GA</version.jboss.jbossws-spi>
- <version.jboss.jbossws>3.2.2.GA</version.jboss.jbossws>
+ <version.jboss.jbossws-spi>1.3.0.Beta1</version.jboss.jbossws-spi>
+ <version.jboss.jbossws-common>1.3.0.Beta1</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.3.0.Beta1</version.jboss.jbossws-framework>
+ <version.jboss.jbossws>3.3.0.Beta1</version.jboss.jbossws>
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
@@ -138,8 +142,6 @@
<version.staxex>2.1.1</version.staxex>
<version.streambuffer>0.9</version.streambuffer>
<version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
- <version.sun-jaxws>2.1.7</version.sun-jaxws>
- <version.sun.jaxb>2.1.9</version.sun.jaxb>
<version.weld.integration>5.2.0.Beta5</version.weld.integration>
<version.xdoclet>1.2.3</version.xdoclet>
<version.weld.api>1.0</version.weld.api>
@@ -925,6 +927,12 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-factories</artifactId>
+ <version>${version.jboss.jbossws}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
<version>${version.jboss.jbossws}</version>
</dependency>
@@ -965,37 +973,31 @@
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>${version.jaxrpc.api}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws</artifactId>
- <version>${version.jboss.jbossws}</version>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${version.saaj.api}</version>
<exclusions>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws-ext</artifactId>
- <version>${version.jboss.jbossws}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- <version>${version.jboss.jbossws}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-resources</artifactId>
<version>${version.jboss.jbossws}</version>
</dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-01-18 15:44:14 UTC (rev 99543)
+++ trunk/server/pom.xml 2010-01-18 15:58:45 UTC (rev 99544)
@@ -390,8 +390,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
</dependency>
<dependency>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-01-18 15:44:14 UTC (rev 99543)
+++ trunk/testsuite/build.xml 2010-01-18 15:58:45 UTC (rev 99544)
@@ -285,12 +285,11 @@
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxrpc:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws-ext:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-jaxws:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-management:war"/>
<fileset refid="org.jboss.ws.native:jbossws-native-resources:jar"/>
- <fileset refid="org.jboss.ws.native:jbossws-native-saaj:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
+ <fileset refid="javax.xml:jaxrpc-api:jar"/>
+ <fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
More information about the jboss-cvs-commits
mailing list