diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java index b917de2a174c..1ff892ad7c5b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java @@ -49,6 +49,7 @@ * @see org.springframework.beans.factory.BeanFactory * @see org.springframework.context.access.DefaultLocatorFactory * @see org.springframework.context.ApplicationContext + * @deprecated removed in 5 */ public interface BeanFactoryLocator { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java index c2c0a7c6294b..b0621a85a4e8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java @@ -28,6 +28,7 @@ * @author Colin Sampaleanu * @see BeanFactoryLocator * @see org.springframework.context.access.ContextBeanFactoryReference + * @deprecated removed in 5 */ public interface BeanFactoryReference { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java index d2a72bc368e6..da11959efa1f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java @@ -23,6 +23,7 @@ * * @author Rod Johnson * @since 02.12.2002 + * @deprecated removed in 5 */ @SuppressWarnings("serial") public class BootstrapException extends FatalBeanException { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java index 45be73287e4d..79e8d656c5e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java @@ -268,6 +268,7 @@ * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator * @see org.springframework.context.access.DefaultLocatorFactory */ +@Deprecated public class SingletonBeanFactoryLocator implements BeanFactoryLocator { private static final String DEFAULT_RESOURCE_LOCATION = "classpath*:beanRefFactory.xml"; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java index 631f08c56ebb..72b8ec0d3646 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SimpleSpringBeanELResolver.java @@ -28,6 +28,7 @@ * @author Juergen Hoeller * @since 2.5.2 */ +@Deprecated public class SimpleSpringBeanELResolver extends SpringBeanELResolver { private final BeanFactory beanFactory; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java index b2be5132c58f..370694cc7619 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java @@ -35,6 +35,7 @@ * @author Juergen Hoeller * @since 2.5.2 * @see org.springframework.web.jsf.el.SpringBeanFacesELResolver + * @deprecated removed in 5 */ public abstract class SpringBeanELResolver extends ELResolver { diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java index f978a3db4255..acd230c7fc35 100644 --- a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java +++ b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java @@ -34,6 +34,7 @@ * @since 13.02.2004 * @see org.springframework.context.ConfigurableApplicationContext#close */ +@Deprecated public class ContextBeanFactoryReference implements BeanFactoryReference { private ApplicationContext applicationContext; diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java index fe9493824b5c..1f149a8591fc 100644 --- a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java +++ b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java @@ -39,6 +39,7 @@ * @author Juergen Hoeller * @see #createBeanFactory */ +@Deprecated public class ContextJndiBeanFactoryLocator extends JndiLocatorSupport implements BeanFactoryLocator { /** diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java index 619e334afc59..27b95b0c67c7 100644 --- a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java +++ b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java @@ -49,6 +49,7 @@ * @see org.springframework.beans.factory.access.SingletonBeanFactoryLocator * @see org.springframework.context.access.DefaultLocatorFactory */ +@Deprecated public class ContextSingletonBeanFactoryLocator extends SingletonBeanFactoryLocator { private static final String DEFAULT_RESOURCE_LOCATION = "classpath*:beanRefContext.xml"; diff --git a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java index 1ac558f53804..7ccb6cadc453 100644 --- a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java +++ b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java @@ -25,6 +25,7 @@ * @author Colin Sampaleanu * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator */ +@Deprecated public class DefaultLocatorFactory { /** diff --git a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java index 17c2cef4b010..a014b90d0705 100644 --- a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java @@ -71,6 +71,7 @@ * @see org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator * @see #getBeanFactoryLocatorKey + * @deprecated removed in 5 */ public class SpringBeanAutowiringInterceptor { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java index 6a2bc943b6ae..a1ce45084bc2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java @@ -187,6 +187,7 @@ public JdbcTemplate(DataSource dataSource, boolean lazyInit) { * Useful if native Statement and/or ResultSet handles are expected for casting * to database-specific implementation classes, but a connection pool that wraps * JDBC objects is used (note: any pool will return wrapped Connections). + * @deprecated use {@link Wrapper#unwrap(Class)} */ public void setNativeJdbcExtractor(NativeJdbcExtractor extractor) { this.nativeJdbcExtractor = extractor; @@ -194,6 +195,7 @@ public void setNativeJdbcExtractor(NativeJdbcExtractor extractor) { /** * Return the current NativeJdbcExtractor implementation. + * @deprecated use {@link Wrapper#unwrap(Class)} */ public NativeJdbcExtractor getNativeJdbcExtractor() { return this.nativeJdbcExtractor; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java index d109506b4ee4..7ebcb92b9d8a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java @@ -45,6 +45,7 @@ * @see com.mchange.v2.c3p0.C3P0ProxyConnection#rawConnectionOperation * @see SimpleNativeJdbcExtractor */ +@Deprecated public class C3P0NativeJdbcExtractor extends NativeJdbcExtractorAdapter { private final Method getRawConnectionMethod; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java index e85a1efedfc6..207594c78484 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java @@ -46,6 +46,7 @@ * @see org.jboss.resource.adapter.jdbc.WrappedStatement#getUnderlyingStatement * @see org.jboss.resource.adapter.jdbc.WrappedResultSet#getUnderlyingResultSet */ +@Deprecated public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { // JBoss 7 diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java index b0113399330d..aac6fce6a5c1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java @@ -44,6 +44,7 @@ * @see org.springframework.jdbc.core.JdbcTemplate#setNativeJdbcExtractor * @see org.springframework.jdbc.support.lob.OracleLobHandler#setNativeJdbcExtractor */ +@Deprecated public class Jdbc4NativeJdbcExtractor extends NativeJdbcExtractorAdapter { private Class connectionType = Connection.class; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java index ca6d2ebb7de4..6c85e8822f1d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java @@ -64,6 +64,7 @@ * @see CommonsDbcpNativeJdbcExtractor * @see org.springframework.jdbc.core.JdbcTemplate#setNativeJdbcExtractor * @see org.springframework.jdbc.support.lob.OracleLobHandler#setNativeJdbcExtractor + * @deprecated use {@link Wrapper#unwrap(Class)} */ public interface NativeJdbcExtractor { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java index 60d859b71533..0220aafe3792 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java @@ -56,6 +56,7 @@ * @see #getNativeConnectionFromStatement * @see org.springframework.jdbc.datasource.ConnectionProxy */ +@Deprecated public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor { /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java index 1446c894360d..ea52f3dafde4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java @@ -40,6 +40,7 @@ * @author Juergen Hoeller * @since 3.0.5 */ +@Deprecated public class OracleJdbc4NativeJdbcExtractor extends Jdbc4NativeJdbcExtractor { @SuppressWarnings("unchecked") diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java index 5a6939c59ccb..19927a62dae7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java @@ -60,6 +60,7 @@ * @see org.springframework.jdbc.core.JdbcTemplate#setNativeJdbcExtractor * @see org.springframework.jdbc.support.lob.OracleLobHandler#setNativeJdbcExtractor */ +@Deprecated public class SimpleNativeJdbcExtractor extends NativeJdbcExtractorAdapter { private boolean nativeConnectionNecessaryForNativeStatements = false; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java index aa77ddca68a1..54e463da068a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java @@ -41,6 +41,7 @@ * @see #getNativeConnection * @see weblogic.jdbc.extensions.WLConnection#getVendorConnection */ +@Deprecated public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter { private static final String JDBC_EXTENSION_NAME = "weblogic.jdbc.extensions.WLConnection"; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java index 55e818d3818f..9a8111d91d48 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java @@ -38,6 +38,7 @@ * @author Juergen Hoeller * @since 1.1 */ +@Deprecated public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { private static final String JDBC_ADAPTER_CONNECTION_NAME = "com.ibm.ws.rsadapter.jdbc.WSJdbcConnection";