Author: apetrelli
Date: Wed Feb 7 06:07:55 2007
New Revision: 504552
URL: http://svn.apache.org/viewvc?view=rev&rev=504552
Log:
TILES-103
Refactoring of JSP tags and XML elements regarding attribute management.
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
- copied, changed from r504079,
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
- copied, changed from r504079,
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java
Removed:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
tiles/framework/trunk/tiles-core/src/main/resources/META-INF/tld/tiles-core.tld
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
Wed Feb 7 06:07:55 2007
@@ -204,17 +204,17 @@
String DEFINITION_TAG = "tiles-definitions/definition";
String definitionHandlerClass = PACKAGE_NAME +
".definition.ComponentDefinition";
- String PUT_TAG = DEFINITION_TAG + "/put";
+ String PUT_TAG = DEFINITION_TAG + "/putAttribute";
String putAttributeHandlerClass = PACKAGE_NAME + ".ComponentAttribute";
//String LIST_TAG = DEFINITION_TAG + "/putList";
// List tag value
- String LIST_TAG = "putList";
+ String LIST_TAG = "putListAttribute";
String DEF_LIST_TAG = DEFINITION_TAG + "/" + LIST_TAG;
String listHandlerClass = PACKAGE_NAME +
".context.ComponentListAttribute";
// Tag value for adding an element in a list
- String ADD_LIST_ELE_TAG = "*/" + LIST_TAG + "/add";
+ String ADD_LIST_ELE_TAG = "*/" + LIST_TAG + "/addAttribute";
// syntax rules
digester.addObjectCreate(DEFINITION_TAG, definitionHandlerClass);
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
Wed Feb 7 06:07:55 2007
@@ -21,11 +21,9 @@
*/
package org.apache.tiles.taglib;
-import org.apache.tiles.taglib.AttributeTagSupport;
-import org.apache.tiles.taglib.ComponentConstants;
+import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.TilesException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
import java.io.IOException;
/**
@@ -35,46 +33,11 @@
*
* @version $Rev$ $Date$
*/
-public class GetAsStringTag extends AttributeTagSupport implements
ComponentConstants {
-
- private String role = null;
-
- public void release() {
- super.release();
- role = null;
- }
-
- /**
- * Set role.
- *
- * @param role The role the user must be in to store content.
- */
- public void setRole(String role) {
- this.role = role;
- }
-
- /**
- * Get role.
- *
- * @return Role.
- */
- public String getRole() {
- return role;
- }
-
- /**
- * Print the attribute.
- *
- * @throws JspException On error processing tag.
- * @throws IOException if io error occurs.
- */
- public void execute() throws JspException, IOException {
- HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
- if (role != null && !req.isUserInRole(role)) {
- return;
- }
-
- pageContext.getOut().print(attribute.getValue().toString());
+public class GetAsStringTag extends InsertAttributeTag {
+ @Override
+ protected void render(ComponentAttribute attr)
+ throws TilesException, IOException {
+ pageContext.getOut().print(attr.getValue().toString());
}
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
Wed Feb 7 06:07:55 2007
@@ -97,8 +97,7 @@
throw new TilesException("No attribute name or value has been
provided.");
}
}
-
- container.render(pageContext, attr);
+ render(attr);
}
@Override
@@ -108,5 +107,18 @@
evaluatingContext = container.getComponentContext(context);
}
super.startContext(context);
+ }
+
+ /**
+ * Renders an attribute for real.
+ *
+ * @param attr The attribute to render.
+ * @throws TilesException If something goes wrong during rendering.
+ * @throws IOException If something goes wrong during the reading of
+ * definition files.
+ */
+ protected void render(ComponentAttribute attr)
+ throws TilesException, IOException {
+ container.render(pageContext, attr);
}
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
Wed Feb 7 06:07:55 2007
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class InsertDefinitionTag extends RenderTagSupport implements
PutTagParent {
+public class InsertDefinitionTag extends RenderTagSupport implements
PutAttributeTagParent {
private String name;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
Wed Feb 7 06:07:55 2007
@@ -24,7 +24,7 @@
import org.apache.tiles.context.jsp.JspUtil;
import org.apache.tiles.taglib.RenderTagSupport;
-import org.apache.tiles.taglib.PutTagParent;
+import org.apache.tiles.taglib.PutAttributeTagParent;
import javax.servlet.jsp.JspException;
@@ -35,7 +35,7 @@
* @version $Rev$ $Date$
*/
public class InsertTemplateTag extends RenderTagSupport
- implements PutTagParent {
+ implements PutAttributeTagParent {
private String template;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
Wed Feb 7 06:07:55 2007
@@ -24,7 +24,7 @@
import org.apache.tiles.taglib.ContainerTagSupport;
import org.apache.tiles.taglib.ComponentConstants;
-import org.apache.tiles.taglib.PutTagParent;
+import org.apache.tiles.taglib.PutAttributeTagParent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -42,7 +42,7 @@
* <li><insertDefinition></li>
* <li><putList></li>
* </ul>
- * (or any other tag which implements the <code>[EMAIL PROTECTED]
PutTagParent}</code> interface.
+ * (or any other tag which implements the <code>[EMAIL PROTECTED]
PutAttributeTagParent}</code> interface.
* Exception is thrown if no appropriate tag can be found.</p>
* <p>Put tag can have following atributes :
* <ul>
@@ -152,8 +152,8 @@
}
protected void execute() throws JspException {
- PutTagParent parent = (PutTagParent)
- TagSupport.findAncestorWithClass(this, PutTagParent.class);
+ PutAttributeTagParent parent = (PutAttributeTagParent)
+ TagSupport.findAncestorWithClass(this,
PutAttributeTagParent.class);
if (parent == null) {
Copied:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
(from r504079,
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java?view=diff&rev=504552&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java&r1=504079&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
Wed Feb 7 06:07:55 2007
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public interface PutTagParent {
+public interface PutAttributeTagParent {
/**
* Process the nested tag.
*
Copied:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
(from r504079,
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java)
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java?view=diff&rev=504552&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java&r1=504079&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
Wed Feb 7 06:07:55 2007
@@ -23,7 +23,7 @@
package org.apache.tiles.taglib;
import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.taglib.PutTagParent;
+import org.apache.tiles.taglib.PutAttributeTagParent;
import java.util.ArrayList;
import java.util.List;
@@ -37,12 +37,8 @@
* @since Tiles 1.0
* @version $Rev$ $Date$
*/
-public class PutListTag extends PutAttributeTag
- implements PutTagParent {
-
-
- public PutListTag() {
- }
+public class PutListAttributeTag extends PutAttributeTag
+ implements PutAttributeTagParent {
/**
* Get list defined in tag.
@@ -52,7 +48,7 @@
}
public void setValue(Object object) {
- throw new IllegalStateException("The value of the PutListTag must be
the originally defined list.");
+ throw new IllegalStateException("The value of the PutListAttributeTag
must be the originally defined list.");
}
public int doStartTag() {
@@ -60,7 +56,7 @@
return super.doStartTag();
}
/**
- * PutListTag may not have any body, except for PutAttribute tags.
+ * PutListAttributeTag may not have any body, except for PutAttribute tags.
*
* @throws JspException if a JSP exception has occurred
*/
@@ -78,7 +74,7 @@
}
/**
- * Process nested ≶put> tag.
+ * Process nested ≶putAttribute> tag.
* <p/>
* Places the value of the nested tag within the
* [EMAIL PROTECTED] org.apache.tiles.ComponentContext}.It is the
responsibility
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
Wed Feb 7 06:07:55 2007
@@ -26,7 +26,7 @@
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.TilesException;
import org.apache.tiles.taglib.PutAttributeTag;
-import org.apache.tiles.taglib.PutTagParent;
+import org.apache.tiles.taglib.PutAttributeTagParent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TryCatchFinally;
@@ -51,7 +51,7 @@
* @version $Rev$ $Date$
*/
public abstract class RenderTagSupport extends ContainerTagSupport
- implements TryCatchFinally, PutTagParent {
+ implements TryCatchFinally, PutAttributeTagParent {
private static Log LOG = LogFactory.getLog(RenderTagSupport.class);
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
Wed Feb 7 06:07:55 2007
@@ -21,7 +21,7 @@
*/
package org.apache.tiles.taglib.definition;
-import org.apache.tiles.taglib.PutTagParent;
+import org.apache.tiles.taglib.PutAttributeTagParent;
import org.apache.tiles.taglib.PutAttributeTag;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.TilesContainer;
@@ -43,7 +43,7 @@
* @version $Rev$ $Date$
*/
public class DefinitionTag extends TagSupport
- implements PutTagParent {
+ implements PutAttributeTagParent {
private String name;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
Wed Feb 7 06:07:55 2007
@@ -30,7 +30,7 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.factory.TilesContainerFactory;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.taglib.PutTagParent;
+import org.apache.tiles.taglib.PutAttributeTagParent;
import org.apache.tiles.taglib.PutAttributeTag;
import javax.servlet.RequestDispatcher;
@@ -53,7 +53,7 @@
* @version $Rev$ $Date$
*/
public class InitContainerTag extends BodyTagSupport
- implements PutTagParent {
+ implements PutAttributeTagParent {
private static final Log LOG =
LogFactory.getLog(InitContainerTag.class);
Modified:
tiles/framework/trunk/tiles-core/src/main/resources/META-INF/tld/tiles-core.tld
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/resources/META-INF/tld/tiles-core.tld?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/resources/META-INF/tld/tiles-core.tld
(original)
+++
tiles/framework/trunk/tiles-core/src/main/resources/META-INF/tld/tiles-core.tld
Wed Feb 7 06:07:55 2007
@@ -474,8 +474,8 @@
</attribute>
</tag>
<tag>
- <name>putList</name>
- <tag-class>org.apache.tiles.taglib.PutListTag</tag-class>
+ <name>putListAttribute</name>
+ <tag-class>org.apache.tiles.taglib.PutListAttributeTag</tag-class>
<body-content>JSP</body-content>
<description>
<![CDATA[
Modified:
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
(original)
+++
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
Wed Feb 7 06:07:55 2007
@@ -92,7 +92,7 @@
page. This definition is identified by its logical name. A definition
allows
to define all the attributes that can be set in <insert> tag from a jsp
page.
-->
-<!ELEMENT definition (icon?, display-name?, description?, put*, putList*)>
+<!ELEMENT definition (icon?, display-name?, description?, putAttribute*,
putListAttribute*)>
<!ATTLIST definition id ID #IMPLIED>
<!--
@attr preparer The fully qualified Java class name of the preparer
@@ -126,61 +126,61 @@
<!ATTLIST definition template %RequestPath; #IMPLIED>
-<!-- The "put" element describes an attribute of a definition. It allows to
+<!-- The "putAttribute" element describes an attribute of a definition. It
allows to
specify the tiles attribute name and its value. The tiles value can be
- specified as an xml attribute, or in the body of the <put> tag.
+ specified as an xml attribute, or in the body of the <putAttribute> tag.
-->
-<!ELEMENT put (#PCDATA)>
-<!ATTLIST put id ID #IMPLIED>
+<!ELEMENT putAttribute (#PCDATA)>
+<!ATTLIST putAttribute id ID #IMPLIED>
<!--
[EMAIL PROTECTED] name The unique identifier for this put.
[EMAIL PROTECTED] name The unique identifier for this putAttribute.
-->
-<!ATTLIST put name CDATA #REQUIRED>
+<!ATTLIST putAttribute name CDATA #REQUIRED>
<!--
@attr type The type of the value. Can be: string, template or
definition.
By default, no type is associated to a value. If a type is
associated, it will be used as a hint to process the value
when the attribute will be used in the inserted tiles.
-->
-<!ATTLIST put type %ContentType; #IMPLIED>
+<!ATTLIST putAttribute type %ContentType; #IMPLIED>
<!--
@attr value The value associated to this tiles attribute. The value
should
be specified with this tag attribute, or in the body of
the tag.
-->
-<!ATTLIST put value CDATA #IMPLIED>
+<!ATTLIST putAttribute value CDATA #IMPLIED>
-<!-- The "putList" element describes a list attribute of a definition. It
allows to
+<!-- The "putListAttribute" element describes a list attribute of a
definition. It allows to
specify an attribute that is a java List containing any kind of values. In
- the config file, the list elements are specified by nested <add>, <item>
or
- <putList>.
+ the config file, the list elements are specified by nested
<putAttribute>, <item> or
+ <putListAttribute>.
-->
-<!ELEMENT putList ( (add* | item* | bean* | putList*)+) >
-<!ATTLIST putList id ID #IMPLIED>
+<!ELEMENT putListAttribute ( (addAttribute* | item* | bean* |
putListAttribute*)+) >
+<!ATTLIST putListAttribute id ID #IMPLIED>
<!--
[EMAIL PROTECTED] name The unique identifier for this put list.
[EMAIL PROTECTED] name The unique identifier for this put attribute
list.
-->
-<!ATTLIST putList name CDATA #REQUIRED>
+<!ATTLIST putListAttribute name CDATA #REQUIRED>
<!-- ========== Subordinate Elements ====================================== -->
-<!-- The "add" element describes an element of a list. It is similar to the
+<!-- The "addAttribute" element describes an element of a list. It is similar
to the
<put> element.
-->
-<!ELEMENT add (#PCDATA)>
-<!ATTLIST add id ID #IMPLIED>
+<!ELEMENT addAttribute (#PCDATA)>
+<!ATTLIST addAttribute id ID #IMPLIED>
<!--
@attr type The type of the value. Can be: string, template or
definition.
By default, no type is associated to a value. If a type is
associated, it will be used as a hint to process the value
when the attribute will be used in the inserted tiles.
-->
-<!ATTLIST add type %ContentType; #IMPLIED>
+<!ATTLIST addAttribute type %ContentType; #IMPLIED>
<!--
@attr value The value associated to this tiles attribute. The value
should
be specified with this tag attribute, or in the body of
the tag.
-->
-<!ATTLIST add value CDATA #IMPLIED>
+<!ATTLIST addAttribute value CDATA #IMPLIED>
<!-- The "bean" element describes an element of a list. It create a bean of the
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
Wed Feb 7 06:07:55 2007
@@ -36,42 +36,42 @@
<!-- This definition will remain the same for all locales -->
<definition name="test.common" template="/test.jsp">
- <put name="country" value="none"/>
- <put name="title" value="Common Definition" />
- <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" />
+ <putAttribute name="country" value="none"/>
+ <putAttribute name="title" value="Common Definition" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <put name="country" value="default"/>
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
<!-- This definition will be extended -->
<definition name="test.def.toextend" template="/test.jsp">
- <put name="country" value="default"/>
- <put name="title" value="Definition to be extended" />
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Definition to be extended" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
<!-- This definition will be overridden -->
<definition name="test.def.overridden" template="/test.jsp">
- <put name="country" value="default"/>
- <put name="title" value="Definition to be overridden" />
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Definition to be overridden" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
Wed Feb 7 06:07:55 2007
@@ -36,12 +36,12 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <put name="country" value="US"/>
- <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" />
+ <putAttribute name="country" value="US"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
Wed Feb 7 06:07:55 2007
@@ -36,25 +36,25 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <put name="country" value="France"/>
- <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" />
+ <putAttribute name="country" value="France"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
<definition name="test.common.french" template="/test.jsp">
- <put name="country" value="France"/>
- <put name="title" value="Common Definition for French" />
- <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" />
+ <putAttribute name="country" value="France"/>
+ <putAttribute name="title" value="Common Definition for French" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
<definition name="test.def.overridden" extends="test.def.toextend">
- <put name="country" value="France"/>
+ <putAttribute name="country" value="France"/>
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
Wed Feb 7 06:07:55 2007
@@ -36,12 +36,12 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <put name="country" value="Canada"/>
- <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" />
+ <putAttribute name="country" value="Canada"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
Wed Feb 7 06:07:55 2007
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="test.def2" template="/test.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" />
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
Wed Feb 7 06:07:55 2007
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="test.def3" template="/test.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" />
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
Wed Feb 7 06:07:55 2007
@@ -36,11 +36,11 @@
<!-- Dorked up XML tag. -->
<definitionasdfad name="doc.mainLayout" template="/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" />
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definitionasdfad>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
Wed Feb 7 06:07:55 2007
@@ -36,9 +36,9 @@
<!-- Doc index page description -->
<definition name="doc.mainLayout" template="/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" />
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
Wed Feb 7 06:07:55 2007
@@ -36,12 +36,12 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <put name="country" value="default"/>
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
Wed Feb 7 06:07:55 2007
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="doc.mainLayout" template="/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" />
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
<!-- ======================================================= -->
@@ -48,21 +48,21 @@
<!-- ======================================================= -->
<definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
- <put name="numCols" value="2" />
- <putList name="list0" >
- <add value="/doc/portal/welcome.jsp" />
- <add value="/doc/portal/features.jsp" />
- <!--<add value="/doc/portal/todo.jsp" /> -->
- <add value="/doc/portal/documentation.jsp" />
- </putList>
- <putList name="list1" >
- <add value="/doc/portal/news.jsp" />
- <add value="/doc/portal/download.jsp" />
- <add value="/doc/portal/tilesCompsTemplates.jsp" />
- <add value="/doc/portal/strutsIntegration.jsp" />
- <add value="/doc/portal/comments.jsp" />
- <add value="/doc/portal/revisions.jsp" />
- </putList>
+ <putAttribute name="numCols" value="2" />
+ <putListAttribute name="list0" >
+ <addAttribute value="/doc/portal/welcome.jsp" />
+ <addAttribute value="/doc/portal/features.jsp" />
+ <!--<addAttribute value="/doc/portal/todo.jsp" /> -->
+ <addAttribute value="/doc/portal/documentation.jsp" />
+ </putListAttribute>
+ <putListAttribute name="list1" >
+ <addAttribute value="/doc/portal/news.jsp" />
+ <addAttribute value="/doc/portal/download.jsp" />
+ <addAttribute value="/doc/portal/tilesCompsTemplates.jsp" />
+ <addAttribute value="/doc/portal/strutsIntegration.jsp" />
+ <addAttribute value="/doc/portal/comments.jsp" />
+ <addAttribute value="/doc/portal/revisions.jsp" />
+ </putListAttribute>
</definition>
<!-- ======================================================= -->
@@ -71,18 +71,18 @@
<!-- Menu bar definition -->
<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
- <putList name="componentsList" >
- <add value="doc.menu.links" />
- <add value="doc.menu.taglib.references" />
- <add value="doc.menu.printer.friendly" />
- <add value="doc.menu.old.documents" />
- </putList>
+ <putListAttribute name="componentsList" >
+ <addAttribute value="doc.menu.links" />
+ <addAttribute value="doc.menu.taglib.references" />
+ <addAttribute value="doc.menu.printer.friendly" />
+ <addAttribute value="doc.menu.old.documents" />
+ </putListAttribute>
</definition>
<!-- Documentation menu definition v1.1-->
<definition name="doc.menu.links" template="/layouts/menu.jsp" >
- <put name="title" value="Documentation" />
- <putList name="items" >
+ <putAttribute name="title" value="Documentation" />
+ <putListAttribute name="items" >
<item value="Home" link="/index.jsp" />
<item value="Live Examples (new)" link="/examples/index.jsp" />
<!--
@@ -102,35 +102,35 @@
<item value="Javadoc" link="/api/index.html" />
<item value="Struts Home" link="http://www.apache.org";
icon="/images/struts-power.gif"
classtype="org.apache.tiles.beans.SimpleMenuItem" />
- </putList>
+ </putListAttribute>
</definition>
<!-- Printer friendly menu definition -->
<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
- <put name="title" value="Printer Versions" />
- <putList name="items" >
+ <putAttribute name="title" value="Printer Versions" />
+ <putListAttribute name="items" >
<item value="Quick Overview" link="/test/testAll.jsp" />
<item value="Tutorial" link="/doc/tutorialBody.html" />
<item value="User Guide" link="/doc/userGuideBody.html" />
<item value="Overview (old)" link="/doc/overviewBody.html" />
- </putList>
+ </putListAttribute>
</definition>
<!-- Taglib menu definition -->
<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
- <put name="title" value="Tag Library Reference" />
- <putList name="items" >
+ <putAttribute name="title" value="Tag Library Reference" />
+ <putListAttribute name="items" >
<item value="Tiles Tags" link="/doc/tilesTags.jsp" />
<!-- <item value="Extension Tags (old)" link="/doc/extensionsTags.jsp"
/> -->
- </putList>
+ </putListAttribute>
</definition>
<!-- Oldies menu definition -->
<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
- <put name="title" value="Old Documents" />
- <putList name="items" >
+ <putAttribute name="title" value="Old Documents" />
+ <putListAttribute name="items" >
<item value="Overview (old)" link="/doc/overview.jsp" />
- </putList>
+ </putListAttribute>
</definition>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
Wed Feb 7 06:07:55 2007
@@ -110,7 +110,7 @@
"\"http://tiles.apache.org/dtds/tiles-config_2_0.dtd\";>\n\n" +
"<tiles-definitions>" +
"<definition name=\"rewrite.test\" template=\"/test.jsp\">" +
- "<put name=\"testparm\" value=\"testval\"/>" +
+ "<putAttribute name=\"testparm\" value=\"testval\"/>" +
"</definition>" +
"</tiles-definitions>";
@@ -146,7 +146,7 @@
"\"http://tiles.apache.org/dtds/tiles-config_2_0.dtd\";>\n\n" +
"<tiles-definitions>" +
"<definition name=\"rewrite.test\" template=\"/newtest.jsp\">"
+
- "<put name=\"testparm\" value=\"testval\"/>" +
+ "<putAttribute name=\"testparm\" value=\"testval\"/>" +
"</definition>" +
"</tiles-definitions>";
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-one.xml
Wed Feb 7 06:07:55 2007
@@ -28,12 +28,12 @@
<tiles-definitions>
<definition name="test.def.one" template="/test.jsp">
- <put name="country" value="default"/>
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs-key-two.xml
Wed Feb 7 06:07:55 2007
@@ -28,12 +28,12 @@
<tiles-definitions>
<definition name="test.def.two" template="/test.jsp">
- <put name="country" value="default"/>
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml?view=diff&rev=504552&r1=504551&r2=504552
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/test-defs.xml
Wed Feb 7 06:07:55 2007
@@ -28,12 +28,12 @@
<tiles-definitions>
<definition name="test.def1" template="/test.jsp">
- <put name="country" value="default"/>
- <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" />
+ <putAttribute name="country" value="default"/>
+ <putAttribute name="title" value="Tiles Library Documentation" />
+ <putAttribute name="header" value="/common/header.jsp" />
+ <putAttribute name="menu" value="doc.menu.main" />
+ <putAttribute name="footer" value="/common/footer.jsp" />
+ <putAttribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>
