From 0a36559a43780a232cb0191a8e8c9060799f8ce0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 30 Dec 2014 14:59:50 +0100 Subject: [PATCH] Deprecate Tiles 2 support Issue: SPR-12214 --- .../web/servlet/view/tiles2/AbstractSpringPreparerFactory.java | 2 ++ .../web/servlet/view/tiles2/SimpleSpringPreparerFactory.java | 2 ++ .../web/servlet/view/tiles2/SpringBeanPreparerFactory.java | 2 ++ .../web/servlet/view/tiles2/SpringLocaleResolver.java | 2 ++ .../tiles2/SpringWildcardServletTilesApplicationContext.java | 2 ++ .../web/servlet/view/tiles2/TilesConfigurer.java | 2 ++ .../org/springframework/web/servlet/view/tiles2/TilesView.java | 2 ++ .../web/servlet/view/tiles2/TilesViewResolver.java | 2 ++ 8 files changed, 16 insertions(+) diff --git a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java index 8738890403..561be3d9a3 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java @@ -34,7 +34,9 @@ import org.springframework.web.servlet.DispatcherServlet; * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java index 4dee4a8d8f..df5964153d 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java @@ -35,7 +35,9 @@ import org.springframework.web.context.WebApplicationContext; * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java index 527177951c..1bd0e6b2dc 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java @@ -31,7 +31,9 @@ import org.springframework.web.context.WebApplicationContext; * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java index 3bae928db5..c3f0218f03 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java @@ -39,7 +39,9 @@ import org.springframework.web.servlet.support.RequestContextUtils; * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java index b582ee3a41..ed5d1d5c05 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java @@ -35,7 +35,9 @@ import org.springframework.web.context.support.ServletContextResourcePatternReso * * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java index 0083bfd6e8..92b88a4f10 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java @@ -106,7 +106,9 @@ import org.springframework.web.context.ServletContextAware; * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java index d78e48b0a0..162335611c 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.java @@ -52,7 +52,9 @@ import org.springframework.web.servlet.view.AbstractUrlBasedView; * @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/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java index 2269c1df53..8c179ce5d5 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java @@ -38,7 +38,9 @@ import org.springframework.web.servlet.view.UrlBasedViewResolver; * @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;