Add "-configurer" suffix to view configurer element names

Issue: SPR-7093

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

@@ -27,13 +27,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Parse the <mvc:velocity> MVC namespace element and register
+ * Parse the <mvc:freemarker-configurer> MVC namespace element and register
  * FreeMarkerConfigurer bean
  *
  * @author Rossen Stoyanchev
  * @since 4.1
  */
-public class FreeMarkerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+public class FreeMarkerConfigurerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
 	public static final String BEAN_NAME = "mvcFreeMarkerConfigurer";
 

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

@@ -19,18 +19,17 @@ package org.springframework.web.servlet.config;
 import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 
 /**
- * Parse the <mvc:groovy-markup> MVC namespace element and register a
+ * Parse the <mvc:groovy-configurer> MVC namespace element and register a
  * GroovyConfigurer bean
  *
  * @author Sebastien Deleuze
  * @since 4.1
  */
-public class GroovyMarkupBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
+public class GroovyMarkupConfigurerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
 
 	public static final String BEAN_NAME = "mvcGroovyMarkupConfigurer";
 

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

@@ -38,10 +38,10 @@ public class MvcNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("redirect-view-controller", new ViewControllerBeanDefinitionParser());
 		registerBeanDefinitionParser("status-controller", new ViewControllerBeanDefinitionParser());
 		registerBeanDefinitionParser("view-resolvers", new ViewResolversBeanDefinitionParser());
-		registerBeanDefinitionParser("tiles", new TilesBeanDefinitionParser());
-		registerBeanDefinitionParser("freemarker", new FreeMarkerBeanDefinitionParser());
-		registerBeanDefinitionParser("velocity", new VelocityBeanDefinitionParser());
-		registerBeanDefinitionParser("groovy-markup", new GroovyMarkupBeanDefinitionParser());
+		registerBeanDefinitionParser("tiles-configurer", new TilesConfigurerBeanDefinitionParser());
+		registerBeanDefinitionParser("freemarker-configurer", new FreeMarkerConfigurerBeanDefinitionParser());
+		registerBeanDefinitionParser("velocity-configurer", new VelocityConfigurerBeanDefinitionParser());
+		registerBeanDefinitionParser("groovy-configurer", new GroovyMarkupConfigurerBeanDefinitionParser());
 	}
 
 }

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

@@ -28,13 +28,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Parse the <mvc:tiles> MVC namespace element and register
+ * Parse the <mvc:tiles-configurer> MVC namespace element and register
  * TilesConfigurer bean
 
  * @author Rossen Stoyanchev
  * @since 4.1
  */
-public class TilesBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+public class TilesConfigurerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
 	public static final String BEAN_NAME = "mvcTilesConfigurer";
 

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

@@ -24,13 +24,13 @@ import org.w3c.dom.Element;
 
 
 /**
- * Parse the <mvc:velocity> MVC namespace element and register an
+ * Parse the <mvc:velocity-configurer> MVC namespace element and register an
  * VelocityConfigurer bean
  *
  * @author Rossen Stoyanchev
  * @since 4.1
  */
-public class VelocityBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
+public class VelocityConfigurerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
 
 	public static final String BEAN_NAME = "mvcVelocityConfigurer";
 

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

@@ -49,7 +49,7 @@ import org.w3c.dom.Element;
  * before or after it.
  *
  * <p>When content negotiation is enabled the order property is set to highest priority
- * instead with the ContentNeogitatingViewResolver encapsulating all other registered
+ * instead with the ContentNegotiatingViewResolver encapsulating all other registered
  * view resolver instances. That way the resolvers registered through the MVC namespace
  * form self-encapsulated resolver chain.
  *
@@ -57,9 +57,9 @@ import org.w3c.dom.Element;
  * @author Sebastien Deleuze
  * @author Rossen Stoyanchev
  * @since 4.1
- * @see org.springframework.web.servlet.config.TilesBeanDefinitionParser
- * @see org.springframework.web.servlet.config.FreeMarkerBeanDefinitionParser
- * @see org.springframework.web.servlet.config.VelocityBeanDefinitionParser
+ * @see TilesConfigurerBeanDefinitionParser
+ * @see FreeMarkerConfigurerBeanDefinitionParser
+ * @see VelocityConfigurerBeanDefinitionParser
  */
 public class ViewResolversBeanDefinitionParser implements BeanDefinitionParser {
 

spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd

@@ -871,7 +871,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="tiles">
+	<xsd:element name="tiles-configurer">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 	Configure Tiles 3.x by registering a TilesConfigurer bean.
@@ -911,7 +911,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="freemarker">
+	<xsd:element name="freemarker-configurer">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 	Configure FreeMarker for view resolution by registering a FreeMarkerConfigurer bean.
@@ -935,7 +935,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="velocity">
+	<xsd:element name="velocity-configurer">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 	Configure Velocity for view resolution by registering a VelocityConfigurer bean.
@@ -953,7 +953,7 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="groovy-markup">
+	<xsd:element name="groovy-configurer">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 	Configure the Groovy markup template engine for view resolution by registering a GroovyMarkupConfigurer bean.

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

@@ -28,17 +28,17 @@
 		<mvc:groovy />
 	</mvc:view-resolvers>
 
-	<mvc:tiles check-refresh="true">
+	<mvc:tiles-configurer check-refresh="true">
 		<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml" />
-	</mvc:tiles>
+	</mvc:tiles-configurer>
 
-	<mvc:freemarker>
+	<mvc:freemarker-configurer>
 		<mvc:template-loader-path location="/org/springframework/web/servlet/view" />
-	</mvc:freemarker>
+	</mvc:freemarker-configurer>
 
-	<mvc:velocity resource-loader-path="/org/springframework/web/servlet/view" />
+	<mvc:velocity-configurer resource-loader-path="/org/springframework/web/servlet/view" />
 
-	<mvc:groovy-markup />
+	<mvc:groovy-configurer />
 
 </beans>
  

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

@@ -19,19 +19,19 @@
 
 	<bean id="customResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
 
-	<mvc:tiles check-refresh="true" validate-definitions="true">
+	<mvc:tiles-configurer check-refresh="true" validate-definitions="true">
 		<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml" />
 		<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles2.xml" />
-	</mvc:tiles>
+	</mvc:tiles-configurer>
 
-	<mvc:freemarker>
+	<mvc:freemarker-configurer>
 		<mvc:template-loader-path location="/" />
 		<mvc:template-loader-path location="/test" />
-	</mvc:freemarker>
+	</mvc:freemarker-configurer>
 
-	<mvc:velocity resource-loader-path="/test" />
+	<mvc:velocity-configurer resource-loader-path="/test" />
 
-	<mvc:groovy-markup resource-loader-path="/test" cache-templates="false" auto-indent="true" />
+	<mvc:groovy-configurer resource-loader-path="/test" cache-templates="false" auto-indent="true" />
 
 </beans>