You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2011/03/15 10:47:49 UTC
svn commit: r1081704 - in /cocoon/cocoon3/trunk:
cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/ parent/
Author: ilgrosso
Date: Tue Mar 15 09:47:48 2011
New Revision: 1081704
URL: http://svn.apache.org/viewvc?rev=1081704&view=rev
Log:
Closing COCOON3-44 with minor adjustments
Modified:
cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java
cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java?rev=1081704&r1=1081703&r2=1081704&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateGenerator.java Tue Mar 15 09:47:48 2011
@@ -99,6 +99,10 @@ public class StringTemplateGenerator ext
public String toString(Object object) {
return StringEscapeUtils.escapeXml(object.toString());
}
+
+ public String toString(Object o, String string) {
+ return toString(o);
+ }
});
this.addTemplateAttributes(stringTemplate);
Modified: cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java?rev=1081704&r1=1081703&r2=1081704&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java (original)
+++ cocoon/cocoon3/trunk/cocoon-stringtemplate/src/main/java/org/apache/cocoon/stringtemplate/StringTemplateReader.java Tue Mar 15 09:47:48 2011
@@ -101,6 +101,10 @@ public class StringTemplateReader extend
public String toString(Object object) {
return StringEscapeUtils.escapeXml(object.toString());
}
+
+ public String toString(Object o, String string) {
+ return toString(o);
+ }
});
Map<String, Object> controllerContext = ControllerContextHelper.getContext(this.parameters);
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1081704&r1=1081703&r2=1081704&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Tue Mar 15 09:47:48 2011
@@ -359,7 +359,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>stringtemplate</artifactId>
- <version>3.0</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>