Author: apetrelli
Date: Mon Oct 2 04:41:23 2006
New Revision: 451987
URL: http://svn.apache.org/viewvc?view=rev&rev=451987
Log:
SB-48
Moved previously not-working test links to the currently working link set.
Added some more tests to check inclusion of configured definitions.
Added:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=451987&r1=451986&r2=451987
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
Mon Oct 2 04:41:23 2006
@@ -22,7 +22,7 @@
</definition>
<definition name="test.inner.definition" template="/layout.jsp">
- <put name="title" value="This is an inner definition."/>
+ <put name="title" value="This is a configured inner definition."/>
<put name="header" value="/header.jsp"/>
<put name="body" value="/body.jsp"/>
</definition>
@@ -34,7 +34,7 @@
</definition>
<definition name="test.composite.definition" template="/layout.jsp">
- <put name="title" value="This is a composite definition."/>
+ <put name="title" value="This is a configured composite definition."/>
<put name="header" value="/header.jsp"/>
<put name="body" value="test.inner.definition"/>
</definition>
Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp?view=diff&rev=451987&r1=451986&r2=451987
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp Mon Oct 2
04:41:23 2006
@@ -31,12 +31,14 @@
<a href="testinsertdefinition_override.jsp">Test Insert Configured
Definition with an overridden content</a><br/>
<a href="testinsertdefinition_inline.jsp">Test Insert Configured
Definition with an inline content</a><br/>
<a href="testinsertdefinition_composite.jsp">Test Insert Configured
Definition that contains another definition inside</a><br/>
+ <a href="testinsertdefinition_composite_tags_includes_configured.jsp">Test
Insert Definition that contains another definition inside (configured via
tiles-defs.xml) using JSP tags</a><br/>
+ <a
href="testinsertdefinition_composite_tags_includes_configured_notype.jsp">Test
Insert Definition that contains another definition inside (configured via
tiles-defs.xml) using JSP tags without types</a><br/>
+ <a href="testinsertdefinition_composite_tags.jsp">Test Insert Definition
that contains another definition inside using JSP tags</a><br/>
+ <a href="testinsertdefinition_composite_tags_notype.jsp">Test Insert
Definition that contains another definition inside using JSP tags without
types</a><br/>
<a href="testput.jsp">Test Put Tag</a><br/>
<a href="testimportattribute.jsp">Test importAttribute Tag</a><br/>
<h2>Currently not working tests</h2>
- <a href="testinsertdefinition_composite_tags.jsp">Test Insert Definition
that contains another definition inside using JSP tags</a><br/>
- <a href="testinsertdefinition_composite_tags_notype.jsp">Test Insert
Definition that contains another definition inside using JSP tags without
types</a><br/>
</body>
</html>
Added:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp?view=auto&rev=451987
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
(added)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
Mon Oct 2 04:41:23 2006
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
+
+<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
+ <tiles:put name="title" value="This is an inner definition with tags."/>
+ <tiles:put name="header" value="/header.jsp"/>
+ <tiles:put name="body" value="/body.jsp"/>
+</tiles:definition>
+<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
+ <tiles:put name="title" value="This is a composite definition with
tags."/>
+ <tiles:put name="header" value="/header.jsp"/>
+ <tiles:put name="body" value="test.inner.definition" type="definition"/>
+</tiles:definition>
+<tiles:insert name="test.composite.definition.tags" type="definition" />
Added:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp?view=auto&rev=451987
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
(added)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
Mon Oct 2 04:41:23 2006
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
+
+<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
+ <tiles:put name="title" value="This is an inner definition with tags."/>
+ <tiles:put name="header" value="/header.jsp"/>
+ <tiles:put name="body" value="/body.jsp"/>
+</tiles:definition>
+<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
+ <tiles:put name="title" value="This is a composite definition with
tags."/>
+ <tiles:put name="header" value="/header.jsp"/>
+ <tiles:put name="body" value="test.inner.definition"/>
+</tiles:definition>
+<tiles:insert name="test.composite.definition.tags" type="definition" />
