Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 92777 invoked from network); 21 Aug 2008 09:41:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Aug 2008 09:41:35 -0000 Received: (qmail 84100 invoked by uid 500); 21 Aug 2008 09:41:33 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 83975 invoked by uid 500); 21 Aug 2008 09:41:33 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 83966 invoked by uid 99); 21 Aug 2008 09:41:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Aug 2008 02:41:32 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Aug 2008 09:40:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 42B882388961; Thu, 21 Aug 2008 02:41:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r687670 - in /cocoon/whiteboard/corona/trunk/corona-stringtemplate: pom.xml src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java Date: Thu, 21 Aug 2008 09:41:12 -0000 To: cvs@cocoon.apache.org From: reinhard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080821094113.42B882388961@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reinhard Date: Thu Aug 21 02:41:09 2008 New Revision: 687670 URL: http://svn.apache.org/viewvc?rev=687670&view=rev Log: Escapes the characters in a String using XML entities using StringEscapeUtils.escapeXML() Modified: cocoon/whiteboard/corona/trunk/corona-stringtemplate/pom.xml cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java Modified: cocoon/whiteboard/corona/trunk/corona-stringtemplate/pom.xml URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-stringtemplate/pom.xml?rev=687670&r1=687669&r2=687670&view=diff ============================================================================== --- cocoon/whiteboard/corona/trunk/corona-stringtemplate/pom.xml (original) +++ cocoon/whiteboard/corona/trunk/corona-stringtemplate/pom.xml Thu Aug 21 02:41:09 2008 @@ -49,6 +49,10 @@ commons-io commons-io + + commons-lang + commons-lang + junit Modified: cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java?rev=687670&r1=687669&r2=687670&view=diff ============================================================================== --- cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java (original) +++ cocoon/whiteboard/corona/trunk/corona-stringtemplate/src/main/java/org/apache/cocoon/corona/stringtemplate/StringTemplateGenerator.java Thu Aug 21 02:41:09 2008 @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Map.Entry; +import org.antlr.stringtemplate.AttributeRenderer; import org.antlr.stringtemplate.StringTemplate; import org.apache.cocoon.corona.pipeline.caching.CacheKey; import org.apache.cocoon.corona.pipeline.caching.CompoundCacheKey; @@ -33,6 +34,7 @@ import org.apache.cocoon.corona.pipeline.component.sax.AbstractXMLProducer; import org.apache.cocoon.corona.servlet.controller.ControllerContextHelper; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; @@ -90,6 +92,11 @@ InputStream inputStream = this.source.openStream(); try { StringTemplate stringTemplate = new StringTemplate(IOUtils.toString(inputStream, "UTF-8")); + stringTemplate.registerRenderer(String.class, new AttributeRenderer() { + public String toString(Object object) { + return StringEscapeUtils.escapeXml(object.toString()); + } + }); Map controllerContext = ControllerContextHelper.getContext(this.parameters); for (Entry eachEntry : controllerContext.entrySet()) {