root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update test tiles.xml files to use v3 DTD 

Update tiles.xml files used with tests to reference tiles-config_3_0
instead of tiles-config_2_1 DTD.

Prior to this commit tiles based tests would fail when building
offline or behind a proxy server.
This commit is contained in:
Phillip Webb 2012-12-10 15:39:47 -08:00
parent 25a7136a96
commit c8a3562933
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/layouts/tiles.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> <!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions> <tiles-definitions>
<definition name="standardLayout" templateExpression="/WEB-INF/layouts/standardLayout.jsp"/> <definition name="standardLayout" templateExpression="/WEB-INF/layouts/standardLayout.jsp"/>
</tiles-definitions> </tiles-definitions>

11
spring-test-mvc/src/test/resources/META-INF/web-resources/WEB-INF/views/tiles.xml
View File

@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"> <!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions> <tiles-definitions>
<definition name="home" extends="standardLayout">
<definition name="home" extends="standardLayout"> <put-attribute name="main" value="/WEB-INF/views/home.jsp" />
<put-attribute name="main" value="/WEB-INF/views/home.jsp" /> </definition>
</definition>
</tiles-definitions> </tiles-definitions>