svn commit: r503671 - in /tiles/framework/trunk/tiles-test/src/main/webapp: index.jsp testinsertdefinition_override_and_not.jsp

[ap...@apache.org]

Author: apetrelli
Date: Mon Feb  5 05:18:47 2007
New Revision: 503671

URL: http://svn.apache.org/viewvc?view=rev&rev=503671
Log:
TILES-96
Added test to check the use of attribute values put with <tiles:putAttribute>.

Added:
    tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp   (with props)
Modified:
    tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp

Modified: tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp?view=diff&rev=503671&r1=503670&r2=503671
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Mon Feb  5 05:18:47 2007
@@ -37,6 +37,7 @@
     <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/>
     <a href="testinsertdefinition_override.jsp">Test Insert Configured Definition with an overridden content</a><br/>
+    <a href="testinsertdefinition_override_and_not.jsp">Test Insert Configured Definition with an overridden content and one with original 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="testput.jsp">Test Put Tag</a><br/>

Added: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp?view=auto&rev=503671
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp Mon Feb  5 05:18:47 2007
@@ -0,0 +1,31 @@
+<%--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ *
+ */
+--%>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+Overridden content:<br/>
+<tiles:insertDefinition name="test.definition">
+  <tiles:putAttribute name="body"   value="/override.jsp" />
+</tiles:insertDefinition>
+<br/>
+Not overridden content:<br/>
+<tiles:insertDefinition name="test.definition" />

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL