Author: dkulp
Date: Wed May 22 16:47:15 2013
New Revision: 1485281
URL: http://svn.apache.org/r1485281
Log:
Update the Spring version, remove a bunch of SuppressWarnings that can be fixed
with dropping support for older Spring
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/api/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
cxf/trunk/services/sts/sts-core/pom.xml
cxf/trunk/systests/uncategorized/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=1485281&r1=1485280&r2=1485281&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
Wed May 22 16:47:15 2013
@@ -23,6 +23,7 @@ import org.springframework.aop.TargetSou
import org.springframework.aop.framework.Advised;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.util.ClassUtils;
/**
*
@@ -33,9 +34,8 @@ class SpringAopClassHelper extends Class
Class.forName("org.springframework.aop.framework.Advised");
}
- @SuppressWarnings("deprecation")
protected Class<?> getRealClassFromClassInternal(Class<?> cls) {
- if (AopUtils.isCglibProxyClass(cls)) {
+ if (ClassUtils.isCglibProxyClass(cls)) {
return getRealClassFromClassInternal(cls.getSuperclass());
}
return cls;
@@ -55,7 +55,6 @@ class SpringAopClassHelper extends Class
return o;
}
- @SuppressWarnings("deprecation")
protected Class<?> getRealClassInternal(Object o) {
if (AopUtils.isAopProxy(o) && (o instanceof Advised)) {
Advised advised = (Advised)o;
@@ -84,7 +83,7 @@ class SpringAopClassHelper extends Class
// ignore
}
- } else if (AopUtils.isCglibProxyClass(o.getClass())) {
+ } else if (ClassUtils.isCglibProxyClass(o.getClass())) {
return getRealClassFromClassInternal(AopUtils.getTargetClass(o));
}
return o.getClass();
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=1485281&r1=1485280&r2=1485281&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
Wed May 22 16:47:15 2013
@@ -329,7 +329,6 @@ public abstract class AbstractBeanDefini
return context;
}
- @SuppressWarnings("deprecation")
protected void mapElementToJaxbProperty(Element data,
BeanDefinitionBuilder bean,
String propertyName,
@@ -345,9 +344,9 @@ public abstract class AbstractBeanDefini
BeanDefinitionBuilder jaxbbean
=
BeanDefinitionBuilder.rootBeanDefinition(JAXBBeanFactory.class);
jaxbbean.getRawBeanDefinition().setFactoryMethodName("createJAXBBean");
- jaxbbean.addConstructorArg(getContext(c));
- jaxbbean.addConstructorArg(writer.toString());
- jaxbbean.addConstructorArg(c);
+ jaxbbean.addConstructorArgValue(getContext(c));
+ jaxbbean.addConstructorArgValue(writer.toString());
+ jaxbbean.addConstructorArgValue(c);
bean.addPropertyValue(propertyName,
jaxbbean.getBeanDefinition());
} catch (Exception ex) {
Unmarshaller u = getContext(c).createUnmarshaller();
@@ -391,7 +390,7 @@ public abstract class AbstractBeanDefini
Object ... args) {
return mapElementToJaxbBean(data, cls, factory, cls, method, args);
}
- @SuppressWarnings("deprecation")
+
public AbstractBeanDefinition mapElementToJaxbBean(Element data,
Class<?> cls,
Class<?> factory,
@@ -415,11 +414,11 @@ public abstract class AbstractBeanDefini
jaxbbean.getRawBeanDefinition().setFactoryBeanName(factory.getName());
}
jaxbbean.getRawBeanDefinition().setFactoryMethodName(method);
- jaxbbean.addConstructorArg(writer.toString());
- jaxbbean.addConstructorArg(getContext(jaxbClass));
+ jaxbbean.addConstructorArgValue(writer.toString());
+ jaxbbean.addConstructorArgValue(getContext(jaxbClass));
if (args != null) {
for (Object o : args) {
- jaxbbean.addConstructorArg(o);
+ jaxbbean.addConstructorArgValue(o);
}
}
return jaxbbean.getBeanDefinition();
@@ -505,9 +504,8 @@ 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);
+ new StringTokenizer(names,
BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
if (st.countTokens() > 0) {
id = st.nextToken();
}
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
Wed May 22 16:47:15 2013
@@ -46,7 +46,6 @@ public abstract class AbstractFactoryBea
return null;
}
- @SuppressWarnings("deprecation")
@Override
protected void doParse(Element element, ParserContext ctx,
BeanDefinitionBuilder bean) {
Class<?> factoryClass = getFactoryClass();
@@ -132,8 +131,9 @@ public abstract class AbstractFactoryBea
} else {
String factoryId = id + getFactoryIdSuffix();
ctx.getRegistry().registerBeanDefinition(factoryId,
factoryBean.getBeanDefinition());
- bean.getBeanDefinition().setAttribute("id", id);
- bean.setFactoryBean(factoryId, "create");
+ bean.getRawBeanDefinition().setAttribute("id", id);
+ bean.getRawBeanDefinition().setFactoryBeanName(factoryId);
+ bean.getRawBeanDefinition().setFactoryMethodName("create");
}
if (getDestroyMethod() != null) {
bean.setDestroyMethodName(getDestroyMethod());
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
---
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java
(original)
+++
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/StringBeanDefinitionParser.java
Wed May 22 16:47:15 2013
@@ -26,10 +26,9 @@ import org.springframework.beans.factory
public class StringBeanDefinitionParser extends
AbstractSingleBeanDefinitionParser {
- @SuppressWarnings("deprecation")
@Override
protected void doParse(Element element, BeanDefinitionBuilder builder) {
- builder.addConstructorArg(DOMUtils.getRawContent(element));
+ builder.addConstructorArgValue(DOMUtils.getRawContent(element));
}
@Override
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed May 22 16:47:15 2013
@@ -71,7 +71,7 @@
org.apache.cxf.*;-split-package:=first,
</cxf.osgi.export>
<cxf.osgi.dynamic.import />
- <cxf.osgi.spring.version>[3.0,4)</cxf.osgi.spring.version>
+ <cxf.osgi.spring.version>[3.1,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>
@@ -146,7 +146,8 @@
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.5</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
- <cxf.spring.version>3.1.3.RELEASE</cxf.spring.version>
+ <cxf.spring.version>3.2.3.RELEASE</cxf.spring.version>
+
<cxf.spring.security.version>3.1.4.RELEASE</cxf.spring.security.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>
@@ -1038,17 +1039,17 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>${cxf.spring.version}</version>
+ <version>${cxf.spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${cxf.spring.version}</version>
+ <version>${cxf.spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>${cxf.spring.version}</version>
+ <version>${cxf.spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
@@ -1080,7 +1081,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
- <version>${cxf.spring.version}</version>
+ <version>${cxf.spring.security.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
Modified:
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
(original)
+++
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineFactoryBeanDefinitionParser.java
Wed May 22 16:47:15 2013
@@ -65,7 +65,6 @@ public class JettyHTTPServerEngineFactor
}
- @SuppressWarnings("deprecation")
@Override
public void doParse(Element element, ParserContext ctx,
BeanDefinitionBuilder bean) {
//bean.setAbstract(true);
@@ -85,11 +84,11 @@ public class JettyHTTPServerEngineFactor
bean.addConstructorArgReference(bus);
}
- bean.addConstructorArg(mapElementToJaxbBean(element,
+ bean.addConstructorArgValue(mapElementToJaxbBean(element,
TLSServerParametersIdentifiedType.class,
JettySpringTypesFactory.class,
"createTLSServerParametersMap"));
- bean.addConstructorArg(mapElementToJaxbBean(element,
+ bean.addConstructorArgValue(mapElementToJaxbBean(element,
ThreadingParametersIdentifiedType.class,
JettySpringTypesFactory.class,
"createThreadingParametersMap"));
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
Wed May 22 16:47:15 2013
@@ -107,7 +107,6 @@ public class HttpConduitBeanDefinitionPa
* a TLSClientParametersConfig object initialized with the JAXB
* generated type unmarshalled from the selected node.
*/
- @SuppressWarnings("deprecation")
public void mapTLSClientParameters(Element e, BeanDefinitionBuilder bean) {
BeanDefinitionBuilder paramsbean
=
BeanDefinitionBuilder.rootBeanDefinition(TLSClientParametersConfig.TLSClientParametersTypeInternal.class);
@@ -176,7 +175,7 @@ public class HttpConduitBeanDefinitionPa
BeanDefinitionBuilder jaxbbean
=
BeanDefinitionBuilder.rootBeanDefinition(TLSClientParametersConfig.class);
jaxbbean.getRawBeanDefinition().setFactoryMethodName("createTLSClientParametersFromType");
- jaxbbean.addConstructorArg(paramsbean.getBeanDefinition());
+ jaxbbean.addConstructorArgValue(paramsbean.getBeanDefinition());
bean.addPropertyValue("tlsClientParameters",
jaxbbean.getBeanDefinition());
}
Modified: cxf/trunk/services/sts/sts-core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/pom.xml?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/pom.xml (original)
+++ cxf/trunk/services/sts/sts-core/pom.xml Wed May 22 16:47:15 2013
@@ -58,6 +58,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${cxf.spring.ldap.version}</version>
Modified: cxf/trunk/systests/uncategorized/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1485281&r1=1485280&r2=1485281&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Wed May 22 16:47:15 2013
@@ -298,61 +298,15 @@
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core-tiger</artifactId>
- <version>2.0.4</version>
+ <artifactId>spring-security-core</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
- <version>2.0.4</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
