From 52f1be7ade665a0c6030cff630ce980827b4c304 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Thu, 17 Jul 2014 17:38:47 +0200 Subject: [PATCH] Add "-configurer" suffix to view configurer element names Issue: SPR-7093 --- ...=> FreeMarkerConfigurerBeanDefinitionParser.java} | 4 ++-- ... GroovyMarkupConfigurerBeanDefinitionParser.java} | 5 ++--- .../web/servlet/config/MvcNamespaceHandler.java | 8 ++++---- ...java => TilesConfigurerBeanDefinitionParser.java} | 4 ++-- ...a => VelocityConfigurerBeanDefinitionParser.java} | 4 ++-- .../config/ViewResolversBeanDefinitionParser.java | 8 ++++---- .../web/servlet/config/spring-mvc-4.1.xsd | 8 ++++---- ...vc-config-view-resolution-content-negotiation.xml | 12 ++++++------ .../servlet/config/mvc-config-view-resolution.xml | 12 ++++++------ 9 files changed, 32 insertions(+), 33 deletions(-) rename spring-webmvc/src/main/java/org/springframework/web/servlet/config/{FreeMarkerBeanDefinitionParser.java => FreeMarkerConfigurerBeanDefinitionParser.java} (92%) rename spring-webmvc/src/main/java/org/springframework/web/servlet/config/{GroovyMarkupBeanDefinitionParser.java => GroovyMarkupConfigurerBeanDefinitionParser.java} (86%) rename spring-webmvc/src/main/java/org/springframework/web/servlet/config/{TilesBeanDefinitionParser.java => TilesConfigurerBeanDefinitionParser.java} (93%) rename spring-webmvc/src/main/java/org/springframework/web/servlet/config/{VelocityBeanDefinitionParser.java => VelocityConfigurerBeanDefinitionParser.java} (91%) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java similarity index 92% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerBeanDefinitionParser.java rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java index 63e801ffe4..dac5acccba 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerBeanDefinitionParser.java +++ b/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 namespace element and register + * Parse the 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"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupConfigurerBeanDefinitionParser.java similarity index 86% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupBeanDefinitionParser.java rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupConfigurerBeanDefinitionParser.java index 3f8109bd06..b59073312b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupBeanDefinitionParser.java +++ b/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 namespace element and register a + * Parse the 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"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java index 69cced3500..03edc2672f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java +++ b/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()); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java similarity index 93% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesBeanDefinitionParser.java rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java index 358ac82385..7779ca802b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesBeanDefinitionParser.java +++ b/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 namespace element and register + * Parse the 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"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityConfigurerBeanDefinitionParser.java similarity index 91% rename from spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityBeanDefinitionParser.java rename to spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityConfigurerBeanDefinitionParser.java index f036f12a03..fe0c100ac1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityConfigurerBeanDefinitionParser.java @@ -24,13 +24,13 @@ import org.w3c.dom.Element; /** - * Parse the MVC namespace element and register an + * Parse the 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"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java index 7889c282eb..a4486b3207 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java +++ b/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. * *

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 { diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd index be54f0ca3a..fb30c9f0a2 100644 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd +++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd @@ -871,7 +871,7 @@ - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml index 3b9460ab6f..7814166aa6 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml @@ -19,19 +19,19 @@ - + - + - + - + - + - + \ No newline at end of file