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/05/18 17:53:59 UTC
svn commit: r539507 - in /tiles/framework/trunk:
tiles-compat/src/main/java/org/ tiles-compat/src/main/java/org/apache/
tiles-compat/src/main/java/org/apache/tiles/
tiles-compat/src/main/java/org/apache/tiles/compat/
tiles-compat/src/main/java/org/apac...
Author: apetrelli
Date: Fri May 18 08:53:57 2007
New Revision: 539507
URL: http://svn.apache.org/viewvc?view=rev&rev=539507
Log:
TILES-182
Added a first version of a new DefinitionsReader to read old definition files.
Added:
tiles/framework/trunk/tiles-compat/src/main/java/org/
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java (with props)
tiles/framework/trunk/tiles-compat/src/main/resources/org/
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd (with props)
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd (with props)
tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd (with props)
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
Added: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?view=auto&rev=539507
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java (added)
+++ tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java Fri May 18 08:53:57 2007
@@ -0,0 +1,196 @@
+package org.apache.tiles.compat.definition.digester;
+
+import org.apache.commons.digester.Digester;
+import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
+import org.apache.tiles.definition.digester.DigesterDefinitionsReader.FillAttributeRule;
+
+public class CompatibilityDigesterDefinitionsReader extends
+ DigesterDefinitionsReader {
+ /**
+ * The set of public identifiers, and corresponding resource names for the
+ * versions of the configuration file DTDs we know about. There <strong>MUST</strong>
+ * be an even number of Strings in this list!
+ */
+ protected String registrations[] = {
+ "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
+ "/org/apache/tiles/resources/tiles-config_2_0.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN",
+ "/org/apache/tiles/compat/resources/tiles-config_1_1.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.3//EN",
+ "/org/apache/tiles/compat/resources/tiles-config_1_3.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.4//EN",
+ "/org/apache/tiles/compat/resources/tiles-config_1_4.dtd" };
+
+ @Override
+ protected void initSyntax(Digester digester) {
+ super.initSyntax(digester);
+ initDigesterForComponentsDefinitionsSyntax(digester);
+ }
+
+ /**
+ * Init digester for components syntax. This is an old set of rules, left
+ * for backward compatibility.
+ *
+ * @param digester Digester instance to use.
+ */
+ private void initDigesterForComponentsDefinitionsSyntax(Digester digester) {
+ // Common constants
+ String DEFINITION_TAG = "component-definitions/definition";
+
+ String PUT_TAG = DEFINITION_TAG + "/put";
+
+ String LIST_TAG = DEFINITION_TAG + "/putList";
+
+ String ADD_LIST_ELE_TAG = LIST_TAG + "/add";
+
+ // syntax rules
+ digester.addObjectCreate(DEFINITION_TAG, DEFINITION_HANDLER_CLASS);
+ digester.addSetProperties(DEFINITION_TAG);
+ digester.addSetNext(DEFINITION_TAG, "putDefinition",
+ DEFINITION_HANDLER_CLASS);
+ // put / putAttribute rules
+ digester.addObjectCreate(PUT_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(PUT_TAG, new FillAttributeRule());
+ digester.addSetNext(PUT_TAG, "addAttribute",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addCallMethod(PUT_TAG, "setBody", 0);
+ // list rules
+ digester.addObjectCreate(LIST_TAG, LIST_HANDLER_CLASS);
+ digester.addSetProperties(LIST_TAG);
+ digester.addSetNext(LIST_TAG, "addAttribute",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ // list elements rules
+ // We use Attribute class to avoid rewriting a new class.
+ // Name part can't be used in listElement attribute.
+ digester.addObjectCreate(ADD_LIST_ELE_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(ADD_LIST_ELE_TAG, new FillAttributeRule());
+ digester.addSetNext(ADD_LIST_ELE_TAG, "add",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addCallMethod(ADD_LIST_ELE_TAG, "setBody", 0);
+ }
+
+ /**
+ * Init digester for Tiles syntax. Same as components, but with first
+ * element = tiles-definitions
+ *
+ * @param digester Digester instance to use.
+ */
+ private void initDigesterForTilesDefinitionsSyntax(Digester digester) {
+ // Common constants
+ String DEFINITION_TAG = "tiles-definitions/definition";
+
+ String PUT_TAG = DEFINITION_TAG + "/put";
+
+ // String LIST_TAG = DEFINITION_TAG + "/putList";
+ // List tag value
+ String LIST_TAG = "putList";
+ String DEF_LIST_TAG = DEFINITION_TAG + "/" + LIST_TAG;
+ // Tag value for adding an element in a list
+ String ADD_LIST_ELE_TAG = "*/" + LIST_TAG + "/add";
+
+ // syntax rules
+ digester.addObjectCreate(DEFINITION_TAG, DEFINITION_HANDLER_CLASS);
+ digester.addSetProperties(DEFINITION_TAG);
+ digester.addSetNext(DEFINITION_TAG, "putDefinition",
+ DEFINITION_HANDLER_CLASS);
+ // put / putAttribute rules
+ // Rules for a same pattern are called in order, but rule.end() are
+ // called
+ // in reverse order.
+ // SetNext and CallMethod use rule.end() method. So, placing SetNext in
+ // first position ensure it will be called last (sic).
+ digester.addObjectCreate(PUT_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(PUT_TAG, new FillAttributeRule());
+ digester.addSetNext(PUT_TAG, "addAttribute",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addCallMethod(PUT_TAG, "setBody", 0);
+ // Definition level list rules
+ // This is rules for lists nested in a definition
+ digester.addObjectCreate(DEF_LIST_TAG, LIST_HANDLER_CLASS);
+ digester.addSetProperties(DEF_LIST_TAG);
+ digester.addSetNext(DEF_LIST_TAG, "addAttribute",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ // list elements rules
+ // We use Attribute class to avoid rewriting a new class.
+ // Name part can't be used in listElement attribute.
+ digester.addObjectCreate(ADD_LIST_ELE_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(ADD_LIST_ELE_TAG, new FillAttributeRule());
+ digester.addSetNext(ADD_LIST_ELE_TAG, "add",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addCallMethod(ADD_LIST_ELE_TAG, "setBody", 0);
+
+ // nested list elements rules
+ // Create a list handler, and add it to parent list
+ String NESTED_LIST = "*/" + LIST_TAG + "/" + LIST_TAG;
+ digester.addObjectCreate(NESTED_LIST, LIST_HANDLER_CLASS);
+ digester.addSetProperties(NESTED_LIST);
+ digester.addSetNext(NESTED_LIST, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
+
+ // item elements rules
+ // We use Attribute class to avoid rewriting a new class.
+ // Name part can't be used in listElement attribute.
+ // String ADD_WILDCARD = LIST_TAG + "/addItem";
+ // non String ADD_WILDCARD = LIST_TAG + "/addx*";
+ String ADD_WILDCARD = "*/item";
+ String menuItemDefaultClass = "org.apache.struts.tiles.beans.SimpleMenuItem";
+ digester.addObjectCreate(ADD_WILDCARD, menuItemDefaultClass,
+ "classtype");
+ digester.addSetNext(ADD_WILDCARD, "add", "java.lang.Object");
+ digester.addSetProperties(ADD_WILDCARD);
+
+ // bean elements rules
+ String BEAN_TAG = "*/bean";
+ String beanDefaultClass = "org.apache.struts.tiles.beans.SimpleMenuItem";
+ digester.addObjectCreate(BEAN_TAG, beanDefaultClass, "classtype");
+ digester.addSetNext(BEAN_TAG, "add", "java.lang.Object");
+ digester.addSetProperties(BEAN_TAG);
+
+ // Set properties to surrounding element
+ digester
+ .addSetProperty(BEAN_TAG + "/set-property", "property", "value");
+ }
+
+ /**
+ * Init digester in order to parse instances definition file syntax.
+ * Instances is an old name for "definition". This method is left for
+ * backwards compatibility.
+ *
+ * @param digester Digester instance to use.
+ */
+ private void initDigesterForInstancesSyntax(Digester digester) {
+ // Build a digester to process our configuration resource
+ String INSTANCE_TAG = "component-instances/instance";
+
+ String PUT_TAG = INSTANCE_TAG + "/put";
+ String PUTATTRIBUTE_TAG = INSTANCE_TAG + "/putAttribute";
+
+ String LIST_TAG = INSTANCE_TAG + "/putList";
+
+ String ADD_LIST_ELE_TAG = LIST_TAG + "/add";
+
+ // component instance rules
+ digester.addObjectCreate(INSTANCE_TAG, DEFINITION_HANDLER_CLASS);
+ digester.addSetProperties(INSTANCE_TAG);
+ digester
+ .addSetNext(INSTANCE_TAG, "putDefinition", DEFINITION_HANDLER_CLASS);
+ // put / putAttribute rules
+ digester.addObjectCreate(PUTATTRIBUTE_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(PUT_TAG, new FillAttributeRule());
+ digester.addSetNext(PUTATTRIBUTE_TAG, "addAttribute",
+ PUT_ATTRIBUTE_HANDLER_CLASS);
+ // put / putAttribute rules
+ digester.addObjectCreate(PUT_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addSetProperties(PUT_TAG);
+ digester.addSetNext(PUT_TAG, "addAttribute", PUT_ATTRIBUTE_HANDLER_CLASS);
+ // list rules
+ digester.addObjectCreate(LIST_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addSetProperties(LIST_TAG);
+ digester.addSetNext(LIST_TAG, "addAttribute", PUT_ATTRIBUTE_HANDLER_CLASS);
+ // list elements rules
+ // We use Attribute class to avoid rewriting a new class.
+ // Name part can't be used in listElement attribute.
+ digester.addObjectCreate(ADD_LIST_ELE_TAG, PUT_ATTRIBUTE_HANDLER_CLASS);
+ digester.addRule(ADD_LIST_ELE_TAG, new FillAttributeRule());
+ digester.addSetNext(ADD_LIST_ELE_TAG, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
+ }
+}
Propchange: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd?view=auto&rev=539507
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd (added)
+++ tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd Fri May 18 08:53:57 2007
@@ -0,0 +1,299 @@
+<!--
+ $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.
+-->
+<!--
+ DTD for the Tile Definition File, Version 1.1
+
+ To support validation of your configuration file, include the following
+ DOCTYPE element at the beginning (after the "xml" declaration):
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
+ "http://struts.apache.org/dtds/tiles-config_1_1.dtd">
+
+ $Id$
+-->
+
+
+<!-- ========== Defined Types ============================================= -->
+
+
+<!-- A "Boolean" is the string representation of a boolean (true or false)
+ variable.
+-->
+<!ENTITY % Boolean "(true|false)">
+
+
+<!-- A "ContentType" is the content type of an attribute passed to a tile
+ component.
+-->
+<!ENTITY % ContentType "(string|page|template|definition)">
+
+<!-- A "ClassName" is the fully qualified name of a Java class that is
+ instantiated to provide the functionality of the enclosing element.
+-->
+<!ENTITY % ClassName "CDATA">
+
+<!-- A "RequestPath" is an module-relative URI path, beginning with a
+ slash, that identifies a mapped resource (such as a JSP page or a servlet)
+ within this web application.
+-->
+<!ENTITY % RequestPath "CDATA">
+
+<!-- A "DefinitionName" is the unique identifier of a definition. This identifier
+ is a logical name used to reference the definition.
+-->
+<!ENTITY % DefinitionName "CDATA">
+
+<!-- A "BeanName" is the identifier of a JavaBean, such as a form bean,
+ and also serves as the name of the corresponding scripting variable
+ and the name of the JSP attribute under which the bean is accessed.
+ Therefore, it must conform to the rules for a Java identifier.
+-->
+<!ENTITY % BeanName "CDATA">
+
+<!-- A "PropName" is the name of a JavaBeans property, and must begin with
+ a lower case letter and contain only characters that are legal in a
+ Java identifier.
+-->
+<!ENTITY % PropName "CDATA">
+
+<!-- A "Location" is a relative path, delimited by "/" characters, that
+ defines the location of a resource relative to the location of the
+ configuration file itself.
+-->
+<!ENTITY % Location "#PCDATA">
+
+
+
+<!-- ========== Top Level Elements ======================================== -->
+
+
+ <!-- deprecated: use tiles-definitions instead.-->
+<!ELEMENT component-definitions (definition+)>
+
+<!-- The "tiles-definitions" element is the root of the configuration file
+ hierarchy, and contains nested elements for all of the other
+ configuration settings.
+-->
+<!ELEMENT tiles-definitions (definition+)>
+
+<!-- The "definition" element describes a definition that can be inserted in a jsp
+ 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.
+
+ controllerClass The fully qualified Java class name of the controller
+ subclass to call immediately before the tiles is inserted.
+ Only one of controllerClass or controllerUrl should be
+ specified.
+
+ controllerUrl The context-relative path to the resource used as controller
+ called immediately before the tiles is inserted.
+ Only one of controllerClass or controllerUrl should be
+ specified.
+
+ extends Name of a definition that is used as ancestor of this definition.
+ All attributes from the ancestor are available to the new
+ definition. Any attribute inherited from the ancestor can
+ be overloaded by providing a new value.
+
+ name The unique identifier for this definition.
+
+ page Same as path.
+
+ path The context-relative path to the resource used as tiles to
+ insert. This tiles will be inserted and a tiles context
+ containing appropriate attributes will be available.
+
+ role Security role name that is allowed access to this definition
+ object. The definition is inserted only if the role name is
+ allowed.
+
+ template Same as path. For compatibility with the template tag library.
+-->
+<!ELEMENT definition (icon?, display-name?, description?, put*, putList*)>
+<!ATTLIST definition id ID #IMPLIED>
+<!ATTLIST definition controllerClass %ClassName; #IMPLIED>
+<!ATTLIST definition controllerUrl %RequestPath; #IMPLIED>
+<!ATTLIST definition extends %DefinitionName; #IMPLIED>
+<!ATTLIST definition name %DefinitionName; #REQUIRED>
+<!ATTLIST definition page %RequestPath; #IMPLIED>
+<!ATTLIST definition path %RequestPath; #IMPLIED>
+<!ATTLIST definition role CDATA #IMPLIED>
+<!ATTLIST definition template %RequestPath; #IMPLIED>
+
+
+<!-- The "put" 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.
+
+ content Same as value. For compatibility with the template tag library.
+
+ direct Same as type="string". For compatibility with the template
+ tag library.
+
+ name The unique identifier for this put.
+
+ type The type of the value. Can be: string, page, 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.
+
+ value The value associated to this tiles attribute. The value should
+ be specified with this tag attribute, or in the body of the tag.
+-->
+<!ELEMENT put (#PCDATA)>
+<!ATTLIST put id ID #IMPLIED>
+<!ATTLIST put content CDATA #IMPLIED>
+<!ATTLIST put direct %Boolean; #IMPLIED>
+<!ATTLIST put name CDATA #REQUIRED>
+<!ATTLIST put type %ContentType; #IMPLIED>
+<!ATTLIST put value CDATA #IMPLIED>
+
+
+<!-- The "putList" 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>.
+
+ name The unique identifier for this put list.
+-->
+<!ELEMENT putList ( (add* | item* | bean* | putList*)+) >
+<!ATTLIST putList id ID #IMPLIED>
+<!ATTLIST putList name CDATA #REQUIRED>
+
+<!-- ========== Subordinate Elements ====================================== -->
+
+<!-- The "add" element describes an element of a list. It is similar to the
+ <put> element.
+
+ content Same as value. For compatibility with the template tag library.
+
+ direct Same as type="string". For compatibility with the template
+ tag library.
+
+ type The type of the value. Can be: string, page, 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.
+
+ value The value associated to this tiles attribute. The value should
+ be specified with this tag attribute, or in the body of the tag.
+-->
+<!ELEMENT add (#PCDATA)>
+<!ATTLIST add id ID #IMPLIED>
+<!ATTLIST add content CDATA #IMPLIED>
+<!ATTLIST add direct %Boolean; #IMPLIED>
+<!ATTLIST add type %ContentType; #IMPLIED>
+<!ATTLIST add value CDATA #IMPLIED>
+
+
+<!-- The "bean" element describes an element of a list. It create a bean of the
+ specified java classtype. This bean is initialized with appropriate nested
+ <set-property>.
+
+ classtype The fully qualified classname for this bean.
+-->
+<!ELEMENT bean (set-property*)>
+<!ATTLIST bean id ID #IMPLIED>
+<!ATTLIST bean classtype %ClassName; #REQUIRED>
+
+<!-- The "set-property" element specifies the method name and initial value of
+ a bean property. When the object representing
+ the surrounding element is instantiated, the accessor for the indicated
+ property is called and passed the indicated value.
+
+ property Name of the JavaBeans property whose setter method
+ will be called.
+
+ value String representation of the value to which this
+ property will be set, after suitable type conversion
+-->
+<!ELEMENT set-property EMPTY>
+<!ATTLIST set-property id ID #IMPLIED>
+<!ATTLIST set-property property %PropName; #REQUIRED>
+<!ATTLIST set-property value CDATA #REQUIRED>
+
+
+<!-- The "item" element describes an element of a list. It create a bean added as
+ element to the list. Each bean can contain different properties: value, link,
+ icon, tooltip. These properties are to be interpreted by the jsp page using
+ them.
+ By default the bean is of type
+ "org.apache.struts.tiles.beans.SimpleMenuItem". This bean is useful to
+ create a list of beans used as menu items.
+
+ classtype The fully qualified classtype for this bean.
+ If specified, the classtype must be a subclass of the interface
+ "org.apache.struts.tiles.beans.MenuItem".
+
+ icon The bean 'icon' property.
+
+ link The bean 'link' property.
+
+ tooltip The bean 'tooltip' property.
+
+ value The bean 'value' property.
+-->
+<!ELEMENT item (#PCDATA)>
+<!ATTLIST item id ID #IMPLIED>
+<!ATTLIST item classtype %ClassName; #IMPLIED>
+<!ATTLIST item icon CDATA #IMPLIED>
+<!ATTLIST item link CDATA #REQUIRED>
+<!ATTLIST item tooltip CDATA #IMPLIED>
+<!ATTLIST item value CDATA #REQUIRED>
+
+
+<!-- ========== Info Elements ====================================== -->
+
+<!-- The "description" element contains descriptive (paragraph length) text
+ about the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT description (#PCDATA)>
+<!ATTLIST description id ID #IMPLIED>
+
+
+<!-- The "display-name" element contains a short (one line) description of
+ the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name id ID #IMPLIED>
+
+
+<!-- The "icon" element contains a small-icon and large-icon element which
+ specify the location, relative to the Struts configuration file, for small
+ and large images used to represent the surrounding element in GUI tools.
+-->
+<!ELEMENT icon (small-icon?, large-icon?)>
+<!ATTLIST icon id ID #IMPLIED>
+
+
+<!-- The "large-icon" element specifies the location, relative to the Struts
+ configuration file, of a resource containing a large (32x32 pixel)
+ icon image.
+-->
+<!ELEMENT large-icon (%Location;)>
+<!ATTLIST large-icon id ID #IMPLIED>
+
+
+<!-- The "small-icon" element specifies the location, relative to the Struts
+ configuration file, of a resource containing a small (16x16 pixel)
+ icon image.
+-->
+<!ELEMENT small-icon (%Location;)>
+<!ATTLIST small-icon id ID #IMPLIED>
Propchange: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd?view=auto&rev=539507
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd (added)
+++ tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd Fri May 18 08:53:57 2007
@@ -0,0 +1,299 @@
+<!--
+ $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.
+-->
+<!--
+ DTD for the Tile Definition File, Version 1.3
+
+ To support validation of your configuration file, include the following
+ DOCTYPE element at the beginning (after the "xml" declaration):
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.3//EN"
+ "http://struts.apache.org/dtds/tiles-config_1_3.dtd">
+
+ $Id$
+-->
+
+
+<!-- ========== Defined Types ============================================= -->
+
+
+<!-- A "Boolean" is the string representation of a boolean (true or false)
+ variable.
+-->
+<!ENTITY % Boolean "(true|false)">
+
+
+<!-- A "ContentType" is the content type of an attribute passed to a tile
+ component.
+-->
+<!ENTITY % ContentType "(string|page|template|definition)">
+
+<!-- A "ClassName" is the fully qualified name of a Java class that is
+ instantiated to provide the functionality of the enclosing element.
+-->
+<!ENTITY % ClassName "CDATA">
+
+<!-- A "RequestPath" is an module-relative URI path, beginning with a
+ slash, that identifies a mapped resource (such as a JSP page or a servlet)
+ within this web application.
+-->
+<!ENTITY % RequestPath "CDATA">
+
+<!-- A "DefinitionName" is the unique identifier of a definition. This identifier
+ is a logical name used to reference the definition.
+-->
+<!ENTITY % DefinitionName "CDATA">
+
+<!-- A "BeanName" is the identifier of a JavaBean, such as a form bean,
+ and also serves as the name of the corresponding scripting variable
+ and the name of the JSP attribute under which the bean is accessed.
+ Therefore, it must conform to the rules for a Java identifier.
+-->
+<!ENTITY % BeanName "CDATA">
+
+<!-- A "PropName" is the name of a JavaBeans property, and must begin with
+ a lower case letter and contain only characters that are legal in a
+ Java identifier.
+-->
+<!ENTITY % PropName "CDATA">
+
+<!-- A "Location" is a relative path, delimited by "/" characters, that
+ defines the location of a resource relative to the location of the
+ configuration file itself.
+-->
+<!ENTITY % Location "#PCDATA">
+
+
+
+<!-- ========== Top Level Elements ======================================== -->
+
+
+ <!-- deprecated: use tiles-definitions instead.-->
+<!ELEMENT component-definitions (definition+)>
+
+<!-- The "tiles-definitions" element is the root of the configuration file
+ hierarchy, and contains nested elements for all of the other
+ configuration settings.
+-->
+<!ELEMENT tiles-definitions (definition+)>
+
+<!-- The "definition" element describes a definition that can be inserted in a jsp
+ 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.
+
+ controllerClass The fully qualified Java class name of the controller
+ subclass to call immediately before the tiles is inserted.
+ Only one of controllerClass or controllerUrl should be
+ specified.
+
+ controllerUrl The context-relative path to the resource used as controller
+ called immediately before the tiles is inserted.
+ Only one of controllerClass or controllerUrl should be
+ specified.
+
+ extends Name of a definition that is used as ancestor of this definition.
+ All attributes from the ancestor are available to the new
+ definition. Any attribute inherited from the ancestor can
+ be overloaded by providing a new value.
+
+ name The unique identifier for this definition.
+
+ page Same as path.
+
+ path The context-relative path to the resource used as tiles to
+ insert. This tiles will be inserted and a tiles context
+ containing appropriate attributes will be available.
+
+ role Security role name that is allowed access to this definition
+ object. The definition is inserted only if the role name is
+ allowed.
+
+ template Same as path. For compatibility with the template tag library.
+-->
+<!ELEMENT definition (icon?, display-name?, description?, put*, putList*)>
+<!ATTLIST definition id ID #IMPLIED>
+<!ATTLIST definition controllerClass %ClassName; #IMPLIED>
+<!ATTLIST definition controllerUrl %RequestPath; #IMPLIED>
+<!ATTLIST definition extends %DefinitionName; #IMPLIED>
+<!ATTLIST definition name %DefinitionName; #REQUIRED>
+<!ATTLIST definition page %RequestPath; #IMPLIED>
+<!ATTLIST definition path %RequestPath; #IMPLIED>
+<!ATTLIST definition role CDATA #IMPLIED>
+<!ATTLIST definition template %RequestPath; #IMPLIED>
+
+
+<!-- The "put" 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.
+
+ content Same as value. For compatibility with the template tag library.
+
+ direct Same as type="string". For compatibility with the template
+ tag library.
+
+ name The unique identifier for this put.
+
+ type The type of the value. Can be: string, page, 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.
+
+ value The value associated to this tiles attribute. The value should
+ be specified with this tag attribute, or in the body of the tag.
+-->
+<!ELEMENT put (#PCDATA)>
+<!ATTLIST put id ID #IMPLIED>
+<!ATTLIST put content CDATA #IMPLIED>
+<!ATTLIST put direct %Boolean; #IMPLIED>
+<!ATTLIST put name CDATA #REQUIRED>
+<!ATTLIST put type %ContentType; #IMPLIED>
+<!ATTLIST put value CDATA #IMPLIED>
+
+
+<!-- The "putList" 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>.
+
+ name The unique identifier for this put list.
+-->
+<!ELEMENT putList ( (add* | item* | bean* | putList*)+) >
+<!ATTLIST putList id ID #IMPLIED>
+<!ATTLIST putList name CDATA #REQUIRED>
+
+<!-- ========== Subordinate Elements ====================================== -->
+
+<!-- The "add" element describes an element of a list. It is similar to the
+ <put> element.
+
+ content Same as value. For compatibility with the template tag library.
+
+ direct Same as type="string". For compatibility with the template
+ tag library.
+
+ type The type of the value. Can be: string, page, 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.
+
+ value The value associated to this tiles attribute. The value should
+ be specified with this tag attribute, or in the body of the tag.
+-->
+<!ELEMENT add (#PCDATA)>
+<!ATTLIST add id ID #IMPLIED>
+<!ATTLIST add content CDATA #IMPLIED>
+<!ATTLIST add direct %Boolean; #IMPLIED>
+<!ATTLIST add type %ContentType; #IMPLIED>
+<!ATTLIST add value CDATA #IMPLIED>
+
+
+<!-- The "bean" element describes an element of a list. It create a bean of the
+ specified java classtype. This bean is initialized with appropriate nested
+ <set-property>.
+
+ classtype The fully qualified classname for this bean.
+-->
+<!ELEMENT bean (set-property*)>
+<!ATTLIST bean id ID #IMPLIED>
+<!ATTLIST bean classtype %ClassName; #REQUIRED>
+
+<!-- The "set-property" element specifies the method name and initial value of
+ a bean property. When the object representing
+ the surrounding element is instantiated, the accessor for the indicated
+ property is called and passed the indicated value.
+
+ property Name of the JavaBeans property whose setter method
+ will be called.
+
+ value String representation of the value to which this
+ property will be set, after suitable type conversion
+-->
+<!ELEMENT set-property EMPTY>
+<!ATTLIST set-property id ID #IMPLIED>
+<!ATTLIST set-property property %PropName; #REQUIRED>
+<!ATTLIST set-property value CDATA #REQUIRED>
+
+
+<!-- The "item" element describes an element of a list. It create a bean added as
+ element to the list. Each bean can contain different properties: value, link,
+ icon, tooltip. These properties are to be interpreted by the jsp page using
+ them.
+ By default the bean is of type
+ "org.apache.struts.tiles.beans.SimpleMenuItem". This bean is useful to
+ create a list of beans used as menu items.
+
+ classtype The fully qualified classtype for this bean.
+ If specified, the classtype must be a subclass of the interface
+ "org.apache.struts.tiles.beans.MenuItem".
+
+ icon The bean 'icon' property.
+
+ link The bean 'link' property.
+
+ tooltip The bean 'tooltip' property.
+
+ value The bean 'value' property.
+-->
+<!ELEMENT item (#PCDATA)>
+<!ATTLIST item id ID #IMPLIED>
+<!ATTLIST item classtype %ClassName; #IMPLIED>
+<!ATTLIST item icon CDATA #IMPLIED>
+<!ATTLIST item link CDATA #REQUIRED>
+<!ATTLIST item tooltip CDATA #IMPLIED>
+<!ATTLIST item value CDATA #REQUIRED>
+
+
+<!-- ========== Info Elements ====================================== -->
+
+<!-- The "description" element contains descriptive (paragraph length) text
+ about the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT description (#PCDATA)>
+<!ATTLIST description id ID #IMPLIED>
+
+
+<!-- The "display-name" element contains a short (one line) description of
+ the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name id ID #IMPLIED>
+
+
+<!-- The "icon" element contains a small-icon and large-icon element which
+ specify the location, relative to the Struts configuration file, for small
+ and large images used to represent the surrounding element in GUI tools.
+-->
+<!ELEMENT icon (small-icon?, large-icon?)>
+<!ATTLIST icon id ID #IMPLIED>
+
+
+<!-- The "large-icon" element specifies the location, relative to the Struts
+ configuration file, of a resource containing a large (32x32 pixel)
+ icon image.
+-->
+<!ELEMENT large-icon (%Location;)>
+<!ATTLIST large-icon id ID #IMPLIED>
+
+
+<!-- The "small-icon" element specifies the location, relative to the Struts
+ configuration file, of a resource containing a small (16x16 pixel)
+ icon image.
+-->
+<!ELEMENT small-icon (%Location;)>
+<!ATTLIST small-icon id ID #IMPLIED>
Propchange: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd?view=auto&rev=539507
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd (added)
+++ tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd Fri May 18 08:53:57 2007
@@ -0,0 +1,299 @@
+<!--
+ $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.
+-->
+<!--
+ DTD for the Tile Definition File, Version 1.4
+
+ To support validation of your configuration file, include the following
+ DOCTYPE element at the beginning (after the "xml" declaration):
+
+ <!DOCTYPE tiles-definitions PUBLIC
+ "-//Apache Software Foundation//DTD Tiles Configuration 1.4//EN"
+ "http://struts.apache.org/dtds/tiles-config_1_4.dtd">
+
+ $Id$
+-->
+
+
+<!-- ========== Defined Types ============================================= -->
+
+
+<!-- A "Boolean" is the string representation of a boolean (true or false)
+ variable.
+-->
+<!ENTITY % Boolean "(true|false)">
+
+
+<!-- A "ContentType" is the content type of an attribute passed to a tile
+ component.
+-->
+<!ENTITY % ContentType "(string|page|template|definition)">
+
+<!-- A "ClassName" is the fully qualified name of a Java class that is
+ instantiated to provide the functionality of the enclosing element.
+-->
+<!ENTITY % ClassName "CDATA">
+
+<!-- A "RequestPath" is an module-relative URI path, beginning with a
+ slash, that identifies a mapped resource (such as a JSP page or a servlet)
+ within this web application.
+-->
+<!ENTITY % RequestPath "CDATA">
+
+<!-- A "DefinitionName" is the unique identifier of a definition. This identifier
+ is a logical name used to reference the definition.
+-->
+<!ENTITY % DefinitionName "CDATA">
+
+<!-- A "BeanName" is the identifier of a JavaBean, such as a form bean,
+ and also serves as the name of the corresponding scripting variable
+ and the name of the JSP attribute under which the bean is accessed.
+ Therefore, it must conform to the rules for a Java identifier.
+-->
+<!ENTITY % BeanName "CDATA">
+
+<!-- A "PropName" is the name of a JavaBeans property, and must begin with
+ a lower case letter and contain only characters that are legal in a
+ Java identifier.
+-->
+<!ENTITY % PropName "CDATA">
+
+<!-- A "Location" is a relative path, delimited by "/" characters, that
+ defines the location of a resource relative to the location of the
+ configuration file itself.
+-->
+<!ENTITY % Location "#PCDATA">
+
+
+
+<!-- ========== Top Level Elements ======================================== -->
+
+
+ <!-- deprecated: use tiles-definitions instead.-->
+<!ELEMENT component-definitions (definition+)>
+
+<!-- The "tiles-definitions" element is the root of the configuration file
+ hierarchy, and contains nested elements for all of the other
+ configuration settings.
+-->
+<!ELEMENT tiles-definitions (definition+)>
+
+<!-- The "definition" element describes a definition that can be inserted in a jsp
+ 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.
+
+ controllerClass The fully qualified Java class name of the controller
+ subclass to call immediately before the tiles is inserted.
+ Only one of controllerClass or controllerUrl should be
+ specified.
+
+ controllerUrl The context-relative path to the resource used as controller
+ called immediately before the tiles is inserted.
+ Only one of controllerClass or controllerUrl should be
+ specified.
+
+ extends Name of a definition that is used as ancestor of this definition.
+ All attributes from the ancestor are available to the new
+ definition. Any attribute inherited from the ancestor can
+ be overloaded by providing a new value.
+
+ name The unique identifier for this definition.
+
+ page Same as path.
+
+ path The context-relative path to the resource used as tiles to
+ insert. This tiles will be inserted and a tiles context
+ containing appropriate attributes will be available.
+
+ role Security role name that is allowed access to this definition
+ object. The definition is inserted only if the role name is
+ allowed.
+
+ template Same as path. For compatibility with the template tag library.
+-->
+<!ELEMENT definition (icon?, display-name?, description?, put*, putList*)>
+<!ATTLIST definition id ID #IMPLIED>
+<!ATTLIST definition controllerClass %ClassName; #IMPLIED>
+<!ATTLIST definition controllerUrl %RequestPath; #IMPLIED>
+<!ATTLIST definition extends %DefinitionName; #IMPLIED>
+<!ATTLIST definition name %DefinitionName; #REQUIRED>
+<!ATTLIST definition page %RequestPath; #IMPLIED>
+<!ATTLIST definition path %RequestPath; #IMPLIED>
+<!ATTLIST definition role CDATA #IMPLIED>
+<!ATTLIST definition template %RequestPath; #IMPLIED>
+
+
+<!-- The "put" 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.
+
+ content Same as value. For compatibility with the template tag library.
+
+ direct Same as type="string". For compatibility with the template
+ tag library.
+
+ name The unique identifier for this put.
+
+ type The type of the value. Can be: string, page, 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.
+
+ value The value associated to this tiles attribute. The value should
+ be specified with this tag attribute, or in the body of the tag.
+-->
+<!ELEMENT put (#PCDATA)>
+<!ATTLIST put id ID #IMPLIED>
+<!ATTLIST put content CDATA #IMPLIED>
+<!ATTLIST put direct %Boolean; #IMPLIED>
+<!ATTLIST put name CDATA #REQUIRED>
+<!ATTLIST put type %ContentType; #IMPLIED>
+<!ATTLIST put value CDATA #IMPLIED>
+
+
+<!-- The "putList" 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>.
+
+ name The unique identifier for this put list.
+-->
+<!ELEMENT putList ( (add* | item* | bean* | putList*)+) >
+<!ATTLIST putList id ID #IMPLIED>
+<!ATTLIST putList name CDATA #REQUIRED>
+
+<!-- ========== Subordinate Elements ====================================== -->
+
+<!-- The "add" element describes an element of a list. It is similar to the
+ <put> element.
+
+ content Same as value. For compatibility with the template tag library.
+
+ direct Same as type="string". For compatibility with the template
+ tag library.
+
+ type The type of the value. Can be: string, page, 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.
+
+ value The value associated to this tiles attribute. The value should
+ be specified with this tag attribute, or in the body of the tag.
+-->
+<!ELEMENT add (#PCDATA)>
+<!ATTLIST add id ID #IMPLIED>
+<!ATTLIST add content CDATA #IMPLIED>
+<!ATTLIST add direct %Boolean; #IMPLIED>
+<!ATTLIST add type %ContentType; #IMPLIED>
+<!ATTLIST add value CDATA #IMPLIED>
+
+
+<!-- The "bean" element describes an element of a list. It create a bean of the
+ specified java classtype. This bean is initialized with appropriate nested
+ <set-property>.
+
+ classtype The fully qualified classname for this bean.
+-->
+<!ELEMENT bean (set-property*)>
+<!ATTLIST bean id ID #IMPLIED>
+<!ATTLIST bean classtype %ClassName; #REQUIRED>
+
+<!-- The "set-property" element specifies the method name and initial value of
+ a bean property. When the object representing
+ the surrounding element is instantiated, the accessor for the indicated
+ property is called and passed the indicated value.
+
+ property Name of the JavaBeans property whose setter method
+ will be called.
+
+ value String representation of the value to which this
+ property will be set, after suitable type conversion
+-->
+<!ELEMENT set-property EMPTY>
+<!ATTLIST set-property id ID #IMPLIED>
+<!ATTLIST set-property property %PropName; #REQUIRED>
+<!ATTLIST set-property value CDATA #REQUIRED>
+
+
+<!-- The "item" element describes an element of a list. It create a bean added as
+ element to the list. Each bean can contain different properties: value, link,
+ icon, tooltip. These properties are to be interpreted by the jsp page using
+ them.
+ By default the bean is of type
+ "org.apache.struts.tiles.beans.SimpleMenuItem". This bean is useful to
+ create a list of beans used as menu items.
+
+ classtype The fully qualified classtype for this bean.
+ If specified, the classtype must be a subclass of the interface
+ "org.apache.struts.tiles.beans.MenuItem".
+
+ icon The bean 'icon' property.
+
+ link The bean 'link' property.
+
+ tooltip The bean 'tooltip' property.
+
+ value The bean 'value' property.
+-->
+<!ELEMENT item (#PCDATA)>
+<!ATTLIST item id ID #IMPLIED>
+<!ATTLIST item classtype %ClassName; #IMPLIED>
+<!ATTLIST item icon CDATA #IMPLIED>
+<!ATTLIST item link CDATA #REQUIRED>
+<!ATTLIST item tooltip CDATA #IMPLIED>
+<!ATTLIST item value CDATA #REQUIRED>
+
+
+<!-- ========== Info Elements ====================================== -->
+
+<!-- The "description" element contains descriptive (paragraph length) text
+ about the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT description (#PCDATA)>
+<!ATTLIST description id ID #IMPLIED>
+
+
+<!-- The "display-name" element contains a short (one line) description of
+ the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name id ID #IMPLIED>
+
+
+<!-- The "icon" element contains a small-icon and large-icon element which
+ specify the location, relative to the Struts configuration file, for small
+ and large images used to represent the surrounding element in GUI tools.
+-->
+<!ELEMENT icon (small-icon?, large-icon?)>
+<!ATTLIST icon id ID #IMPLIED>
+
+
+<!-- The "large-icon" element specifies the location, relative to the Struts
+ configuration file, of a resource containing a large (32x32 pixel)
+ icon image.
+-->
+<!ELEMENT large-icon (%Location;)>
+<!ATTLIST large-icon id ID #IMPLIED>
+
+
+<!-- The "small-icon" element specifies the location, relative to the Struts
+ configuration file, of a resource containing a small (16x16 pixel)
+ icon image.
+-->
+<!ELEMENT small-icon (%Location;)>
+<!ATTLIST small-icon id ID #IMPLIED>
Propchange: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
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=539507&r1=539506&r2=539507
==============================================================================
--- 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 Fri May 18 08:53:57 2007
@@ -120,25 +120,27 @@
/**
* The handler to create definitions.
*/
- private static final String DEFINITION_HANDLER_CLASS =
+ protected static final String DEFINITION_HANDLER_CLASS =
Definition.class.getName();
/**
* The handler to create attributes.
*/
- private static final String PUT_ATTRIBUTE_HANDLER_CLASS =
+ protected static final String PUT_ATTRIBUTE_HANDLER_CLASS =
Attribute.class.getName();
/**
* The handler to create list attributes.
*/
- private static final String LIST_HANDLER_CLASS =
+ protected static final String LIST_HANDLER_CLASS =
ListAttribute.class.getName();
/**
* Digester rule to manage attribute filling.
*/
- private static class FillAttributeRule extends Rule {
+ public static class FillAttributeRule extends Rule {
+
+ public FillAttributeRule() {};
/** {@inheritDoc} */
@Override
@@ -277,9 +279,13 @@
}
}
- initDigesterForTilesDefinitionsSyntax(digester);
+ initSyntax(digester);
inited = true;
+ }
+
+ protected void initSyntax(Digester digester) {
+ initDigesterForTilesDefinitionsSyntax(digester);
}