Deprecate Tiles 2 support

Issue: SPR-12214
graykeel · Dec 30, 2014 · 0a36559 · 0a36559
1 parent d6b16ff
commit 0a36559
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 0 deletions.
diff --git a/.../main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/.../main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
@@ -34,7 +34,9 @@
  * @see #getPreparer(String, org.springframework.web.context.WebApplicationContext)
  * @see SimpleSpringPreparerFactory
  * @see SpringBeanPreparerFactory
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public abstract class AbstractSpringPreparerFactory implements PreparerFactory {
 
 	@Override

diff --git a/...rc/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java b/...rc/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java
@@ -35,7 +35,9 @@
  * @author Juergen Hoeller
  * @since 2.5
  * @see SpringBeanPreparerFactory
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class SimpleSpringPreparerFactory extends AbstractSpringPreparerFactory {
 
 	/** Cache of shared ViewPreparer instances: bean name -> bean instance */

diff --git a/.../src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java b/.../src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java
@@ -31,7 +31,9 @@
  * @author Juergen Hoeller
  * @since 2.5
  * @see SimpleSpringPreparerFactory
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class SpringBeanPreparerFactory extends AbstractSpringPreparerFactory {
 
 	@Override

diff --git a/...iles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java b/...iles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java
@@ -39,7 +39,9 @@
  * @author Juergen Hoeller
  * @since 2.5
  * @see org.apache.tiles.definition.UrlDefinitionsFactory#LOCALE_RESOLVER_IMPL_PROPERTY
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class SpringLocaleResolver extends DefaultLocaleResolver {
 
 	@Override

diff --git a/...springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java b/...springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java
@@ -35,7 +35,9 @@
  *
  * @author Juergen Hoeller
  * @since 4.0.1
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class SpringWildcardServletTilesApplicationContext extends ServletTilesApplicationContext {
 
 	private final ResourcePatternResolver resolver;

diff --git a/...mvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/...mvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java
@@ -106,7 +106,9 @@
  * @since 2.5
  * @see TilesView
  * @see TilesViewResolver
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class TilesConfigurer implements ServletContextAware, InitializingBean, DisposableBean {
 
 	private static final boolean tilesElPresent =

diff --git a/...ng-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java b/...ng-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java
@@ -52,7 +52,9 @@
  * @since 2.5
  * @see #setUrl
  * @see TilesConfigurer
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class TilesView extends AbstractUrlBasedView {
 
 	private boolean alwaysInclude = false;

diff --git a/...c-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java b/...c-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java
@@ -38,7 +38,9 @@
  * @see #setSuffix
  * @see #setRequestContextAttribute
  * @see TilesView
+ * @deprecated as of Spring 4.2, in favor of Tiles 3
  */
+@Deprecated
 public class TilesViewResolver extends UrlBasedViewResolver {
 
 	private Boolean alwaysInclude;