You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/07/02 14:09:23 UTC
svn commit: r552477 - in /tiles/framework/branches/TILES_2_0_X:
tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/
tiles-test/src/main/webapp/ tiles-test/src/main/webapp/WEB-INF/
tiles-test/src/test/selenium/
Author: apetrelli
Date: Mon Jul 2 05:09:21 2007
New Revision: 552477
URL: http://svn.apache.org/viewvc?view=rev&rev=552477
Log:
TILES-192
Merged from trunk to TILES_2_0_X branch.
Added support to the "flush" attribute in JSP tags that extend RenderTagSupport.
Added Selenium tests.
Added:
tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/layout_flush.jsp
- copied unchanged from r552462, tiles/framework/trunk/tiles-test/src/main/webapp/layout_flush.jsp
tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/testinsertdefinition_flush.jsp
- copied unchanged from r552462, tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_flush.jsp
tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/testput_flush.jsp
- copied unchanged from r552462, tiles/framework/trunk/tiles-test/src/main/webapp/testput_flush.jsp
tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionFlushTest.html
- copied unchanged from r552462, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionFlushTest.html
tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/PutTagFlushTest.html
- copied unchanged from r552462, tiles/framework/trunk/tiles-test/src/test/selenium/PutTagFlushTest.html
Modified:
tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp
tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html
Modified: tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java?view=diff&rev=552477&r1=552476&r2=552477
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java Mon Jul 2 05:09:21 2007
@@ -169,6 +169,9 @@
container.prepare(preparer, pageContext);
}
render();
+ if (flush) {
+ pageContext.getOut().flush();
+ }
}
/**
Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=552477&r1=552476&r2=552477
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Mon Jul 2 05:09:21 2007
@@ -47,6 +47,12 @@
<put-attribute name="body" value="/body.jsp"/>
</definition>
+ <definition name="test.definition.flush" template="/layout_flush.jsp">
+ <put-attribute name="title" value="This is the title."/>
+ <put-attribute name="header" value="/header.jsp"/>
+ <put-attribute name="body" value="/body.jsp"/>
+ </definition>
+
<definition name="test.definition.exception" template="/layout.jsp">
<put-attribute name="title" value="This is the title."/>
<put-attribute name="header" value="/exception.jsp"/>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp?view=diff&rev=552477&r1=552476&r2=552477
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp Mon Jul 2 05:09:21 2007
@@ -33,6 +33,7 @@
<h3>Standard Render/Attribute Tests</h3>
<a href="testinsertdefinition.jsp">Test Insert Configured Definition</a><br/>
+ <a href="testinsertdefinition_flush.jsp">Test Insert Configured Definition with Flush</a><br/>
<a href="testinsertdefinition_preparer.jsp">Test Insert Configured Definition with Preparer</a><br/>
<a href="testinsertdefinition_preparer_configured.jsp">Test Insert Configured Definition with Preparer configured in the definition itself</a><br/>
<a href="testinsertdefinition_classpath.jsp">Test Insert Configured Classpath Definition</a><br/>
@@ -42,6 +43,7 @@
<a href="testinsertdefinition_composite.jsp">Test Insert Configured Definition that contains another definition inside</a><br/>
<a href="testinsertdefinition_exception.jsp">Test Insert Configured Definition with an exception in an attribute page</a><br/>
<a href="testput.jsp">Test Put Tag</a><br/>
+ <a href="testput_flush.jsp">Test Put Tag with Flush</a><br/>
<a href="testput_el.jsp">Test Put Tag using EL</a><br/>
<a href="testput_servlet.jsp">Test Put Tag using a servlet mapping as a template</a><br/>
<a href="testputlist.jsp">Test Put List Tag</a><br/>
Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html?view=diff&rev=552477&r1=552476&r2=552477
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html Mon Jul 2 05:09:21 2007
@@ -34,6 +34,9 @@
<td><a href="ConfiguredDefinitionTest.html">Configured Definition Test</a></td>
</tr>
<tr>
+ <td><a href="ConfiguredDefinitionFlushTest.html">Configured Definition with Flush Test</a></td>
+ </tr>
+ <tr>
<td><a href="ConfiguredDefinitionWithPreparerTest.html">Configured Definition with Preparer Test</a></td>
</tr>
<tr>
@@ -59,6 +62,9 @@
</tr>
<tr>
<td><a href="PutTagTest.html">Put Tag Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="PutTagFlushTest.html">Put Tag with Flush Test</a></td>
</tr>
<tr>
<td><a href="PutTagWithELTest.html">Put Tag using EL Test</a></td>