Author: apetrelli
Date: Sun Feb 8 23:05:44 2009
New Revision: 742199
URL: http://svn.apache.org/viewvc?rev=742199&view=rev
Log:
TILESSB-5
Fixed exception, list and EL tests.
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/exception.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putattributeslayout.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/exception.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/exception.ftl?rev=742199&r1=742198&r2=742199&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/exception.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/exception.ftl
Sun Feb 8 23:05:44 2009
@@ -22,4 +22,4 @@
*/
-->
<strong>This throws an exception</strong>
-<% throw new Exception("This is a test exception"); %>
\ No newline at end of file
+<#assign testValue=1/0 />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putattributeslayout.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putattributeslayout.ftl?rev=742199&r1=742198&r2=742199&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putattributeslayout.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/putattributeslayout.ftl
Sun Feb 8 23:05:44 2009
@@ -21,13 +21,12 @@
*
*/
-->
-<%@ taglib uri="http://java.sun.com/jstl/core_rt"; prefix="c" %>
<@tiles.importAttribute name="stringTest"/>
<@tiles.importAttribute name="list"/>
-Single attribute "stringTest" value: <c:out value="${stringTest}" /> <br/><br/>
+Single attribute "stringTest" value: ${stringTest?html} <br/><br/>
The attribute "list" contains these values:
<ul>
-<c:forEach var="item" items="${list}">
-<li><@tiles.insertAttribute value="${item}" /></li>
-</c:forEach>
+<#list list as item>
+<li><@tiles.insertAttribute value=item /></li>
+</#list>
</ul>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl?rev=742199&r1=742198&r2=742199&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_el.ftl
Sun Feb 8 23:05:44 2009
@@ -21,11 +21,10 @@
*
*/
-->
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
-<c:set var="bodyContent" value="Body Content defined by and el" />
+<#assign bodyContent="Body Content defined by and el" />
<@tiles.insertTemplate template="/freemarker/layout.ftl">
<@tiles.putAttribute name="title" value="This is the title." />
<@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
- <@tiles.putAttribute name="body" value="${bodyContent}" />
+ <@tiles.putAttribute name="body" value=bodyContent />
</@tiles.insertTemplate>
\ No newline at end of file
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl?rev=742199&r1=742198&r2=742199&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testput_servlet.ftl
Sun Feb 8 23:05:44 2009
@@ -21,7 +21,7 @@
*
*/
-->
-<@tiles.insertTemplate template="/freemarker/servlets/layoutServlet">
+<@tiles.insertTemplate template="/servlets/layoutServlet">
<@tiles.putAttribute name="title" value="This is the title." />
<@tiles.putAttribute name="header" value="/freemarker/header.ftl" />
<@tiles.putAttribute name="body" value="/freemarker/body.ftl" />
