Author: apetrelli
Date: Mon Feb 9 13:07:15 2009
New Revision: 742469
URL: http://svn.apache.org/viewvc?rev=742469&view=rev
Log:
TILESSB-5
Fixed locale and runtime definitions tests.
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putallattributeslayout.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/selectlocale.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
Mon Feb 9 13:07:15 2009
@@ -45,6 +45,11 @@
* The key of the container to use.
*/
private String containerKey;
+
+ /**
+ * The name of the definition to render.
+ */
+ private String definitionName;
/** {...@inheritdoc} */
@Override
@@ -52,6 +57,8 @@
super.init(config);
containerKey = config
.getInitParameter("org.apache.tiles.test.servlet.ServletConfig.CONTAINER_KEY");
+ definitionName = config
+
.getInitParameter("org.apache.tiles.test.servlet.ServletConfig.DEFINITION_NAME");
}
/** {...@inheritdoc} */
@@ -98,6 +105,6 @@
.getSession().getServletContext(), containerKey);
TilesContainer container = ServletUtil.getCurrentContainer(request,
request
.getSession().getServletContext());
- container.render("test.localized.definition", request, response);
+ container.render(definitionName, request, response);
}
}
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml
(original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/WEB-INF/web.xml Mon
Feb 9 13:07:15 2009
@@ -67,6 +67,12 @@
</filter-mapping>
<filter-mapping>
+ <filter-name>Tiles Decoration Filter</filter-name>
+ <url-pattern>/freemarker/testdecorationfilter.ftl</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>Security Wrapping Filter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
@@ -129,15 +135,31 @@
<servlet>
<servlet-name>selectLocaleServlet</servlet-name>
<servlet-class>org.apache.tiles.test.servlet.SelectLocaleServlet</servlet-class>
+ <init-param>
+
<param-name>org.apache.tiles.test.servlet.ServletConfig.DEFINITION_NAME</param-name>
+ <param-value>test.localized.definition</param-value>
+ </init-param>
</servlet>
<servlet>
<servlet-name>selectLocaleServletDb</servlet-name>
<servlet-class>org.apache.tiles.test.servlet.SelectLocaleServlet</servlet-class>
<init-param>
+
<param-name>org.apache.tiles.test.servlet.ServletConfig.DEFINITION_NAME</param-name>
+ <param-value>test.localized.definition</param-value>
+ </init-param>
+ <init-param>
<param-name>org.apache.tiles.test.servlet.ServletConfig.CONTAINER_KEY</param-name>
<param-value>db</param-value>
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>selectLocaleServletFreemarker</servlet-name>
+
<servlet-class>org.apache.tiles.test.servlet.SelectLocaleServlet</servlet-class>
+ <init-param>
+
<param-name>org.apache.tiles.test.servlet.ServletConfig.DEFINITION_NAME</param-name>
+ <param-value>freemarker.test.localized.definition</param-value>
+ </init-param>
+ </servlet>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
@@ -163,6 +185,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>selectLocaleServletFreemarker</servlet-name>
+ <url-pattern>/freemarker/servlets/selectLocaleServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>Tiles Dispatch Servlet</servlet-name>
<url-pattern>*.tiles</url-pattern>
</servlet-mapping>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/defaultlocale.ftl
Mon Feb 9 13:07:15 2009
@@ -22,6 +22,6 @@
*/
-->
<div align="center"><b><i>
-<div id="defaultLocaleMessage">Your default Locale is
<%=request.getLocale().toString() %></div>
+<div id="defaultLocaleMessage">Your default Locale is ${.locale}</div>
</i></b></div>
<a href="../selectlocale.ftl">Select another locale</a>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putallattributeslayout.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putallattributeslayout.ftl?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putallattributeslayout.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putallattributeslayout.ftl
Mon Feb 9 13:07:15 2009
@@ -21,13 +21,11 @@
*
*/
-->
-<%@ taglib uri="http://java.sun.com/jstl/core_rt"; prefix="c" %>
-
<@tiles.importAttribute/>
-<c:out value="${one}"/>
+${one}
<ul>
- <li><c:out value="${two}"/></li>
- <li><c:out value="${three}"/></li>
- <li><c:out value="${four}"/> </li>
+ <li>${two}</li>
+ <li>${three}</li>
+ <li>${four}</li>
</ul>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/selectlocale.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/selectlocale.ftl?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/selectlocale.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/selectlocale.ftl
Mon Feb 9 13:07:15 2009
@@ -1,4 +1,3 @@
-<%@ page session="false" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<#--
/*
@@ -40,6 +39,6 @@
</select>
<input type="submit" value="Submit" />
</form>
-<div id="defaultLocaleMessage">Your default Locale is
<%=request.getLocale().toString() %></div>
+<div id="defaultLocaleMessage">Your default Locale is ${.locale}</div>
</body>
</html>
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef.ftl
Mon Feb 9 13:07:15 2009
@@ -26,4 +26,4 @@
<@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
<@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.templateDefinition" />
\ No newline at end of file
+<@tiles.insertDefinition name="templateDefinition" />
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp?rev=742469&r1=742468&r2=742469&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp Mon Feb 9
13:07:15 2009
@@ -138,7 +138,7 @@
<a href="freemarker/testimportattribute.ftl">FreeMarker: Test
importAttribute Tag</a><br/>
<a href="freemarker/testimportattribute_all.ftl">FreeMarker: Test
importAttribute Tag with no name</a><br/>
<a href="freemarker/testdecorationfilter.ftl">FreeMarker: Test Tiles
Definition Filter</a><br/>
- <a href="freemarker/testdispatchservlet.tiles">FreeMarker: Test Tiles
Dispatch Servlet</a><br/>
+ <a href="freemarker.testdispatchservlet.tiles">FreeMarker: Test Tiles
Dispatch Servlet</a><br/>
<a href="freemarker/selectlocale.ftl">FreeMarker: Test
Localization</a><br/>
<h3>Mutable Container Tests</h3>
