Deprecate Hibernate 3 support

Issue: SPR-13230

spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java

@@ -49,7 +49,9 @@ import org.springframework.beans.factory.InitializingBean;
  * @see #setExposeTransactionAwareSessionFactory
  * @see org.hibernate.SessionFactory#getCurrentSession()
  * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public abstract class AbstractSessionFactoryBean extends HibernateExceptionTranslator
 		implements FactoryBean<SessionFactory>, InitializingBean, DisposableBean {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java

@@ -61,7 +61,9 @@ import org.springframework.beans.factory.InitializingBean;
  * @since 1.2
  * @see org.hibernate.engine.FilterDefinition
  * @see LocalSessionFactoryBean#setFilterDefinitions
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class FilterDefinitionFactoryBean implements FactoryBean<FilterDefinition>, BeanNameAware, InitializingBean {
 
 	private final TypeResolver typeResolver = new TypeResolver();

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java

@@ -48,7 +48,9 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
  * @see HibernateTemplate
  * @see HibernateInterceptor
  * @see #setFlushMode
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public abstract class HibernateAccessor implements InitializingBean, BeanFactoryAware {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java

@@ -40,7 +40,9 @@ import org.hibernate.Session;
  * @since 1.2
  * @see HibernateTemplate
  * @see HibernateTransactionManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public interface HibernateCallback<T> {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java

@@ -39,7 +39,9 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
  * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor
  * @see SessionFactoryUtils#convertHibernateAccessException(HibernateException)
  * @see SQLExceptionTranslator
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class HibernateExceptionTranslator implements PersistenceExceptionTranslator {
 
 	private SQLExceptionTranslator jdbcExceptionTranslator;

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java

@@ -29,7 +29,9 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @author Juergen Hoeller
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class HibernateJdbcException extends UncategorizedDataAccessException {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java

@@ -28,7 +28,9 @@ import org.springframework.orm.ObjectRetrievalFailureException;
  * @author Juergen Hoeller
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class HibernateObjectRetrievalFailureException extends ObjectRetrievalFailureException {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java

@@ -62,7 +62,9 @@ import org.springframework.dao.DataAccessException;
  * @see org.springframework.transaction.jta.JtaTransactionManager
  * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
  * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public interface HibernateOperations {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java

@@ -30,7 +30,9 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
  * @author Juergen Hoeller
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class HibernateOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java

@@ -27,7 +27,9 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @author Juergen Hoeller
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class HibernateQueryException extends InvalidDataAccessResourceUsageException {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java

@@ -28,7 +28,9 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @author Juergen Hoeller
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class HibernateSystemException extends UncategorizedDataAccessException {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java

@@ -104,7 +104,9 @@ import org.springframework.util.Assert;
  * @see org.springframework.transaction.jta.JtaTransactionManager
  * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
  * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("deprecation")
 public class HibernateTemplate extends HibernateAccessor implements HibernateOperations {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java

@@ -128,7 +128,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.springframework.jdbc.core.JdbcTemplate
  * @see org.springframework.jdbc.datasource.DataSourceTransactionManager
  * @see org.springframework.transaction.jta.JtaTransactionManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class HibernateTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, BeanFactoryAware, InitializingBean {

spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java

@@ -36,7 +36,9 @@ import org.springframework.jdbc.datasource.DataSourceUtils;
  * @author Juergen Hoeller
  * @since 1.2
  * @see LocalSessionFactoryBean#setDataSource
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 
 	private DataSource dataSource;

spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java

@@ -23,7 +23,9 @@ package org.springframework.orm.hibernate3;
  *
  * @author Juergen Hoeller
  * @since 2.5.1
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LocalJtaDataSourceConnectionProvider extends LocalDataSourceConnectionProvider {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java

@@ -36,7 +36,9 @@ import org.hibernate.cfg.Settings;
  * @author Juergen Hoeller
  * @since 3.0
  * @see LocalSessionFactoryBean#setCacheRegionFactory
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LocalRegionFactoryProxy implements RegionFactory {
 
 	private final RegionFactory regionFactory;

spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java

@@ -102,7 +102,9 @@ import org.springframework.util.StringUtils;
  * @see #setJtaTransactionManager
  * @see org.hibernate.SessionFactory#getCurrentSession()
  * @see HibernateTransactionManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implements BeanClassLoaderAware {
 
 	private static final ThreadLocal<DataSource> configTimeDataSourceHolder =

spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java

@@ -41,7 +41,9 @@ import org.hibernate.transaction.TransactionManagerLookup;
  * @since 1.2
  * @see LocalSessionFactoryBean#setJtaTransactionManager
  * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LocalTransactionManagerLookup implements TransactionManagerLookup {
 
 	private final TransactionManager transactionManager;

spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java

@@ -100,7 +100,9 @@ import org.springframework.util.Assert;
  * @see HibernateTransactionManager
  * @see org.springframework.transaction.jta.JtaTransactionManager
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public abstract class SessionFactoryUtils {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java

@@ -37,7 +37,9 @@ import org.springframework.util.Assert;
  * @since 1.2
  * @see HibernateTransactionManager
  * @see SessionFactoryUtils
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class SessionHolder extends ResourceHolderSupport {
 
 	private static final Object DEFAULT_KEY = new Object();

spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java

@@ -37,7 +37,9 @@ import org.hibernate.engine.SessionFactoryImplementor;
  * @since 2.0
  * @see SessionFactoryUtils#doGetSession
  * @see LocalSessionFactoryBean#setExposeTransactionAwareSessionFactory
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class SpringSessionContext implements CurrentSessionContext {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java

@@ -42,7 +42,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @since 1.2
  * @see SessionFactoryUtils
  * @see org.springframework.transaction.jta.JtaTransactionManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 class SpringSessionSynchronization implements TransactionSynchronization, Ordered {
 
 	private final SessionHolder sessionHolder;

spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java

@@ -36,7 +36,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @since 2.5.4
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.hibernate.transaction.JDBCTransactionFactory
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class SpringTransactionFactory implements TransactionFactory {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java

@@ -28,7 +28,9 @@ import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
  * @author Juergen Hoeller
  * @since 1.2
  * @see LocalSessionFactoryBean#setUseTransactionAwareDataSource
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class TransactionAwareDataSourceConnectionProvider extends LocalDataSourceConnectionProvider {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java

@@ -48,7 +48,9 @@ import org.springframework.beans.factory.InitializingBean;
  * @author Juergen Hoeller
  * @since 1.2
  * @see LocalSessionFactoryBean#setTypeDefinitions(TypeDefinitionBean[])
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class TypeDefinitionBean implements BeanNameAware, InitializingBean {
 
 	private String typeName;

spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java

@@ -38,7 +38,6 @@ import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -74,8 +73,11 @@ import org.springframework.util.ClassUtils;
  * @see #setHibernateProperties
  * @see #setAnnotatedClasses
  * @see #setAnnotatedPackages
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
-public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implements ResourceLoaderAware {
+@Deprecated
+public class AnnotationSessionFactoryBean extends org.springframework.orm.hibernate3.LocalSessionFactoryBean
+		implements ResourceLoaderAware {
 
 	private static final String RESOURCE_PATTERN = "/**/*.class";
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java

@@ -32,7 +32,6 @@ import org.hibernate.util.EqualsHelper;
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobCreatorUtils;
 import org.springframework.jdbc.support.lob.LobHandler;
-import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
 
 /**
  * Abstract base class for Hibernate UserType implementations that map to LOBs.
@@ -52,7 +51,9 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
  * @see org.springframework.jdbc.support.lob.LobCreator
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setJtaTransactionManager
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public abstract class AbstractLobType implements UserType {
 
 	protected final Log logger = LogFactory.getLog(getClass());
@@ -69,8 +70,8 @@ public abstract class AbstractLobType implements UserType {
 	 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#getConfigTimeTransactionManager
 	 */
 	protected AbstractLobType() {
-		this(LocalSessionFactoryBean.getConfigTimeLobHandler(),
-			LocalSessionFactoryBean.getConfigTimeTransactionManager());
+		this(org.springframework.orm.hibernate3.LocalSessionFactoryBean.getConfigTimeLobHandler(),
+				org.springframework.orm.hibernate3.LocalSessionFactoryBean.getConfigTimeTransactionManager());
 	}
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java

@@ -22,8 +22,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.SessionFactory;
 
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
-import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
@@ -40,19 +38,21 @@ import org.springframework.web.context.request.async.DeferredResultProcessingInt
  *
  * @author Rossen Stoyanchev
  * @since 3.2.5
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter implements DeferredResultProcessingInterceptor {
 
 	private static final Log logger = LogFactory.getLog(AsyncRequestInterceptor.class);
 
 	private final SessionFactory sessionFactory;
 
-	private final SessionHolder sessionHolder;
+	private final org.springframework.orm.hibernate3.SessionHolder sessionHolder;
 
 	private volatile boolean timeoutInProgress;
 
 
-	public AsyncRequestInterceptor(SessionFactory sessionFactory, SessionHolder sessionHolder) {
+	public AsyncRequestInterceptor(SessionFactory sessionFactory, org.springframework.orm.hibernate3.SessionHolder sessionHolder) {
 		this.sessionFactory = sessionFactory;
 		this.sessionHolder = sessionHolder;
 	}
@@ -87,7 +87,7 @@ class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter imple
 	private void closeAfterTimeout() {
 		if (this.timeoutInProgress) {
 			logger.debug("Closing Hibernate Session after async request timeout");
-			SessionFactoryUtils.closeSession(this.sessionHolder.getSession());
+			org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(this.sessionHolder.getSession());
 		}
 	}
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java

@@ -38,7 +38,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @author Juergen Hoeller
  * @since 1.2
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class BlobByteArrayType extends AbstractLobType  {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java

@@ -46,7 +46,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @author Juergen Hoeller
  * @since 1.2
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class BlobSerializableType extends AbstractLobType {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java

@@ -44,7 +44,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @since 1.2.7
  * @see #getCharacterEncoding()
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class BlobStringType extends AbstractLobType {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java

@@ -40,7 +40,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @author Juergen Hoeller
  * @since 1.2
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class ClobStringType extends AbstractLobType {
 
 	/**

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java

@@ -23,8 +23,6 @@ import org.hibernate.SessionFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.support.DaoSupport;
-import org.springframework.orm.hibernate3.HibernateTemplate;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
 
 /**
  * Convenient super class for Hibernate-based data access objects.
@@ -56,10 +54,12 @@ import org.springframework.orm.hibernate3.SessionFactoryUtils;
  * @see #setSessionFactory
  * @see #getHibernateTemplate
  * @see org.springframework.orm.hibernate3.HibernateTemplate
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public abstract class HibernateDaoSupport extends DaoSupport {
 
-	private HibernateTemplate hibernateTemplate;
+	private org.springframework.orm.hibernate3.HibernateTemplate hibernateTemplate;
 
 
 	/**
@@ -83,8 +83,8 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * @return the new HibernateTemplate instance
 	 * @see #setSessionFactory
 	 */
-	protected HibernateTemplate createHibernateTemplate(SessionFactory sessionFactory) {
-		return new HibernateTemplate(sessionFactory);
+	protected org.springframework.orm.hibernate3.HibernateTemplate createHibernateTemplate(SessionFactory sessionFactory) {
+		return new org.springframework.orm.hibernate3.HibernateTemplate(sessionFactory);
 	}
 
 	/**
@@ -99,7 +99,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * as an alternative to specifying a SessionFactory.
 	 * @see #setSessionFactory
 	 */
-	public final void setHibernateTemplate(HibernateTemplate hibernateTemplate) {
+	public final void setHibernateTemplate(org.springframework.orm.hibernate3.HibernateTemplate hibernateTemplate) {
 		this.hibernateTemplate = hibernateTemplate;
 	}
 
@@ -113,7 +113,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * {@code new HibernateTemplate(getSessionFactory())}, in which case
 	 * you're allowed to customize the settings on the resulting instance.
 	 */
-	public final HibernateTemplate getHibernateTemplate() {
+	public final org.springframework.orm.hibernate3.HibernateTemplate getHibernateTemplate() {
 	  return this.hibernateTemplate;
 	}
 
@@ -141,7 +141,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @throws IllegalStateException if no thread-bound Session found and allowCreate=false
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean)
-	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
+	 * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage
 	 */
 	@Deprecated
 	protected final Session getSession() throws DataAccessResourceFailureException, IllegalStateException {
@@ -166,15 +166,15 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @throws IllegalStateException if no thread-bound Session found and allowCreate=false
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean)
-	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
+	 * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage
 	 */
 	@Deprecated
 	protected final Session getSession(boolean allowCreate)
 			throws DataAccessResourceFailureException, IllegalStateException {
 
 		return (!allowCreate ?
-			SessionFactoryUtils.getSession(getSessionFactory(), false) :
-				SessionFactoryUtils.getSession(
+				org.springframework.orm.hibernate3.SessionFactoryUtils.getSession(getSessionFactory(), false) :
+				org.springframework.orm.hibernate3.SessionFactoryUtils.getSession(
 						getSessionFactory(),
 						this.hibernateTemplate.getEntityInterceptor(),
 						this.hibernateTemplate.getJdbcExceptionTranslator()));
@@ -192,7 +192,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * @param ex HibernateException that occurred
 	 * @return the corresponding DataAccessException instance
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#convertHibernateAccessException
-	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
+	 * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage
 	 */
 	@Deprecated
 	protected final DataAccessException convertHibernateAccessException(HibernateException ex) {
@@ -206,11 +206,11 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * {@link #getSession} and {@link #convertHibernateAccessException}.
 	 * @param session the Session to close
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#releaseSession
-	 * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage
+	 * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage
 	 */
 	@Deprecated
 	protected final void releaseSession(Session session) {
-		SessionFactoryUtils.releaseSession(session, getSessionFactory());
+		org.springframework.orm.hibernate3.SessionFactoryUtils.releaseSession(session, getSessionFactory());
 	}
 
 }

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java

@@ -48,7 +48,9 @@ import org.hibernate.persister.entity.EntityPersister;
  * @author Juergen Hoeller
  * @since 1.2
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setEventListeners(java.util.Map)
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings({"serial", "rawtypes", "deprecation"})
 public class IdTransferringMergeEventListener extends DefaultMergeEventListener {
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java

@@ -27,8 +27,6 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
-import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
@@ -91,7 +89,9 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.hibernate.SessionFactory#getCurrentSession()
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class OpenSessionInViewFilter extends OncePerRequestFilter {
 
 	public static final String DEFAULT_SESSION_FACTORY_BEAN_NAME = "sessionFactory";
@@ -127,8 +127,8 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 	 * its own session (like without Open Session in View). Each of those
 	 * sessions will be registered for deferred close, though, actually
 	 * processed at request completion.
-	 * @see SessionFactoryUtils#initDeferredClose
-	 * @see SessionFactoryUtils#processDeferredClose
+	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#initDeferredClose
+	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#processDeferredClose
 	 */
 	public void setSingleSession(boolean singleSession) {
 		this.singleSession = singleSession;
@@ -206,7 +206,7 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 				if (isFirstRequest || !applySessionBindingInterceptor(asyncManager, key)) {
 					logger.debug("Opening single Hibernate Session in OpenSessionInViewFilter");
 					Session session = getSession(sessionFactory);
-					SessionHolder sessionHolder = new SessionHolder(session);
+					org.springframework.orm.hibernate3.SessionHolder sessionHolder = new org.springframework.orm.hibernate3.SessionHolder(session);
 					TransactionSynchronizationManager.bindResource(sessionFactory, sessionHolder);
 
 					AsyncRequestInterceptor interceptor = new AsyncRequestInterceptor(sessionFactory, sessionHolder);
@@ -218,12 +218,12 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 		else {
 			// deferred close mode
 			Assert.state(!isAsyncStarted(request), "Deferred close mode is not supported on async dispatches");
-			if (SessionFactoryUtils.isDeferredCloseActive(sessionFactory)) {
+			if (org.springframework.orm.hibernate3.SessionFactoryUtils.isDeferredCloseActive(sessionFactory)) {
 				// Do not modify deferred close: just set the participate flag.
 				participate = true;
 			}
 			else {
-				SessionFactoryUtils.initDeferredClose(sessionFactory);
+				org.springframework.orm.hibernate3.SessionFactoryUtils.initDeferredClose(sessionFactory);
 			}
 		}
 
@@ -234,8 +234,8 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 			if (!participate) {
 				if (isSingleSession()) {
 					// single session mode
-					SessionHolder sessionHolder =
-							(SessionHolder) TransactionSynchronizationManager.unbindResource(sessionFactory);
+					org.springframework.orm.hibernate3.SessionHolder sessionHolder =
+							(org.springframework.orm.hibernate3.SessionHolder) TransactionSynchronizationManager.unbindResource(sessionFactory);
 					if (!isAsyncStarted(request)) {
 						logger.debug("Closing single Hibernate Session in OpenSessionInViewFilter");
 						closeSession(sessionHolder.getSession(), sessionFactory);
@@ -243,7 +243,7 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 				}
 				else {
 					// deferred close mode
-					SessionFactoryUtils.processDeferredClose(sessionFactory);
+					org.springframework.orm.hibernate3.SessionFactoryUtils.processDeferredClose(sessionFactory);
 				}
 			}
 		}
@@ -291,7 +291,7 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 	 * @see org.hibernate.FlushMode#MANUAL
 	 */
 	protected Session getSession(SessionFactory sessionFactory) throws DataAccessResourceFailureException {
-		Session session = SessionFactoryUtils.getSession(sessionFactory, true);
+		Session session = org.springframework.orm.hibernate3.SessionFactoryUtils.getSession(sessionFactory, true);
 		FlushMode flushMode = getFlushMode();
 		if (flushMode != null) {
 			session.setFlushMode(flushMode);
@@ -310,7 +310,7 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 	 * @param sessionFactory the SessionFactory that this filter uses
 	 */
 	protected void closeSession(Session session, SessionFactory sessionFactory) {
-		SessionFactoryUtils.closeSession(session);
+		org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(session);
 	}
 
 	private boolean applySessionBindingInterceptor(WebAsyncManager asyncManager, String key) {

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java

@@ -20,9 +20,6 @@ import org.hibernate.HibernateException;
 import org.hibernate.Session;
 
 import org.springframework.dao.DataAccessException;
-import org.springframework.orm.hibernate3.HibernateAccessor;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
-import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.context.request.AsyncWebRequestInterceptor;
@@ -91,8 +88,10 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.hibernate.SessionFactory#getCurrentSession()
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
-public class OpenSessionInViewInterceptor extends HibernateAccessor implements AsyncWebRequestInterceptor {
+@Deprecated
+public class OpenSessionInViewInterceptor extends org.springframework.orm.hibernate3.HibernateAccessor implements AsyncWebRequestInterceptor {
 
 	/**
 	 * Suffix that gets appended to the {@code SessionFactory}
@@ -121,8 +120,8 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	 * its own session (like without Open Session in View). Each of those
 	 * sessions will be registered for deferred close, though, actually
 	 * processed at request completion.
-	 * @see SessionFactoryUtils#initDeferredClose
-	 * @see SessionFactoryUtils#processDeferredClose
+	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#initDeferredClose
+	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#processDeferredClose
 	 */
 	public void setSingleSession(boolean singleSession) {
 		this.singleSession = singleSession;
@@ -154,7 +153,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 		}
 
 		if ((isSingleSession() && TransactionSynchronizationManager.hasResource(getSessionFactory())) ||
-			SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) {
+				org.springframework.orm.hibernate3.SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) {
 			// Do not modify the Session: just mark the request accordingly.
 			Integer count = (Integer) request.getAttribute(participateAttributeName, WebRequest.SCOPE_REQUEST);
 			int newCount = (count != null ? count + 1 : 1);
@@ -164,10 +163,10 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 			if (isSingleSession()) {
 				// single session mode
 				logger.debug("Opening single Hibernate Session in OpenSessionInViewInterceptor");
-				Session session = SessionFactoryUtils.getSession(
+				Session session = org.springframework.orm.hibernate3.SessionFactoryUtils.getSession(
 						getSessionFactory(), getEntityInterceptor(), getJdbcExceptionTranslator());
 				applyFlushMode(session, false);
-				SessionHolder sessionHolder = new SessionHolder(session);
+				org.springframework.orm.hibernate3.SessionHolder sessionHolder = new org.springframework.orm.hibernate3.SessionHolder(session);
 				TransactionSynchronizationManager.bindResource(getSessionFactory(), sessionHolder);
 
 				AsyncRequestInterceptor asyncRequestInterceptor =
@@ -177,7 +176,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 			}
 			else {
 				// deferred close mode
-				SessionFactoryUtils.initDeferredClose(getSessionFactory());
+				org.springframework.orm.hibernate3.SessionFactoryUtils.initDeferredClose(getSessionFactory());
 			}
 		}
 	}
@@ -193,8 +192,8 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	public void postHandle(WebRequest request, ModelMap model) throws DataAccessException {
 		if (isSingleSession()) {
 			// Only potentially flush in single session mode.
-			SessionHolder sessionHolder =
-					(SessionHolder) TransactionSynchronizationManager.getResource(getSessionFactory());
+			org.springframework.orm.hibernate3.SessionHolder sessionHolder =
+					(org.springframework.orm.hibernate3.SessionHolder) TransactionSynchronizationManager.getResource(getSessionFactory());
 			logger.debug("Flushing single Hibernate Session in OpenSessionInViewInterceptor");
 			try {
 				flushIfNecessary(sessionHolder.getSession(), false);
@@ -216,14 +215,14 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 		if (!decrementParticipateCount(request)) {
 			if (isSingleSession()) {
 				// single session mode
-				SessionHolder sessionHolder =
-						(SessionHolder) TransactionSynchronizationManager.unbindResource(getSessionFactory());
+				org.springframework.orm.hibernate3.SessionHolder sessionHolder =
+						(org.springframework.orm.hibernate3.SessionHolder) TransactionSynchronizationManager.unbindResource(getSessionFactory());
 				logger.debug("Closing single Hibernate Session in OpenSessionInViewInterceptor");
-				SessionFactoryUtils.closeSession(sessionHolder.getSession());
+				org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(sessionHolder.getSession());
 			}
 			else {
 				// deferred close mode
-				SessionFactoryUtils.processDeferredClose(getSessionFactory());
+				org.springframework.orm.hibernate3.SessionFactoryUtils.processDeferredClose(getSessionFactory());
 			}
 		}
 	}

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java

@@ -25,8 +25,6 @@ import org.hibernate.SessionFactory;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
-import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
@@ -49,7 +47,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.springframework.orm.hibernate3.HibernateTransactionManager
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.hibernate.SessionFactory#getCurrentSession()
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class OpenSessionInterceptor implements MethodInterceptor, InitializingBean {
 
 	private SessionFactory sessionFactory;
@@ -84,11 +84,11 @@ public class OpenSessionInterceptor implements MethodInterceptor, InitializingBe
 			// New Session to be bound for the current method's scope...
 			Session session = openSession();
 			try {
-				TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
+				TransactionSynchronizationManager.bindResource(sf, new org.springframework.orm.hibernate3.SessionHolder(session));
 				return invocation.proceed();
 			}
 			finally {
-				SessionFactoryUtils.closeSession(session);
+				org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(session);
 				TransactionSynchronizationManager.unbindResource(sf);
 			}
 		}

spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java

@@ -41,7 +41,9 @@ import org.springframework.aop.support.AopUtils;
  * @author Costin Leau
  * @author Juergen Hoeller
  * @since 2.0
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class ScopedBeanInterceptor extends EmptyInterceptor {
 

spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java

@@ -42,7 +42,9 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class HibernateInterceptorTests {
 
 	private SessionFactory sessionFactory;

spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java

@@ -55,7 +55,9 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class HibernateJtaTransactionTests {
 
 	@After

spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java

@@ -73,8 +73,10 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
-@SuppressWarnings({ "rawtypes", "unchecked" })
+@Deprecated
+@SuppressWarnings({"rawtypes", "unchecked"})
 public class HibernateTemplateTests {
 
 	private SessionFactory sessionFactory;

spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java

@@ -65,7 +65,9 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 @SuppressWarnings({"rawtypes", "unchecked", "deprecation"})
 public class HibernateTransactionManagerTests {
 

spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java

@@ -61,7 +61,9 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LocalSessionFactoryBeanTests {
 
 	@Test

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java

@@ -31,7 +31,9 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class HibernateDaoSupportTests {
 
 	@Test

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java

@@ -50,7 +50,9 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class LobTypeTests {
 
 	private ResultSet rs = mock(ResultSet.class);

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java

@@ -68,7 +68,9 @@ import static org.mockito.BDDMockito.*;
  * @author Rossen Stoyanchev
  * @author Phillip Webb
  * @since 05.03.2005
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class OpenSessionInViewTests {
 
 	private MockServletContext sc;

spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java

@@ -27,7 +27,9 @@ import static org.junit.Assert.*;
  * Unit tests for {@link ScopedBeanInterceptor}.
  *
  * @author Costin Leau
+ * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x
  */
+@Deprecated
 public class ScopedBeanInterceptorTests {
 
 	private final ScopedBeanInterceptor interceptor = new ScopedBeanInterceptor();