[jboss-cvs] JBossAS SVN: r100126 - in trunk: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 29 10:31:37 EST 2010
Author: richard.opalka at jboss.com
Date: 2010-01-29 10:31:37 -0500 (Fri, 29 Jan 2010)
New Revision: 100126
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/main/src/main/java/org/jboss/Main.java
Log:
[JBAS-7672] releasing JBossWS 3.3.0.Beta2 + upgrading to jaxws tools 2.2 + jbossxb file name fixes
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-01-29 15:05:14 UTC (rev 100125)
+++ trunk/build/build.xml 2010-01-29 15:31:37 UTC (rev 100126)
@@ -1837,7 +1837,7 @@
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
<fileset refid="org.codehaus.jettison:jettison:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
- <fileset refid="wscommons-policy:policy:jar"/>
+ <fileset refid="org.apache.ws.policy:wscommons-policy:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
<fileset refid="org.apache:xmlsec:jar"/>
<mapper refid="remove-versions" />
@@ -1849,11 +1849,6 @@
<include name="META-INF/**"/>
</fileset>
</copy>
- <copy todir="${install.all.deployers}/jbossws.deployer/META-INF">
- <fileset dir="${webservices.module.output}/jbossws-native-resources/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
</target>
<target name="module-webservices-all">
@@ -2122,15 +2117,9 @@
<fileset refid="org.jboss.aop:jboss-aop-asintegration-mc:jar"/>
<fileset refid="org.jboss.aop:jboss-aop-deployers:jar"/>
<fileset refid="gnu-getopt:getopt:jar"/>
+ <fileset refid="org.jboss:jbossxb:jar"/>
<mapper refid="remove-versions" />
</copy>
- <!--
- - Note: this is copied separately because the name (jboss-xml-binding) is
- - hardcoded in the wsconsume scripts. Once this is changed
- - in the scripts, this should be added to the list of lib jars above
- -->
- <copy file="${org.jboss:jbossxb:jar}"
- tofile="${install.lib}/jboss-xml-binding.jar"/>
<!-- Copy the generated client libraries -->
<mkdir dir="${install.client}"/>
@@ -2194,7 +2183,8 @@
<fileset refid="com.sun.xml.stream.buffer:streambuffer:jar"/>
<fileset refid="trove:trove:jar"/>
<fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
- <fileset refid="wscommons-policy:policy:jar"/>
+ <fileset refid="org.apache.ws.policy:wscommons-policy:jar"/>
+ <fileset refid="com.sun.xml.ws:policy:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
<fileset refid="org.hibernate:hibernate-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
@@ -2224,15 +2214,9 @@
<fileset refid="org.codehaus.jettison:jettison:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
<fileset refid="org.jboss.weld:weld-api:jar"/>
+ <fileset refid="org.jboss:jbossxb:jar"/>
<mapper refid="remove-versions" />
</copy>
- <!--
- - Note: this is copied separately because the name (jboss-xml-binding) is
- - hardcoded in the wsconsume scripts. Once this is changed
- - in the scripts, this should be added to the list of client jars above
- -->
- <copy file="${org.jboss:jbossxb:jar}"
- tofile="${install.client}/jboss-xml-binding.jar"/>
<!-- Copy thirdparty code to lib/endorsed -->
<mkdir dir="${install.lib}/endorsed"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-01-29 15:05:14 UTC (rev 100125)
+++ trunk/build/pom.xml 2010-01-29 15:31:37 UTC (rev 100126)
@@ -700,9 +700,14 @@
<groupId>com.sun.xml.stream.buffer</groupId>
<artifactId>streambuffer</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
- <groupId>wscommons-policy</groupId>
+ <groupId>org.apache.ws.policy</groupId>
+ <artifactId>wscommons-policy</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
<artifactId>policy</artifactId>
<optional>true</optional>
</dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-01-29 15:05:14 UTC (rev 100125)
+++ trunk/component-matrix/pom.xml 2010-01-29 15:31:37 UTC (rev 100126)
@@ -39,16 +39,17 @@
<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.sun-jaxws>2.1.7</version.sun-jaxws>
+ <version.sun-policy>2.0-b01</version.sun-policy>
+ <version.sun-jaxws>2.2</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-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.jboss.jbossws-spi>1.3.0.Beta2</version.jboss.jbossws-spi>
+ <version.jboss.jbossws-common>1.3.0.Beta2</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.3.0.Beta2</version.jboss.jbossws-framework>
+ <version.jboss.jbossws>3.3.0.Beta2</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>
@@ -2634,6 +2635,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2644,6 +2649,12 @@
</dependency>
<dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>policy</artifactId>
+ <version>${version.sun-policy}</version>
+ </dependency>
+
+ <dependency>
<groupId>sun-jaxws</groupId>
<artifactId>stax-ex</artifactId>
<version>${version.staxex}</version>
@@ -2680,8 +2691,8 @@
</dependency>
<dependency>
- <groupId>wscommons-policy</groupId>
- <artifactId>policy</artifactId>
+ <groupId>org.apache.ws.policy</groupId>
+ <artifactId>wscommons-policy</artifactId>
<version>1.0</version>
</dependency>
Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java 2010-01-29 15:05:14 UTC (rev 100125)
+++ trunk/main/src/main/java/org/jboss/Main.java 2010-01-29 15:31:37 UTC (rev 100126)
@@ -96,7 +96,7 @@
"jboss-logging-logmanager.jar",
// Common jars
"jboss-common-core.jar",
- "jboss-xml-binding.jar",
+ "jbossxb.jar",
// Bootstrap
"jboss-bootstrap-spi.jar", "jboss-bootstrap-spi-as.jar", "jboss-bootstrap-spi-mc.jar",
"jboss-bootstrap-impl-base.jar", "jboss-bootstrap-impl-as.jar",
More information about the jboss-cvs-commits
mailing list