You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/02/14 16:17:43 UTC
svn commit: r507569 - in /tiles/framework/trunk/tiles-core/src:
main/java/org/apache/tiles/definition/digester/
main/resources/org/apache/tiles/resources/
test/java/org/apache/tiles/config/ test/java/org/apache/tiles/definition/
test/java/org/apache/ti...
Author: apetrelli
Date: Wed Feb 14 07:17:41 2007
New Revision: 507569
URL: http://svn.apache.org/viewvc?view=rev&rev=507569
Log:
TILES-103
Converted "camel case" attributes to be dash-separated
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -204,17 +204,17 @@
String DEFINITION_TAG = "tiles-definitions/definition";
String definitionHandlerClass = PACKAGE_NAME + ".definition.ComponentDefinition";
- String PUT_TAG = DEFINITION_TAG + "/putAttribute";
+ String PUT_TAG = DEFINITION_TAG + "/put-attribute";
String putAttributeHandlerClass = PACKAGE_NAME + ".ComponentAttribute";
//String LIST_TAG = DEFINITION_TAG + "/putList";
// List tag value
- String LIST_TAG = "putListAttribute";
+ String LIST_TAG = "put-list-attribute";
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 + "/addAttribute";
+ String ADD_LIST_ELE_TAG = "*/" + LIST_TAG + "/add-attribute";
// syntax rules
digester.addObjectCreate(DEFINITION_TAG, definitionHandlerClass);
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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 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?, putAttribute*, putListAttribute*)>
+<!ELEMENT definition (icon?, display-name?, description?, put-attribute*, put-list-attribute*)>
<!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 "putAttribute" element describes an attribute of a definition. It allows to
+<!-- The "put-attribute" 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 <putAttribute> tag.
+ specified as an xml attribute, or in the body of the <put-attribute> tag.
-->
-<!ELEMENT putAttribute (#PCDATA)>
-<!ATTLIST putAttribute id ID #IMPLIED>
+<!ELEMENT put-attribute (#PCDATA)>
+<!ATTLIST put-attribute id ID #IMPLIED>
<!--
-@attr name The unique identifier for this putAttribute.
+@attr name The unique identifier for this put-attribute.
-->
-<!ATTLIST putAttribute name CDATA #REQUIRED>
+<!ATTLIST put-attribute 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 putAttribute type %ContentType; #IMPLIED>
+<!ATTLIST put-attribute 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 putAttribute value CDATA #IMPLIED>
+<!ATTLIST put-attribute value CDATA #IMPLIED>
-<!-- The "putListAttribute" element describes a list attribute of a definition. It allows to
+<!-- The "put-list-attribute" 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 <putAttribute>, <item> or
- <putListAttribute>.
+ the config file, the list elements are specified by nested <put-attribute>, <item> or
+ <put-list-attribute>.
-->
-<!ELEMENT putListAttribute ( (addAttribute* | item* | bean* | putListAttribute*)+) >
-<!ATTLIST putListAttribute id ID #IMPLIED>
+<!ELEMENT put-list-attribute ( (add-attribute* | item* | bean* | put-list-attribute*)+) >
+<!ATTLIST put-list-attribute id ID #IMPLIED>
<!--
@attr name The unique identifier for this put attribute list.
-->
-<!ATTLIST putListAttribute name CDATA #REQUIRED>
+<!ATTLIST put-list-attribute name CDATA #REQUIRED>
<!-- ========== Subordinate Elements ====================================== -->
-<!-- The "addAttribute" element describes an element of a list. It is similar to the
+<!-- The "add-attribute" element describes an element of a list. It is similar to the
<put> element.
-->
-<!ELEMENT addAttribute (#PCDATA)>
-<!ATTLIST addAttribute id ID #IMPLIED>
+<!ELEMENT add-attribute (#PCDATA)>
+<!ATTLIST add-attribute 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 addAttribute type %ContentType; #IMPLIED>
+<!ATTLIST add-attribute 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 addAttribute value CDATA #IMPLIED>
+<!ATTLIST add-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,42 +36,42 @@
<!-- This definition will remain the same for all locales -->
<definition name="test.common" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="none"/>
+ <put-attribute name="title" value="Common Definition" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<!-- This definition will be extended -->
<definition name="test.def.toextend" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Definition to be extended" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<!-- This definition will be overridden -->
<definition name="test.def.overridden" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Definition to be overridden" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,12 +36,12 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="US"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,25 +36,25 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="France"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<definition name="test.common.french" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="France"/>
+ <put-attribute name="title" value="Common Definition for French" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<definition name="test.def.overridden" extends="test.def.toextend">
- <putAttribute name="country" value="France"/>
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,12 +36,12 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="Canada"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="test.def2" template="/test.jsp">
- <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" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="test.def3" template="/test.jsp">
- <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" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,11 +36,11 @@
<!-- Dorked up XML tag. -->
<definitionasdfad name="doc.mainLayout" template="/layout/classicLayout.jsp">
- <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" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,9 +36,9 @@
<!-- Doc index page description -->
<definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
- <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" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,12 +36,12 @@
<!-- Doc index page description -->
<definition name="test.def1" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -36,11 +36,11 @@
<!-- Doc index page description -->
<definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
- <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" />
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
<!-- ======================================================= -->
@@ -48,21 +48,21 @@
<!-- ======================================================= -->
<definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
- <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>
+ <put-attribute name="numCols" value="2" />
+ <put-list-attribute name="list0" >
+ <add-attribute value="/doc/portal/welcome.jsp" />
+ <add-attribute value="/doc/portal/features.jsp" />
+ <!--<add-attribute value="/doc/portal/todo.jsp" /> -->
+ <add-attribute value="/doc/portal/documentation.jsp" />
+ </put-list-attribute>
+ <put-list-attribute name="list1" >
+ <add-attribute value="/doc/portal/news.jsp" />
+ <add-attribute value="/doc/portal/download.jsp" />
+ <add-attribute value="/doc/portal/tilesCompsTemplates.jsp" />
+ <add-attribute value="/doc/portal/strutsIntegration.jsp" />
+ <add-attribute value="/doc/portal/comments.jsp" />
+ <add-attribute value="/doc/portal/revisions.jsp" />
+ </put-list-attribute>
</definition>
<!-- ======================================================= -->
@@ -71,18 +71,18 @@
<!-- Menu bar definition -->
<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
- <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>
+ <put-list-attribute name="componentsList" >
+ <add-attribute value="doc.menu.links" />
+ <add-attribute value="doc.menu.taglib.references" />
+ <add-attribute value="doc.menu.printer.friendly" />
+ <add-attribute value="doc.menu.old.documents" />
+ </put-list-attribute>
</definition>
<!-- Documentation menu definition v1.1-->
<definition name="doc.menu.links" template="/layouts/menu.jsp" >
- <putAttribute name="title" value="Documentation" />
- <putListAttribute name="items" >
+ <put-attribute name="title" value="Documentation" />
+ <put-list-attribute 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" />
- </putListAttribute>
+ </put-list-attribute>
</definition>
<!-- Printer friendly menu definition -->
<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
- <putAttribute name="title" value="Printer Versions" />
- <putListAttribute name="items" >
+ <put-attribute name="title" value="Printer Versions" />
+ <put-list-attribute 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" />
- </putListAttribute>
+ </put-list-attribute>
</definition>
<!-- Taglib menu definition -->
<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
- <putAttribute name="title" value="Tag Library Reference" />
- <putListAttribute name="items" >
+ <put-attribute name="title" value="Tag Library Reference" />
+ <put-list-attribute name="items" >
<item value="Tiles Tags" link="/doc/tilesTags.jsp" />
<!-- <item value="Extension Tags (old)" link="/doc/extensionsTags.jsp" /> -->
- </putListAttribute>
+ </put-list-attribute>
</definition>
<!-- Oldies menu definition -->
<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
- <putAttribute name="title" value="Old Documents" />
- <putListAttribute name="items" >
+ <put-attribute name="title" value="Old Documents" />
+ <put-list-attribute name="items" >
<item value="Overview (old)" link="/doc/overview.jsp" />
- </putListAttribute>
+ </put-list-attribute>
</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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 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\">" +
- "<putAttribute name=\"testparm\" value=\"testval\"/>" +
+ "<put-attribute 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\">" +
- "<putAttribute name=\"testparm\" value=\"testval\"/>" +
+ "<put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -28,12 +28,12 @@
<tiles-definitions>
<definition name="test.def.one" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -28,12 +28,12 @@
<tiles-definitions>
<definition name="test.def.two" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute 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=507569&r1=507568&r2=507569
==============================================================================
--- 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 14 07:17:41 2007
@@ -28,12 +28,12 @@
<tiles-definitions>
<definition name="test.def1" template="/test.jsp">
- <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" />
+ <put-attribute name="country" value="default"/>
+ <put-attribute name="title" value="Tiles Library Documentation" />
+ <put-attribute name="header" value="/common/header.jsp" />
+ <put-attribute name="menu" value="doc.menu.main" />
+ <put-attribute name="footer" value="/common/footer.jsp" />
+ <put-attribute name="body" value="doc.portal.body" />
</definition>
</tiles-definitions>