Author: apetrelli
Date: Sun Feb 24 15:27:51 2008
New Revision: 630704
URL: http://svn.apache.org/viewvc?rev=630704&view=rev
Log:
TILES-249
Fixed init parameter name.
TILES-250
Fixed initialization of explicit (i.e. class) renderer names.
Relaxed the constraint on the value of the "type" attribute in <put-attribute>
and <add-attribute>.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=630704&r1=630703&r2=630704&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
Sun Feb 24 15:27:51 2008
@@ -50,7 +50,7 @@
* @since 2.1.0
*/
public static final String TYPE_RENDERERS_INIT_PARAM =
- "org.apache.tiles.rendere.impl.BasicRendereFactory.TYPE_RENDERERS";
+ "org.apache.tiles.renderer.impl.BasicRendereFactory.TYPE_RENDERERS";
/**
* The default renderer init parameter.
@@ -161,6 +161,7 @@
if (retValue == null) {
try {
retValue = (AttributeRenderer) ClassUtil.instantiate(name);
+ initializeRenderer(retValue);
} catch (TilesException e) {
throw new TilesRuntimeException(
"Cannot instantiate renderer " + name, e);
Modified:
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd?rev=630704&r1=630703&r2=630704&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
(original)
+++
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
Sun Feb 24 15:27:51 2008
@@ -39,7 +39,7 @@
<!-- A "ContentType" is the content type of an attribute passed to a template.
-->
-<!ENTITY % ContentType "(string|template|definition|object)">
+<!ENTITY % ContentType "CDATA">
<!-- A "ClassName" is the fully qualified name of a Java class that is
instantiated to provide the functionality of the enclosing element.