Such an interceptor can either be set at the SessionFactory level, * i.e. on LocalSessionFactoryBean, or at the Session level, i.e. on - * HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager. - * It's preferable to set it on LocalSessionFactoryBean or HibernateTransactionManager - * to avoid repeated configuration and guarantee consistent behavior in transactions. + * HibernateTransactionManager. * @see LocalSessionFactoryBean#setEntityInterceptor */ public void setEntityInterceptor(Interceptor entityInterceptor) { diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java index b8588a878ba..f1460003baf 100644 --- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java +++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,13 +40,12 @@ import org.springframework.util.Assert; * candidate exceptions. * - *
All of Spring's applicable resource factories (e.g. {@link - * org.springframework.orm.hibernate3.LocalSessionFactoryBean LocalSessionFactoryBean}, - * {@link org.springframework.orm.jpa.LocalEntityManagerFactoryBean - * LocalEntityManagerFactoryBean}) implement the {@code PersistenceExceptionTranslator} - * interface out of the box. As a consequence, all that is usually needed to enable - * automatic exception translation is marking all affected beans (such as Repositories or - * DAOs) with the {@code @Repository} annotation, along with defining this post-processor + *
All of Spring's applicable resource factories (e.g. + * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean}) + * implement the {@code PersistenceExceptionTranslator} interface out of the box. + * As a consequence, all that is usually needed to enable automatic exception + * translation is marking all affected beans (such as Repositories or DAOs) + * with the {@code @Repository} annotation, along with defining this post-processor * as a bean in the application context. * * @author Rod Johnson diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java index 1afea1cbcc9..bb14fb05253 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,8 +69,7 @@ import org.springframework.transaction.PlatformTransactionManager; * *
The "preInterceptors" and "postInterceptors" properties can be set to add * additional interceptors to the mix, like - * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor} or - * {@link org.springframework.orm.hibernate3.HibernateInterceptor}. + * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor}. * *
HINT: This class is often used with parent / child bean definitions. * Typically, you will define the transaction manager and default transaction diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java index 017861d8124..c3733d477da 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ import java.io.Flushable; * @see TransactionSynchronizationManager * @see AbstractPlatformTransactionManager * @see org.springframework.jdbc.datasource.DataSourceUtils#CONNECTION_SYNCHRONIZATION_ORDER - * @see org.springframework.orm.hibernate3.SessionFactoryUtils#SESSION_SYNCHRONIZATION_ORDER */ public interface TransactionSynchronization extends Flushable { diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java index cf782719599..37d9d83c1ee 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,7 +112,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im * @see #setInterceptors * @see org.springframework.web.context.request.WebRequestInterceptor * @see WebRequestHandlerInterceptorAdapter#WebRequestHandlerInterceptorAdapter(WebRequestInterceptor, boolean) - * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor + * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor */ public void setApplyWebRequestInterceptorsToRenderPhaseOnly(boolean applyWebRequestInterceptorsToRenderPhaseOnly) { this.applyWebRequestInterceptorsToRenderPhaseOnly = applyWebRequestInterceptorsToRenderPhaseOnly; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java index e9a014098b9..50cf151bff3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,10 +80,8 @@ import org.springframework.web.util.WebUtils; * @author Juergen Hoeller * @since 1.1.1 * @see ServletWrappingController - * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor - * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor - * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter + * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor + * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter */ public class ServletForwardingController extends AbstractController implements BeanNameAware { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java index 9fde9f8faad..8ca0ef0a298 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package org.springframework.web.servlet.mvc; import java.util.Enumeration; import java.util.Properties; - import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -79,13 +78,11 @@ import org.springframework.web.servlet.ModelAndView; * @author Juergen Hoeller * @since 1.1.1 * @see ServletForwardingController - * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor - * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor - * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter + * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor + * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter */ public class ServletWrappingController extends AbstractController - implements BeanNameAware, InitializingBean, DisposableBean { + implements BeanNameAware, InitializingBean, DisposableBean { private Class servletClass;