Removed outdated hibernate3 references across the codebase
Issue: SPR-9028
(cherry picked from commit 09e2e58)
This commit is contained in:
@@ -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.
|
||||
@@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
|
||||
* <p><b>Example:</b> web.xml, mapping all "/myservlet" requests to a Spring dispatcher.
|
||||
* Also defines a custom "myServlet", but <i>without</i> servlet mapping.
|
||||
*
|
||||
* <pre>
|
||||
* <pre class="code">
|
||||
* <servlet>
|
||||
* <servlet-name>myServlet</servlet-name>
|
||||
* <servlet-class>mypackage.TestServlet</servlet-class>
|
||||
@@ -59,7 +59,7 @@ import org.springframework.web.util.WebUtils;
|
||||
* configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
|
||||
* From the servlet point of view, everything will work as usual.
|
||||
*
|
||||
* <pre>
|
||||
* <pre class="code">
|
||||
* <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
|
||||
* <property name="interceptors">
|
||||
* <list>
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -48,7 +47,7 @@ import org.springframework.web.servlet.ModelAndView;
|
||||
* through the configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
|
||||
* From the Struts point of view, everything will work as usual.
|
||||
*
|
||||
* <pre>
|
||||
* <pre class="code">
|
||||
* <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
|
||||
* <property name="interceptors">
|
||||
* <list>
|
||||
@@ -79,15 +78,13 @@ 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;
|
||||
private Class<?> servletClass;
|
||||
|
||||
private String servletName;
|
||||
|
||||
@@ -103,7 +100,7 @@ public class ServletWrappingController extends AbstractController
|
||||
* Needs to implement {@code javax.servlet.Servlet}.
|
||||
* @see javax.servlet.Servlet
|
||||
*/
|
||||
public void setServletClass(Class servletClass) {
|
||||
public void setServletClass(Class<?> servletClass) {
|
||||
this.servletClass = servletClass;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user