Author: apetrelli
Date: Fri Oct 27 04:18:10 2006
New Revision: 468345
URL: http://svn.apache.org/viewvc?view=rev&rev=468345
Log:
SB-55
Modified test JSP pages according to changes to tag libraries.
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
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
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp Fri Oct 27
04:18:10 2006
@@ -5,9 +5,9 @@
<td bgcolor="Blue"><strong><tiles:getAsString name="title"/></strong></td>
</tr>
<tr>
- <td><tiles:insert name="header"/></td>
+ <td><tiles:attribute name="header"/></td>
</tr>
<tr>
- <td><tiles:insert name="body"/></td>
+ <td><tiles:attribute name="body"/></td>
</tr>
</table>
Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp Fri Oct
27 04:18:10 2006
@@ -5,4 +5,4 @@
<tiles:put name="header" value="/header.jsp" />
<tiles:put name="body" value="/body.jsp" />
</tiles:definition>
-<tiles:insert name="templateDefinition" />
\ No newline at end of file
+<tiles:insertDefinition name="templateDefinition" />
\ No newline at end of file
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
Fri Oct 27 04:18:10 2006
@@ -1,3 +1,3 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert name="test.putAttributes" />
+<tiles:insertDefinition name="test.putAttributes" />
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
Fri Oct 27 04:18:10 2006
@@ -1,3 +1,3 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert name="test.definition" type="definition" />
+<tiles:insertDefinition name="test.definition" />
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
Fri Oct 27 04:18:10 2006
@@ -1,3 +1,3 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert name="test.composite.definition" type="definition" />
+<tiles:insertDefinition name="test.composite.definition" />
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
Fri Oct 27 04:18:10 2006
@@ -10,4 +10,4 @@
<tiles:put name="header" value="/header.jsp"/>
<tiles:put name="body" value="test.inner.definition.tags"
type="definition"/>
</tiles:definition>
-<tiles:insert name="test.composite.definition.tags" type="definition" />
+<tiles:insertDefinition name="test.composite.definition.tags" />
Modified:
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=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
Fri Oct 27 04:18:10 2006
@@ -10,4 +10,4 @@
<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" />
+<tiles:insertDefinition name="test.composite.definition.tags" />
Modified:
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=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
Fri Oct 27 04:18:10 2006
@@ -10,4 +10,4 @@
<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" />
+<tiles:insertDefinition name="test.composite.definition.tags" />
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
Fri Oct 27 04:18:10 2006
@@ -10,4 +10,4 @@
<tiles:put name="header" value="/header.jsp"/>
<tiles:put name="body" value="test.inner.definition.tags"/>
</tiles:definition>
-<tiles:insert name="test.composite.definition.tags" type="definition" />
+<tiles:insertDefinition name="test.composite.definition.tags" />
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
Fri Oct 27 04:18:10 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert name="test.definition" type="definition">
+<tiles:insertDefinition name="test.definition">
<tiles:put name="body">
<div align="center"><b><i>This is an inline content</i></b></div>
</tiles:put>
-</tiles:insert>
+</tiles:insertDefinition>
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
Fri Oct 27 04:18:10 2006
@@ -1,3 +1,3 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert name="test.definition" />
+<tiles:insertDefinition name="test.definition" />
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
Fri Oct 27 04:18:10 2006
@@ -1,5 +1,5 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert name="test.definition" type="definition">
+<tiles:insertDefinition name="test.definition">
<tiles:put name="body" value="/override.jsp" />
-</tiles:insert>
+</tiles:insertDefinition>
Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp Fri Oct
27 04:18:10 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert template="/layout.jsp">
+<tiles:insertTemplate template="/layout.jsp">
<tiles:put name="title" value="This is the title." />
<tiles:put name="header" value="/header.jsp" />
<tiles:put name="body" value="/body.jsp" />
-</tiles:insert>
\ No newline at end of file
+</tiles:insertTemplate>
\ No newline at end of file
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp?view=diff&rev=468345&r1=468344&r2=468345
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
(original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
Fri Oct 27 04:18:10 2006
@@ -1,7 +1,7 @@
<%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" %>
-<tiles:insert template="/servlets/layoutServlet">
+<tiles:insertTemplate template="/servlets/layoutServlet">
<tiles:put name="title" value="This is the title." />
<tiles:put name="header" value="/header.jsp" />
<tiles:put name="body" value="/body.jsp" />
-</tiles:insert>
\ No newline at end of file
+</tiles:insertTemplate>
\ No newline at end of file
