Skip to content

Commit 52f1be7

Browse files
sdeleuzerstoyanchev
sdeleuze
authored and
rstoyanchev
committed
Add "-configurer" suffix to view configurer element names
Issue: SPR-7093
1 parent 1ad22b9 commit 52f1be7

File tree

9 files changed

+32
-33
lines changed

9 files changed

+32
-33
lines changed

‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerBeanDefinitionParser.java renamed to ‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/FreeMarkerConfigurerBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
import java.util.List;
2828

2929
/**
30-
* Parse the <mvc:velocity> MVC namespace element and register
30+
* Parse the <mvc:freemarker-configurer> MVC namespace element and register
3131
* FreeMarkerConfigurer bean
3232
*
3333
* @author Rossen Stoyanchev
3434
* @since 4.1
3535
*/
36-
public class FreeMarkerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
36+
public class FreeMarkerConfigurerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
3737

3838
public static final String BEAN_NAME = "mvcFreeMarkerConfigurer";
3939

‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupBeanDefinitionParser.java renamed to ‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/GroovyMarkupConfigurerBeanDefinitionParser.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@
1919
import org.w3c.dom.Element;
2020

2121
import org.springframework.beans.factory.support.AbstractBeanDefinition;
22-
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
2322
import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
2423
import org.springframework.beans.factory.xml.ParserContext;
2524

2625
/**
27-
* Parse the <mvc:groovy-markup> MVC namespace element and register a
26+
* Parse the <mvc:groovy-configurer> MVC namespace element and register a
2827
* GroovyConfigurer bean
2928
*
3029
* @author Sebastien Deleuze
3130
* @since 4.1
3231
*/
33-
public class GroovyMarkupBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
32+
public class GroovyMarkupConfigurerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
3433

3534
public static final String BEAN_NAME = "mvcGroovyMarkupConfigurer";
3635

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public void init() {
3838
registerBeanDefinitionParser("redirect-view-controller", new ViewControllerBeanDefinitionParser());
3939
registerBeanDefinitionParser("status-controller", new ViewControllerBeanDefinitionParser());
4040
registerBeanDefinitionParser("view-resolvers", new ViewResolversBeanDefinitionParser());
41-
registerBeanDefinitionParser("tiles", new TilesBeanDefinitionParser());
42-
registerBeanDefinitionParser("freemarker", new FreeMarkerBeanDefinitionParser());
43-
registerBeanDefinitionParser("velocity", new VelocityBeanDefinitionParser());
44-
registerBeanDefinitionParser("groovy-markup", new GroovyMarkupBeanDefinitionParser());
41+
registerBeanDefinitionParser("tiles-configurer", new TilesConfigurerBeanDefinitionParser());
42+
registerBeanDefinitionParser("freemarker-configurer", new FreeMarkerConfigurerBeanDefinitionParser());
43+
registerBeanDefinitionParser("velocity-configurer", new VelocityConfigurerBeanDefinitionParser());
44+
registerBeanDefinitionParser("groovy-configurer", new GroovyMarkupConfigurerBeanDefinitionParser());
4545
}
4646

4747
}

‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesBeanDefinitionParser.java renamed to ‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/TilesConfigurerBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
import java.util.List;
2929

3030
/**
31-
* Parse the <mvc:tiles> MVC namespace element and register
31+
* Parse the <mvc:tiles-configurer> MVC namespace element and register
3232
* TilesConfigurer bean
3333
3434
* @author Rossen Stoyanchev
3535
* @since 4.1
3636
*/
37-
public class TilesBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
37+
public class TilesConfigurerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
3838

3939
public static final String BEAN_NAME = "mvcTilesConfigurer";
4040

‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityBeanDefinitionParser.java renamed to ‎spring-webmvc/src/main/java/org/springframework/web/servlet/config/VelocityConfigurerBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424

2525

2626
/**
27-
* Parse the <mvc:velocity> MVC namespace element and register an
27+
* Parse the <mvc:velocity-configurer> MVC namespace element and register an
2828
* VelocityConfigurer bean
2929
*
3030
* @author Rossen Stoyanchev
3131
* @since 4.1
3232
*/
33-
public class VelocityBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
33+
public class VelocityConfigurerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
3434

