Author: dkulp
Date: Thu Dec 17 22:11:59 2009
New Revision: 891945
URL: http://svn.apache.org/viewvc?rev=891945&view=rev
Log:
Add profile to test with Spring 3
Fix a compile issue with Spring 3. Lots of warnings with Spring 3
mostly due to deprecation, but compile errors are gone.
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
cxf/trunk/rt/transports/jms/pom.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=891945&r1=891944&r2=891945&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Dec 17 22:11:59 2009
@@ -1418,10 +1418,9 @@
</build>
</profile>
<profile>
- <id>spring2.0</id>
+ <id>spring3</id>
<properties>
- <spring.version>2.0.8</spring.version>
- <spring.mock>spring-mock</spring.mock>
+ <spring.version>3.0.0.RELEASE</spring.version>
</properties>
</profile>
<profile>
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=891945&r1=891944&r2=891945&view=diff
==============================================================================
---
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
(original)
+++
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
Thu Dec 17 22:11:59 2009
@@ -67,8 +67,7 @@
true)));
Collections.reverse(list);
for (String s : list) {
- Class<? extends T> c = context.getType(s);
- if (listener.loadBean(s, c)) {
+ if (listener.loadBean(s, type)) {
Object o = context.getBean(s);
if (listener.beanLoaded(s, type.cast(o))) {
return true;
Modified:
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml?rev=891945&r1=891944&r2=891945&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/clients.xml
Thu Dec 17 22:11:59 2009
@@ -29,7 +29,7 @@
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<bean class="org.apache.cxf.jaxws.spring.ClientHolderBean" id="greeters"
- autowire="autodetect">
+ autowire="default">
<property name="greet1">
<jaxws:client
serviceClass="org.apache.hello_world_soap_http.Greeter"
serviceName="s:SOAPService"
Modified: cxf/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=891945&r1=891944&r2=891945&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Thu Dec 17 22:11:59 2009
@@ -102,6 +102,11 @@
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
