[jboss-cvs] JBossAS SVN: r106545 - in trunk: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jul 10 06:09:14 EDT 2010
Author: alessio.soldano at jboss.com
Date: 2010-07-10 06:09:14 -0400 (Sat, 10 Jul 2010)
New Revision: 106545
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/testsuite/build.xml
Log:
[JBAS-8131][JBAS-8165] Moving to jbossws-cxf 3.4.0.Beta1, removing Spring libraries from AS distribution and mvoing to patched Apache CXF 2.2.9
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-07-09 21:22:14 UTC (rev 106544)
+++ trunk/build/build.xml 2010-07-10 10:09:14 UTC (rev 106545)
@@ -1991,7 +1991,6 @@
<fileset refid="org.apache.cxf:cxf-common-schemas:jar"/>
<fileset refid="org.apache.cxf:cxf-common-utilities:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-coloc:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-bindings-corba:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-http:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-object:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-soap:jar"/>
@@ -2001,7 +2000,6 @@
<fileset refid="org.apache.cxf:cxf-rt-databinding-jaxb:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-jaxws:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-javascript:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-management:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-http:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-http-jetty:jar"/>
@@ -2181,14 +2179,6 @@
<fileset refid="org.hornetq:hornetq-logging:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-jms:jar"/>
- <fileset refid="org.springframework:spring-aop:jar"/>
- <fileset refid="org.springframework:spring-asm:jar"/>
- <fileset refid="org.springframework:spring-beans:jar"/>
- <fileset refid="org.springframework:spring-context:jar"/>
- <fileset refid="org.springframework:spring-core:jar"/>
- <fileset refid="org.springframework:spring-expression:jar"/>
- <fileset refid="org.springframework:spring-jms:jar"/>
- <fileset refid="org.springframework:spring-tx:jar"/>
<mapper refid="remove-versions" />
</copy>
<!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
@@ -2307,7 +2297,6 @@
<fileset refid="org.apache.cxf:cxf-common-schemas:jar"/>
<fileset refid="org.apache.cxf:cxf-common-utilities:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-coloc:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-bindings-corba:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-http:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-object:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-soap:jar"/>
@@ -2317,7 +2306,6 @@
<fileset refid="org.apache.cxf:cxf-rt-databinding-jaxb:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-jaxws:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-javascript:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-management:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-http:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-http-jetty:jar"/>
@@ -2447,14 +2435,6 @@
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
- <fileset refid="org.springframework:spring-aop:jar"/>
- <fileset refid="org.springframework:spring-asm:jar"/>
- <fileset refid="org.springframework:spring-beans:jar"/>
- <fileset refid="org.springframework:spring-context:jar"/>
- <fileset refid="org.springframework:spring-core:jar"/>
- <fileset refid="org.springframework:spring-expression:jar"/>
- <fileset refid="org.springframework:spring-jms:jar"/>
- <fileset refid="org.springframework:spring-tx:jar"/>
<mapper refid="remove-versions" />
</copy>
<!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-07-09 21:22:14 UTC (rev 106544)
+++ trunk/component-matrix/pom.xml 2010-07-10 10:09:14 UTC (rev 106545)
@@ -32,7 +32,7 @@
<properties>
<version.apache.aries.jmx>0.1-incubating-20100329</version.apache.aries.jmx>
<version.apache.aries.util>0.1-incubating-20100329</version.apache.aries.util>
- <version.apache.cxf>2.2.9</version.apache.cxf>
+ <version.apache.cxf>2.2.9-patch-01</version.apache.cxf>
<version.apache.neethi>2.0.4</version.apache.neethi>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.velocity>1.6.2</version.apache.velocity>
@@ -52,9 +52,9 @@
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.3.0.GA</version.jboss.jbossws-native>
- <version.jboss.jbossws-cxf>3.3.1.SP1</version.jboss.jbossws-cxf>
- <version.jboss.jbossws-common>1.3.0.GA</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.3.0.GA</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-cxf>3.4.0.Beta1</version.jboss.jbossws-cxf>
+ <version.jboss.jbossws-common>1.4.0.Beta1</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.4.0.Beta1</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.4.0.Beta1</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jsf-deployer>1.0.0</version.jboss.jsf-deployer>
@@ -467,33 +467,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${version.apache.cxf}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${version.apache.cxf}</version>
<exclusions>
@@ -523,6 +496,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -530,6 +509,10 @@
<version>${version.apache.cxf}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
@@ -562,8 +545,16 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -595,6 +586,10 @@
<artifactId>saaj-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-javascript</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
@@ -1421,6 +1416,10 @@
<artifactId>wstx-lgpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-07-09 21:22:14 UTC (rev 106544)
+++ trunk/testsuite/build.xml 2010-07-10 10:09:14 UTC (rev 106545)
@@ -187,9 +187,11 @@
</path>
<path id="org.springframework.classpath">
<fileset refid="org.springframework:spring-aop:jar"/>
+ <fileset refid="org.springframework:spring-asm:jar"/>
<fileset refid="org.springframework:spring-beans:jar"/>
<fileset refid="org.springframework:spring-context:jar"/>
<fileset refid="org.springframework:spring-core:jar"/>
+ <fileset refid="org.springframework:spring-expression:jar"/>
<fileset refid="org.springframework:spring-web:jar"/>
<fileset refid="org.springframework:spring-webmvc:jar"/>
</path>
More information about the jboss-cvs-commits
mailing list