3535
public static final String BEAN_NAME = "mvcVelocityConfigurer";
3636

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@
4949
* before or after it.
5050
*
5151
* <p>When content negotiation is enabled the order property is set to highest priority
52-
* instead with the ContentNeogitatingViewResolver encapsulating all other registered
52+
* instead with the ContentNegotiatingViewResolver encapsulating all other registered
5353
* view resolver instances. That way the resolvers registered through the MVC namespace
5454
* form self-encapsulated resolver chain.
5555
*
5656
* @author Sivaprasad Valluru
5757
* @author Sebastien Deleuze
5858
* @author Rossen Stoyanchev
5959
* @since 4.1
60-
* @see org.springframework.web.servlet.config.TilesBeanDefinitionParser
61-
* @see org.springframework.web.servlet.config.FreeMarkerBeanDefinitionParser
62-
* @see org.springframework.web.servlet.config.VelocityBeanDefinitionParser
60+
* @see TilesConfigurerBeanDefinitionParser
61+
* @see FreeMarkerConfigurerBeanDefinitionParser
62+
* @see VelocityConfigurerBeanDefinitionParser
6363
*/
6464
public class ViewResolversBeanDefinitionParser implements BeanDefinitionParser {
6565

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@
871871
</xsd:complexType>
872872
</xsd:element>
873873

874-
<xsd:element name="tiles">
874+
<xsd:element name="tiles-configurer">
875875
<xsd:annotation>
876876
<xsd:documentation><![CDATA[
877877
Configure Tiles 3.x by registering a TilesConfigurer bean.
@@ -911,7 +911,7 @@
911911
</xsd:complexType>
912912
</xsd:element>
913913

914-
<xsd:element name="freemarker">
914+
<xsd:element name="freemarker-configurer">
915915
<xsd:annotation>
916916
<xsd:documentation><![CDATA[
917917
Configure FreeMarker for view resolution by registering a FreeMarkerConfigurer bean.
@@ -935,7 +935,7 @@
935935
</xsd:complexType>
936936
</xsd:element>
937937

938-
<xsd:element name="velocity">
938+
<xsd:element name="velocity-configurer">
939939
<xsd:annotation>
940940
<xsd:documentation><![CDATA[
941941
Configure Velocity for view resolution by registering a VelocityConfigurer bean.
@@ -953,7 +953,7 @@
953953
</xsd:complexType>
954954
</xsd:element>
955955

956-
<xsd:element name="groovy-markup">
956+
<xsd:element name="groovy-configurer">
957957
<xsd:annotation>
958958
<xsd:documentation><![CDATA[
959959
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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
<mvc:groovy />
2929
</mvc:view-resolvers>
3030

31-
<mvc:tiles check-refresh="true">
31+
<mvc:tiles-configurer check-refresh="true">
3232
<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml" />
33-
</mvc:tiles>
33+
</mvc:tiles-configurer>
3434

35-
<mvc:freemarker>
35+
<mvc:freemarker-configurer>
3636
<mvc:template-loader-path location="/org/springframework/web/servlet/view" />
37-
</mvc:freemarker>
37+
</mvc:freemarker-configurer>
3838

39-
<mvc:velocity resource-loader-path="/org/springframework/web/servlet/view" />
39+
<mvc:velocity-configurer resource-loader-path="/org/springframework/web/servlet/view" />
4040

41-
<mvc:groovy-markup />
41+
<mvc:groovy-configurer />
4242

4343
</beans>
4444

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919

2020
<bean id="customResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
2121

22-
<mvc:tiles check-refresh="true" validate-definitions="true">
22+
<mvc:tiles-configurer check-refresh="true" validate-definitions="true">
2323
<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml" />
2424
<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles2.xml" />
25-
</mvc:tiles>
25+
</mvc:tiles-configurer>
2626

27-
<mvc:freemarker>
27+
<mvc:freemarker-configurer>
2828
<mvc:template-loader-path location="/" />
2929
<mvc:template-loader-path location="/test" />
30-
</mvc:freemarker>
30+
</mvc:freemarker-configurer>
3131

32-
<mvc:velocity resource-loader-path="/test" />
32+
<mvc:velocity-configurer resource-loader-path="/test" />
3333

34-
<mvc:groovy-markup resource-loader-path="/test" cache-templates="false" auto-indent="true" />
34+
<mvc:groovy-configurer resource-loader-path="/test" cache-templates="false" auto-indent="true" />
3535

3636
</beans>
3737

0 commit comments

Comments
 (0)