[jbossws-commits] JBossWS SVN: r12585 - in stack/cxf/trunk: modules/client/src/main/resources/META-INF/cxf and 1 other directories.
Author: alessio.soldano(a)jboss.com
Date: 2010-07-06 03:36:49 -0400 (Tue, 06 Jul 2010)
New Revision: 12585
Modified:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
stack/cxf/trunk/pom.xml
Log:
[JBWS-3039] Fixing issue + moving to Spring 3.0.3
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
---
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-07-05
18:01:23 UTC (rev 12584)
+++
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-07-06
07:36:49 UTC (rev 12585)
@@ -39,7 +39,8 @@
<list>
<bean
class="org.apache.cxf.resource.ClasspathResolver"/>
<bean
class="org.apache.cxf.resource.ClassLoaderResolver"/>
- <!-- <bean
class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
--> <!-- Restore once JBWS-3039 is solved -->
+ <!-- The following can be commented on AS 6 when not using Spring
3.0.3 or greater; see JBWS-3039 -->
+ <bean
class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/>
</list>
</property>
<property name="bus" ref="cxf"/>
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-07-05 18:01:23 UTC
(rev 12584)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-07-06 07:36:49 UTC
(rev 12585)
@@ -52,6 +52,3 @@
# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based
endpoints
org/jboss/test/ws/jaxws/jbws2268/**
-# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
-org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
-
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-07-05 18:01:23 UTC
(rev 12584)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-07-06 07:36:49 UTC
(rev 12585)
@@ -52,6 +52,3 @@
# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based
endpoints
org/jboss/test/ws/jaxws/jbws2268/**
-# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
-org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
-
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-05 18:01:23 UTC (rev 12584)
+++ stack/cxf/trunk/pom.xml 2010-07-06 07:36:49 UTC (rev 12585)
@@ -85,7 +85,7 @@
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
- <spring.version>3.0.1.RELEASE</spring.version>
+ <spring.version>3.0.3.RELEASE</spring.version>
</properties>