Make Tiles 3 the default implementation in spring-webmvc

Move spring-webmvc-tiles3 content to spring-webmvc, and
create a spring-webmvc-tiles2 module with Tiles 2 support.

Its allows View Resolution to configure Tiles 3 instead of Tiles 2.

Issue: SPR-7093

build.gradle

@@ -781,22 +781,22 @@ project("spring-webmvc") {
 		}
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		optional("com.rometools:rome:1.5.0")
-		optional("org.apache.tiles:tiles-api:${tiles2Version}")
-		optional("org.apache.tiles:tiles-core:${tiles2Version}") {
+		optional("javax.el:javax.el-api:2.2.5")
+		optional("org.apache.tiles:tiles-api:${tiles3Version}")
+		optional("org.apache.tiles:tiles-core:${tiles3Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-servlet:${tiles2Version}") {
+		optional("org.apache.tiles:tiles-servlet:${tiles3Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-jsp:${tiles2Version}") {
+		optional("org.apache.tiles:tiles-jsp:${tiles3Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-el:${tiles2Version}") {
+		optional("org.apache.tiles:tiles-el:${tiles3Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-extras:${tiles2Version}") {
+		optional("org.apache.tiles:tiles-extras:${tiles3Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-			exclude group: "org.apache.velocity", module: "velocity-tools"
 			exclude group: "org.springframework", module: "spring-web"
 		}
 		testCompile(project(":spring-aop"))
@@ -829,8 +829,8 @@ project("spring-webmvc") {
 	sourceSets.main.resources.srcDirs += "src/main/java"
 }
 
-project("spring-webmvc-tiles3") {
-	description = "Spring Framework Tiles3 Integration"
+project("spring-webmvc-tiles2") {
+	description = "Spring Framework Tiles2 Integration"
 	merge.into = project(":spring-webmvc")
 
 	dependencies {
@@ -839,22 +839,22 @@ project("spring-webmvc-tiles3") {
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
 		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
-		optional("javax.el:javax.el-api:2.2.5")
-		optional("org.apache.tiles:tiles-api:${tiles3Version}")
-		optional("org.apache.tiles:tiles-core:${tiles3Version}") {
+		optional("org.apache.tiles:tiles-api:${tiles2Version}")
+		optional("org.apache.tiles:tiles-core:${tiles2Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-servlet:${tiles3Version}") {
+		optional("org.apache.tiles:tiles-servlet:${tiles2Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-jsp:${tiles3Version}") {
+		optional("org.apache.tiles:tiles-jsp:${tiles2Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-el:${tiles3Version}") {
+		optional("org.apache.tiles:tiles-el:${tiles2Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
-		optional("org.apache.tiles:tiles-extras:${tiles3Version}") {
+		optional("org.apache.tiles:tiles-extras:${tiles2Version}") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
+			exclude group: "org.apache.velocity", module: "velocity-tools"
 			exclude group: "org.springframework", module: "spring-web"
 		}
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
@@ -910,7 +910,7 @@ project("spring-test") {
 		optional("xmlunit:xmlunit:1.5")
 		testCompile(project(":spring-context-support"))
 		testCompile(project(":spring-oxm"))
-		testCompile(project(":spring-webmvc-tiles3"))
+		testCompile(project(":spring-webmvc-tiles2"))
 		testCompile("javax.mail:javax.mail-api:1.5.2")
 		testCompile("javax.ejb:ejb-api:3.0")
 		testCompile("org.hibernate:hibernate-core:${hibernate4Version}")

settings.gradle

@@ -21,7 +21,7 @@ include "spring-tx"
 include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
-include "spring-webmvc-tiles3"
+include "spring-webmvc-tiles2"
 include "spring-websocket"
 include "spring-framework-bom"
 

spring-webmvc-tiles2/src/test/resources/jasperreports.properties

@@ -0,0 +1 @@
+net.sf.jasperreports.awt.ignore.missing.font=true

spring-webmvc-tiles3/src/test/resources/log4j.properties → spring-webmvc-tiles2/src/test/resources/log4j.properties

@@ -2,7 +2,9 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n
 
-log4j.rootCategory=INFO, console
-log4j.logger.org.springframework.web=DEBUG
+log4j.rootCategory=WARN, console
+log4j.logger.org.springframework.beans=WARN
+log4j.logger.org.springframework.convert=DEBUG
+
+#log4j.logger.org.springframework.web.servlet=TRACE
 
-#log4j.logger.org.springframework.web.servlet.view.tiles3=TRACE

spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java

@@ -16,20 +16,20 @@
 
 import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
-import org.springframework.web.servlet.view.tiles2.TilesConfigurer;
-import org.springframework.web.servlet.view.tiles2.TilesView;
-import org.springframework.web.servlet.view.tiles2.TilesViewResolver;
+import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
+import org.springframework.web.servlet.view.tiles3.TilesView;
+import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 import org.w3c.dom.Element;
 
 
 public class ViewResolversBeanDefinitionParser implements BeanDefinitionParser {
 
 	private static final String INTERNAL_VIEW_RESOLVER_BEAN_NAME =
 			"org.springframework.web.servlet.view.InternalResourceViewResolver";
-	private static final String TILES2_VIEW_RESOLVER_BEAN_NAME =
-			"org.springframework.web.servlet.view.tiles2.TilesViewResolver";
-	private static final String TILES2_CONFIGURER_BEAN_NAME =
-			"org.springframework.web.servlet.view.tiles2.TilesConfigurer";
+	private static final String TILES3_VIEW_RESOLVER_BEAN_NAME =
+			"org.springframework.web.servlet.view.tiles3.TilesViewResolver";
+	private static final String TILES3_CONFIGURER_BEAN_NAME =
+			"org.springframework.web.servlet.view.tiles3.TilesConfigurer";
 	private static final String BEANNAME_VIEW_RESOLVER_BEAN_NAME =
 			"org.springframework.web.servlet.view.BeanNameViewResolver";
 	private static final String FREEMARKER_CONFIGURER_BEAN_NAME =
@@ -81,7 +81,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 	}
 
-	private void registerBean(String beanName,Map<String,Object> propertyMap,Class beanClass ){
+	private void registerBean(String beanName,Map<String,Object> propertyMap,Class<?> beanClass ){
 		RootBeanDefinition beanDef = new RootBeanDefinition(beanClass);
 		beanDef.setSource(source);
 		beanDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
@@ -125,20 +125,20 @@ private void registerBeanNameViewResolverBean(ParserContext parserContext, Eleme
 	}
 
 	private void registerTilesConfigurerBean(ParserContext parserContext,Element viewResolverElement) {
-		if (!parserContext.getRegistry().containsBeanDefinition(TILES2_CONFIGURER_BEAN_NAME)) {			
+		if (!parserContext.getRegistry().containsBeanDefinition(TILES3_CONFIGURER_BEAN_NAME)) {
 			Map<String, Object> propertyMap= new HashMap<String, Object>();			
 			propertyMap.put("definitions", viewResolverElement.getAttribute("definitions"));
-			registerBean(TILES2_CONFIGURER_BEAN_NAME, propertyMap, TilesConfigurer.class);		
+			registerBean(TILES3_CONFIGURER_BEAN_NAME, propertyMap, TilesConfigurer.class);
 		}	
 	}
 
 	private void registerTilesViewResolverBean(ParserContext parserContext, Element viewResolverElement) {
 
-		if (!parserContext.getRegistry().containsBeanDefinition(TILES2_VIEW_RESOLVER_BEAN_NAME)) {
+		if (!parserContext.getRegistry().containsBeanDefinition(TILES3_VIEW_RESOLVER_BEAN_NAME)) {
 			Map<String, Object> propertyMap= new HashMap<String, Object>();			
 			propertyMap.put("viewClass", TilesView.class);
 			propertyMap.put("order", 1);
-			registerBean(TILES2_VIEW_RESOLVER_BEAN_NAME, propertyMap, TilesViewResolver.class);			
+			registerBean(TILES3_VIEW_RESOLVER_BEAN_NAME, propertyMap, TilesViewResolver.class);
 		}		
 	}
 	private void registerInternalResourceViewResolverBean(ParserContext parserContext, Element viewResolverElement) {

spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java → spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java

@@ -22,7 +22,6 @@
 import org.apache.tiles.request.Request;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.web.servlet.view.tiles2.SpringBeanPreparerFactory;
 
 /**
  * Abstract implementation of the Tiles3 {@link org.apache.tiles.preparer.PreparerFactory}

spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

@@ -89,8 +89,8 @@
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
-import org.springframework.web.servlet.view.tiles2.TilesConfigurer;
-import org.springframework.web.servlet.view.tiles2.TilesViewResolver;
+import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
+import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 
 import static org.junit.Assert.*;
 

spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolvers.xml

@@ -5,13 +5,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/mvc  http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	 <mvc:view-resolvers>
-		<mvc:jsp prefix="/WEB-INF/" suffix=".jsp" /> 
+	<mvc:view-resolvers>
+		<mvc:jsp prefix="/WEB-INF/" suffix=".jsp" />
 		<mvc:bean-name />
-	<mvc:tiles definitions="/tiles.xml" />  
-
-		 <mvc:freemarker prefix="" suffix=".ftl" templateLoaderPath="/WEB-INF/ftl/" /> 
-	</mvc:view-resolvers> 
+		<mvc:tiles definitions="/org/springframework/web/servlet/resource/tiles/tiles1.xml,/org/springframework/web/servlet/resource/tiles/tiles2.xml" />
+		<mvc:freemarker prefix="" suffix=".ftl" templateLoaderPath="/" />
+	</mvc:view-resolvers>
 
 </beans>
 

spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/tiles/tiles2.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE tiles-definitions PUBLIC
+       "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+       "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+<tiles-definitions>
+	<definition name="base.definition"
+		template="/WEB-INF/jsp/layout.jsp">
+		<put-attribute name="title" value="" />
+		<put-attribute name="header" value="/WEB-INF/jsp/header.jsp" />
+		<put-attribute name="menu" value="/WEB-INF/jsp/menu.jsp" />
+		<put-attribute name="body" value="" />
+		<put-attribute name="footer" value="/WEB-INF/jsp/footer.jsp" />
+	</definition>
+
+	<definition name="contact" extends="base.definition">
+		<put-attribute name="title" value="Contact Manager" />
+		<put-attribute name="body" value="/WEB-INF/jsp/contact.jsp" />
+	</definition>
+
+</tiles-definitions>