Author: wsmoak
Date: Sun Sep 17 16:52:18 2006
New Revision: 447170
URL: http://svn.apache.org/viewvc?view=rev&rev=447170
Log:
Removed support for component-definitions/definition from the DTD and
DigesterDefinitionsReader.
Also removed support for component-instances/instance (which wasn't in the DTD.)
Use tiles-definitions/definition instead of either of these options.
Removed
SB-30
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java?view=diff&rev=447170&r1=447169&r2=447170
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java
Sun Sep 17 16:52:18 2006
@@ -183,60 +183,14 @@
}
}
-
initDigesterForTilesDefinitionsSyntax( digester );
- initDigesterForComponentsDefinitionsSyntax( digester );
- initDigesterForInstancesSyntax( digester );
-
+
inited = true;
}
/**
- * 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 PACKAGE_NAME = "org.apache.tiles";
- String DEFINITION_TAG = "component-definitions/definition";
- String definitionHandlerClass = PACKAGE_NAME + ".ComponentDefinition";
-
- String PUT_TAG = DEFINITION_TAG + "/put";
- String putAttributeHandlerClass = PACKAGE_NAME + ".ComponentAttribute";
-
- String LIST_TAG = DEFINITION_TAG + "/putList";
-
- String listHandlerClass = PACKAGE_NAME + ".ComponentListAttribute";
-
- String ADD_LIST_ELE_TAG = LIST_TAG + "/add";
-
- // syntax rules
- digester.addObjectCreate( DEFINITION_TAG, definitionHandlerClass );
- digester.addSetProperties( DEFINITION_TAG);
- digester.addSetNext( DEFINITION_TAG, "addDefinition",
definitionHandlerClass);
- // put / putAttribute rules
- digester.addObjectCreate( PUT_TAG, putAttributeHandlerClass);
- digester.addSetNext( PUT_TAG, "addAttribute",
putAttributeHandlerClass);
- digester.addSetProperties( PUT_TAG);
- digester.addCallMethod( PUT_TAG, "setBody", 0);
- // list rules
- digester.addObjectCreate( LIST_TAG, listHandlerClass);
- digester.addSetProperties( LIST_TAG);
- digester.addSetNext( LIST_TAG, "addAttribute",
putAttributeHandlerClass);
- // 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, putAttributeHandlerClass);
- digester.addSetNext( ADD_LIST_ELE_TAG, "add",
putAttributeHandlerClass);
- digester.addSetProperties( ADD_LIST_ELE_TAG);
- digester.addCallMethod( ADD_LIST_ELE_TAG, "setBody", 0);
- }
-
- /**
- * Init digester for Tiles syntax.
- * Same as components, but with first element = tiles-definitions
+ * Init digester for Tiles syntax with first element = tiles-definitions
* @param digester Digester instance to use.
*/
private void initDigesterForTilesDefinitionsSyntax( Digester digester ) {
@@ -312,52 +266,6 @@
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 PACKAGE_NAME = "org.apache.tiles";
- String INSTANCE_TAG = "component-instances/instance";
- String instanceHandlerClass = PACKAGE_NAME + ".ComponentDefinition";
-
- String PUT_TAG = INSTANCE_TAG + "/put";
- String PUTATTRIBUTE_TAG = INSTANCE_TAG + "/putAttribute";
- String putAttributeHandlerClass = PACKAGE_NAME + ".ComponentAttribute";
-
- String LIST_TAG = INSTANCE_TAG + "/putList";
-
- String listHandlerClass = PACKAGE_NAME + ".ComponentListAttribute";
-
- String ADD_LIST_ELE_TAG = LIST_TAG + "/add";
-
- // component instance rules
- digester.addObjectCreate( INSTANCE_TAG, instanceHandlerClass );
- digester.addSetProperties( INSTANCE_TAG);
- digester.addSetNext( INSTANCE_TAG, "addDefinition",
instanceHandlerClass);
- // put / putAttribute rules
- digester.addObjectCreate( PUTATTRIBUTE_TAG, putAttributeHandlerClass);
- digester.addSetProperties( PUTATTRIBUTE_TAG);
- digester.addSetNext( PUTATTRIBUTE_TAG, "addAttribute",
putAttributeHandlerClass);
- // put / putAttribute rules
- digester.addObjectCreate( PUT_TAG, putAttributeHandlerClass);
- digester.addSetProperties( PUT_TAG);
- digester.addSetNext( PUT_TAG, "addAttribute",
putAttributeHandlerClass);
- // list rules
- digester.addObjectCreate( LIST_TAG, listHandlerClass);
- digester.addSetProperties( LIST_TAG);
- digester.addSetNext( LIST_TAG, "addAttribute",
putAttributeHandlerClass);
- // 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, putAttributeHandlerClass);
- digester.addSetProperties( ADD_LIST_ELE_TAG);
- digester.addSetNext( ADD_LIST_ELE_TAG, "add",
putAttributeHandlerClass);
- }
-
/**
* Adds a new <code>ComponentDefinition</code> to the internal Map or
replaces
* an existing one.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd?view=diff&rev=447170&r1=447169&r2=447170
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
Sun Sep 17 16:52:18 2006
@@ -66,9 +66,6 @@
<!-- ========== 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.
