Author: apetrelli
Date: Tue Jun 9 19:30:31 2009
New Revision: 783102
URL: http://svn.apache.org/viewvc?rev=783102&view=rev
Log:
TILES-402
Applied patch by Matt Benson and fixed TemplateAttributeRenderer.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java?rev=783102&r1=783101&r2=783102&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/TemplateAttributeRenderer.java
Tue Jun 9 19:30:31 2009
@@ -44,7 +44,7 @@
request.dispatch(value.toString());
} else {
throw new InvalidTemplateException(
- "Cannot render a template that is not an object: "
+ "Cannot render a template that is not a string: "
+ value.toString());
}
} else {
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=783102&r1=783101&r2=783102&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
Tue Jun 9 19:30:31 2009
@@ -114,7 +114,7 @@
}
} else {
throw new InvalidTemplateException(
- "Cannot render a template that is not an object: "
+ "Cannot render a template that is not a string: "
+ value.toString());
}
} else {
Modified:
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=783102&r1=783101&r2=783102&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
(original)
+++
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
Tue Jun 9 19:30:31 2009
@@ -108,7 +108,7 @@
velocityView.merge(template, context, request.getWriter());
} else {
throw new InvalidTemplateException(
- "Cannot render a template that is not an object: "
+ "Cannot render a template that is not a string: "
+ value.toString());
}
} else {
