Author: dkulp
Date: Tue Jan 8 18:49:32 2013
New Revision: 1430440
URL: http://svn.apache.org/viewvc?rev=1430440&view=rev
Log:
Update spring version a bit. Remove spring 2.5.x profiles and support
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
cxf/trunk/parent/pom.xml
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java?rev=1430440&r1=1430439&r2=1430440&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
Tue Jan 8 18:49:32 2013
@@ -33,6 +33,7 @@ class SpringAopClassHelper extends Class
Class.forName("org.springframework.aop.framework.Advised");
}
+ @SuppressWarnings("deprecation")
protected Class<?> getRealClassFromClassInternal(Class<?> cls) {
if (AopUtils.isCglibProxyClass(cls)) {
return getRealClassFromClassInternal(cls.getSuperclass());
@@ -54,6 +55,7 @@ class SpringAopClassHelper extends Class
return o;
}
+ @SuppressWarnings("deprecation")
protected Class<?> getRealClassInternal(Object o) {
if (AopUtils.isAopProxy(o) && (o instanceof Advised)) {
Advised advised = (Advised)o;
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=1430440&r1=1430439&r2=1430440&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Tue Jan 8 18:49:32 2013
@@ -505,6 +505,7 @@ public abstract class AbstractBeanDefini
if (null == id || "".equals(id)) {
String names = elem.getAttribute(BeanConstants.NAME_ATTR);
if (null != names) {
+ @SuppressWarnings("deprecation")
StringTokenizer st =
new StringTokenizer(names,
BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS);
if (st.countTokens() > 0) {
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1430440&r1=1430439&r2=1430440&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Jan 8 18:49:32 2013
@@ -71,7 +71,7 @@
org.apache.cxf.*;-split-package:=first,
</cxf.osgi.export>
<cxf.osgi.dynamic.import />
- <cxf.osgi.spring.version>[2.5,4)</cxf.osgi.spring.version>
+ <cxf.osgi.spring.version>[3.0,4)</cxf.osgi.spring.version>
<cxf.osgi.commons.lang.version>[2.4,3)</cxf.osgi.commons.lang.version>
<cxf.osgi.slf4j.version>[1.5,2)</cxf.osgi.slf4j.version>
<cxf.osgi.javax.annotation.version>[0.0,2)</cxf.osgi.javax.annotation.version>
@@ -145,7 +145,7 @@
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
<cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
- <cxf.spring.version>3.0.7.RELEASE</cxf.spring.version>
+ <cxf.spring.version>3.1.3.RELEASE</cxf.spring.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
@@ -1801,15 +1801,9 @@
</build>
</profile>
<profile>
- <id>spring2</id>
+ <id>spring3.0</id>
<properties>
- <cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
- </properties>
- </profile>
- <profile>
- <id>spring3.1</id>
- <properties>
- <cxf.spring.version>3.1.2.RELEASE</cxf.spring.version>
+ <cxf.spring.version>3.0.7.RELEASE</cxf.spring.version>
</properties>
</profile>
<profile>
