diff options
Diffstat (limited to 'spring-webmvc/src/test/resources/org/springframework')
6 files changed, 37 insertions, 40 deletions
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml index 82dd141b..f4a216a3 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-resources.xml @@ -5,6 +5,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> + <mvc:annotation-driven /> <mvc:resources mapping="/resources/**" location="/, classpath:/META-INF/" /> </beans> diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml index 13092194..80006361 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers-minimal.xml @@ -6,11 +6,10 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> + <mvc:view-controller path="/path" view-name="home"/> - <mvc:view-controller path="/path" view-name="home" /> + <mvc:redirect-view-controller path="/old" redirect-url="/new"/> - <mvc:redirect-view-controller path="/old" redirect-url="/new" /> - - <mvc:status-controller path="/bad" status-code="404" /> + <mvc:status-controller path="/bad" status-code="404"/> </beans> diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml index 2f9c5851..dd9c36ef 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-controllers.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:mvc="http://www.springframework.org/schema/mvc" + xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> - <mvc:annotation-driven/> <mvc:view-controller path="/foo"/> @@ -14,9 +13,9 @@ <mvc:view-controller path="/" view-name="root"/> <mvc:redirect-view-controller path="/old" redirect-url="/new" - context-relative="false" status-code="308" keep-query-params="true" /> + context-relative="false" status-code="308" keep-query-params="true"/> - <mvc:status-controller path="/bad" status-code="404" /> + <mvc:status-controller path="/bad" status-code="404"/> <mvc:interceptors> <bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"/> diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml index 5dba4fb3..2f07f51c 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml @@ -1,45 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation=" - http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation=" + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> <!-- View resolution finds the ContentNegotiationManager created by or registered with <mvc:annotation-driven>. Or in its absence simply declare it. --> - <bean id="mvcContentNegotiationManager" - class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean"/> + <bean id="mvcContentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean"/> <mvc:view-resolvers> <mvc:content-negotiation use-not-acceptable="true"> <mvc:default-views> - <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView" /> + <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView"/> </mvc:default-views> </mvc:content-negotiation> - <mvc:bean-name /> - <mvc:jsp /> - <mvc:tiles /> - <mvc:freemarker /> - <mvc:velocity /> - <mvc:groovy /> - <mvc:script-template /> + <mvc:bean-name/> + <mvc:jsp/> + <mvc:tiles/> + <mvc:freemarker/> + <mvc:velocity/> + <mvc:groovy/> + <mvc:script-template/> </mvc:view-resolvers> <mvc:tiles-configurer check-refresh="true"> - <mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml" /> + <mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml"/> </mvc:tiles-configurer> <mvc:freemarker-configurer> - <mvc:template-loader-path location="/org/springframework/web/servlet/view" /> + <mvc:template-loader-path location="/org/springframework/web/servlet/view"/> </mvc:freemarker-configurer> - <mvc:velocity-configurer resource-loader-path="/org/springframework/web/servlet/view" /> + <mvc:velocity-configurer resource-loader-path="/org/springframework/web/servlet/view"/> - <mvc:groovy-configurer /> + <mvc:groovy-configurer/> <mvc:script-template-configurer engine-name="nashorn" render-function="render"/> diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml index 713d85a7..aa038322 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation=" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation=" http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> <mvc:view-resolvers order="123"> - <mvc:bean-name /> + <mvc:bean-name/> </mvc:view-resolvers> </beans> 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 3422243a..af2043a4 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 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> <mvc:view-resolvers> <mvc:bean-name/> @@ -20,8 +20,8 @@ <bean id="customResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"/> <mvc:tiles-configurer check-refresh="true" validate-definitions="true" - definitions-factory="org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory" - preparer-factory="org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory"> + definitions-factory="org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory" + preparer-factory="org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory"> <mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml"/> <mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles2.xml"/> </mvc:tiles-configurer> @@ -35,9 +35,8 @@ <mvc:groovy-configurer resource-loader-path="/test" cache-templates="false" auto-indent="true"/> - <mvc:script-template-configurer engine-name="nashorn" render-function="render" - content-type="text/plain" charset="ISO-8859-1" - resource-loader-path="classpath:" shared-engine="false"> + <mvc:script-template-configurer engine-name="nashorn" render-function="render" content-type="text/plain" + charset="ISO-8859-1" resource-loader-path="classpath:" shared-engine="false"> <mvc:script location="org/springframework/web/servlet/view/script/nashorn/render.js"/> </mvc:script-template-configurer> |