You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by dd...@apache.org on 2006/10/31 19:55:26 UTC
svn commit: r469609 - in /struts/sandbox/trunk/tiles/tiles-container-test:
./ src/main/webapp/ src/main/webapp/WEB-INF/
Author: ddewolf
Date: Tue Oct 31 10:55:25 2006
New Revision: 469609
URL: http://svn.apache.org/viewvc?view=rev&rev=469609
Log:
Adding files in lieu of externals. SVN won't let use externals for files
Added:
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp (with props)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp (with props)
Modified:
struts/sandbox/trunk/tiles/tiles-container-test/pom.xml
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/ (props changed)
struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/ (props changed)
Modified: struts/sandbox/trunk/tiles/tiles-container-test/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/pom.xml?view=diff&rev=469609&r1=469608&r2=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/pom.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-container-test/pom.xml Tue Oct 31 10:55:25 2006
@@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tiles-container-test</artifactId>
<packaging>war</packaging>
- <name>Tiles - Contain - Test</name>
+ <name>Tiles - Container - Test</name>
<dependencies>
<dependency>
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Oct 31 10:55:25 2006
@@ -1,18 +1 @@
-body.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/body.jsp
-header.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/header.jsp
-index.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/index.jsp
-layout.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/layout.jsp
-override.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp
-putattributeslayout.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp
-testdef.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testdef.jsp
-testimportattribute.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
-testinsertdefinition.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
-testinsertdefinition_composite.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
-testinsertdefinition_componsite_tags_includes_configured.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_includes_configured.jsp
-testinsertdefinition_componsite_tags_includes_configured_notype.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_includes_configured_notype.jsp
-testinsertdefinition_componsite_tags_notype.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_componsite_tags_notype.jsp
-testinsertdefinition_inline.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
-testinsertdefinition_notype.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
-testinsertdefinition_override.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
-testput.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput.jsp
-testput_servlet.jsp https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
+
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Oct 31 10:55:25 2006
@@ -1 +1 @@
-tiles-defs.xml https://svn.apache.org/repos/asf/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
+
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml Tue Oct 31 10:55:25 2006
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/tiles-config_2_0.dtd">
+
+<!-- Definitions for Tiles documentation -->
+
+<tiles-definitions>
+
+ <!-- ======================================================= -->
+ <!-- Master definition -->
+ <!-- ======================================================= -->
+
+ <!-- Doc index page description -->
+ <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+ <put name="title" value="Tiles Library Documentation" />
+ <put name="header" value="/common/header.jsp" />
+ <put name="menu" value="doc.menu.main" />
+ <put name="footer" value="/common/footer.jsp" />
+ <put name="body" value="doc.portal.body" />
+ </definition>
+
+ <definition name="test.inner.definition" template="/layout.jsp">
+ <put name="title" value="This is a configured inner definition."/>
+ <put name="header" value="/header.jsp"/>
+ <put name="body" value="/body.jsp"/>
+ </definition>
+
+ <definition name="test.definition" template="/layout.jsp">
+ <put name="title" value="This is the title."/>
+ <put name="header" value="/header.jsp"/>
+ <put name="body" value="/body.jsp"/>
+ </definition>
+
+ <definition name="test.composite.definition" template="/layout.jsp">
+ <put name="title" value="This is a configured composite definition."/>
+ <put name="header" value="/header.jsp"/>
+ <put name="body" value="test.inner.definition"/>
+ </definition>
+
+ <definition name="test.putAttributes" template="/putattributeslayout.jsp">
+ <put name="stringTest" value="This is a string" type="string" />
+ <putList name="list">
+ <add value="valueOne" type="string" />
+ <add value="valueTwo" type="string" />
+ <add value="valueThree" type="string" />
+ </putList>
+ </definition>
+
+</tiles-definitions>
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/tiles-defs.xml
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml Tue Oct 31 10:55:25 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <display-name>Tiles 2 Test Application</display-name>
+
+ <!-- Standard Action Servlet Configuration -->
+ <servlet>
+ <servlet-name>tiles</servlet-name>
+ <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
+ <init-param>
+ <param-name>definitions-config</param-name>
+ <param-value>/WEB-INF/tiles-defs.xml</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <!-- Standard Action Servlet Configuration -->
+ <servlet>
+ <servlet-name>layoutServlet</servlet-name>
+ <servlet-class>org.apache.tiles.test.servlet.IncludingServlet</servlet-class>
+ <init-param>
+ <param-name>include</param-name>
+ <param-value>/layout.jsp</param-value>
+ </init-param>
+ </servlet>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <servlet-mapping>
+ <servlet-name>layoutServlet</servlet-name>
+ <url-pattern>/servlets/layoutServlet</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1 @@
+<div align="center"><b><i>This is a body</i></b></div>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/body.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,2 @@
+<strong>This is the header</strong>
+
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/header.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,46 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+-->
+<html>
+<head>
+ <title>Tiles 2 Test Application</title>
+</head>
+
+<body>
+ <h1>Tiles 2 Test Application</h1>
+
+ <h2>Currently working tests</h2>
+ <a href="testdef.jsp">Test Definition Tag</a><br/>
+ <a href="testinsertdefinition.jsp">Test Insert Configured Definition</a><br/>
+ <a href="testinsertdefinition_notype.jsp">Test Insert Configured Definition with no type specified</a><br/>
+ <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="testput_servlet.jsp">Test Put Tag using a servlet mapping as a template</a><br/>
+ <a href="testimportattribute.jsp">Test importAttribute Tag</a><br/>
+
+ <h2>Currently not working tests</h2>
+ Currently all the tests work.
+</body>
+
+</html>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,13 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<table border="2" width="300" bordercolor="Gray">
+ <tr>
+ <td bgcolor="Blue"><strong><tiles:getAsString name="title"/></strong></td>
+ </tr>
+ <tr>
+ <td><tiles:attribute name="header"/></td>
+ </tr>
+ <tr>
+ <td><tiles:attribute name="body"/></td>
+ </tr>
+</table>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/layout.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1 @@
+<div align="center"><b><i>This is an overridden content</i></b></div>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/override.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,11 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ 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/>
+The attribute "list" contains these values:
+<ul>
+<c:forEach var="item" items="${list}">
+<li><c:out value="${item}" /></li>
+</c:forEach>
+</ul>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/putattributeslayout.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,8 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:definition name="templateDefinition" 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:definition>
+<tiles:insertDefinition name="templateDefinition" />
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testdef.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.putAttributes" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testimportattribute.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.definition" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.composite.definition" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp Tue Oct 31 10:55:25 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.tags" type="definition"/>
+</tiles:definition>
+<tiles:insertDefinition name="test.composite.definition.tags" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp Tue Oct 31 10:55:25 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:insertDefinition name="test.composite.definition.tags" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp Tue Oct 31 10:55:25 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:insertDefinition name="test.composite.definition.tags" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Tue Oct 31 10:55:25 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.tags"/>
+</tiles:definition>
+<tiles:insertDefinition name="test.composite.definition.tags" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,7 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<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:insertDefinition>
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_inline.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.definition" />
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_notype.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,5 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.definition">
+ <tiles:put name="body" value="/override.jsp" />
+</tiles:insertDefinition>
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testinsertdefinition_override.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,7 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<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:insertTemplate>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Added: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp?view=auto&rev=469609
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp (added)
+++ struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp Tue Oct 31 10:55:25 2006
@@ -0,0 +1,7 @@
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<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:insertTemplate>
\ No newline at end of file
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-container-test/src/main/webapp/testput_servlet.jsp
------------------------------------------------------------------------------
svn:keywords = Id Author Date
Re: svn commit: r469609 - in /struts/sandbox/trunk/tiles/tiles-container-test:
./ src/main/webapp/ src/main/webapp/WEB-INF/
Posted by "David H. DeWolf" <dd...@apache.org>.
Excellent. Thanks!
I think we'll be ok for now since these files should remain static. In
reality, this second webapp is temporary. Having two test modules, one
which uses the old initialization procedures, and one that uses the new,
will only be useful while we support both approches. I anticipate that
support for the old approach will be limited to the time it takes us to
finalize the refactoring.
David
Wendy Smoak wrote:
> On 10/31/06, ddewolf@apache.org <dd...@apache.org> wrote:
>> Author: ddewolf
>> Date: Tue Oct 31 10:55:25 2006
>> New Revision: 469609
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=469609
>> Log:
>> Adding files in lieu of externals. SVN won't let use externals for files
>
> If duplication becomes a problem, we can move the shared files into a
> separate module, and unpack it into the webapps during the build.
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: svn commit: r469609 - in /struts/sandbox/trunk/tiles/tiles-container-test: ./ src/main/webapp/ src/main/webapp/WEB-INF/
Posted by Wendy Smoak <ws...@gmail.com>.
On 10/31/06, ddewolf@apache.org <dd...@apache.org> wrote:
> Author: ddewolf
> Date: Tue Oct 31 10:55:25 2006
> New Revision: 469609
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=469609
> Log:
> Adding files in lieu of externals. SVN won't let use externals for files
If duplication becomes a problem, we can move the shared files into a
separate module, and unpack it into the webapps during the build.
--
Wendy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org