diff options
Diffstat (limited to 'spring-webmvc-tiles2/src')
10 files changed, 32 insertions, 6 deletions
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 561be3d9..0801804d 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 @@ -25,10 +25,13 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.DispatcherServlet; /** - * Abstract implementation of the Tiles2 {@link org.apache.tiles.preparer.PreparerFactory} + * Abstract implementation of the Tiles {@link org.apache.tiles.preparer.PreparerFactory} * interface, obtaining the current Spring WebApplicationContext and delegating to * {@link #getPreparer(String, org.springframework.web.context.WebApplicationContext)}. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @since 2.5 * @see #getPreparer(String, org.springframework.web.context.WebApplicationContext) 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 df596415..05292d6d 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 @@ -27,11 +27,14 @@ import org.apache.tiles.preparer.ViewPreparer; import org.springframework.web.context.WebApplicationContext; /** - * Tiles2 {@link org.apache.tiles.preparer.PreparerFactory} implementation + * Tiles {@link org.apache.tiles.preparer.PreparerFactory} implementation * that expects preparer class names and builds preparer instances for those, * creating them through the Spring ApplicationContext in order to apply * Spring container callbacks and configured Spring BeanPostProcessors. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @since 2.5 * @see SpringBeanPreparerFactory 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 1bd0e6b2..fc9ff0a8 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 @@ -22,12 +22,15 @@ import org.apache.tiles.preparer.ViewPreparer; import org.springframework.web.context.WebApplicationContext; /** - * Tiles2 {@link org.apache.tiles.preparer.PreparerFactory} implementation + * Tiles {@link org.apache.tiles.preparer.PreparerFactory} implementation * that expects preparer bean names and obtains preparer beans from the * Spring ApplicationContext. The full bean creation process will be in * the control of the Spring application context in this case, allowing * for the use of scoped beans etc. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @since 2.5 * @see SimpleSpringPreparerFactory 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 c3f0218f..39daf47b 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 @@ -36,6 +36,9 @@ import org.springframework.web.servlet.support.RequestContextUtils; * If you are using standard Tiles bootstrap, specify the name of this class * as value for the init-param "org.apache.tiles.locale.LocaleResolver". * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @since 2.5 * @see org.apache.tiles.definition.UrlDefinitionsFactory#LOCALE_RESOLVER_IMPL_PROPERTY 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 ed5d1d5c..488dde4d 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 @@ -33,6 +33,9 @@ import org.springframework.web.context.support.ServletContextResourcePatternReso /** * Spring-specific subclass of the Tiles ServletTilesApplicationContext. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @since 4.0.1 * @deprecated as of Spring 4.2, in favor of Tiles 3 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 92b88a4f..719c4510 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 @@ -102,6 +102,9 @@ import org.springframework.web.context.ServletContextAware; * The values in the list are the actual Tiles XML files containing the definitions. * If the list is not specified, the default is {@code "/WEB-INF/tiles.xml"}. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @since 2.5 * @see TilesView 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 16233561..60a42109 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 @@ -39,7 +39,7 @@ import org.springframework.web.servlet.view.AbstractUrlBasedView; * {@link org.springframework.web.servlet.View} implementation that retrieves a * Tiles definition. The "url" property is interpreted as name of a Tiles definition. * - * <p>This class builds on Tiles2, which requires JSP 2.0. + * <p>This class builds on Tiles, which requires JSP 2.0. * JSTL support is integrated out of the box due to JSTL's inclusion in JSP 2.0. * <b>Note: Spring 4.0 requires Tiles 2.2.2.</b> * @@ -47,6 +47,9 @@ import org.springframework.web.servlet.view.AbstractUrlBasedView; * the ServletContext. This container is typically set up via a * {@link TilesConfigurer} bean definition in the application context. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @author Sebastien Deleuze * @since 2.5 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 8c179ce5..f5c8fb3a 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 @@ -30,6 +30,9 @@ import org.springframework.web.servlet.view.UrlBasedViewResolver; * check for the existence of the specified template resources and only return * a non-null View object if the template was actually found. * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 and will be removed + * as of Spring Framework 5.0.</b>. + * * @author Juergen Hoeller * @author Sebastien Deleuze * @since 3.0 diff --git a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java index 6911a970..2bb31405 100644 --- a/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java +++ b/spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/package-info.java @@ -1,7 +1,10 @@ /** * Support classes for the integration of - * <a href="http://tiles.apache.org">Tiles2</a> + * <a href="http://tiles.apache.org">Tiles 2</a> * (the standalone version of Tiles) as Spring web view technology. * Contains a View implementation for Tiles definitions. + * + * <p><b>NOTE: Tiles 2 support is deprecated in favor of Tiles 3 + * and will be removed as of Spring Framework 5.0.</b>. */ package org.springframework.web.servlet.view.tiles2; diff --git a/spring-webmvc-tiles2/src/test/resources/jasperreports.properties b/spring-webmvc-tiles2/src/test/resources/jasperreports.properties deleted file mode 100644 index 967f217c..00000000 --- a/spring-webmvc-tiles2/src/test/resources/jasperreports.properties +++ /dev/null @@ -1 +0,0 @@ -net.sf.jasperreports.awt.ignore.missing.font=true
\ No newline at end of file |