add scape tool to velocity template context
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/62cf3f82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/62cf3f82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/62cf3f82 Branch: refs/heads/swellrt Commit: 62cf3f824185d54421d351fc956a2a28bd144642 Parents: 08c4636 Author: Antonio Tenorio Fornés <[email protected]> Authored: Mon Oct 10 18:41:07 2016 +0200 Committer: Antonio Tenorio Fornés <[email protected]> Committed: Mon Oct 10 18:41:07 2016 +0200 ---------------------------------------------------------------------- .../java/org/swellrt/server/box/servlet/EmailSenderImp.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/62cf3f82/wave/src/main/java/org/swellrt/server/box/servlet/EmailSenderImp.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/swellrt/server/box/servlet/EmailSenderImp.java b/wave/src/main/java/org/swellrt/server/box/servlet/EmailSenderImp.java index 9e60608..4a2275f 100644 --- a/wave/src/main/java/org/swellrt/server/box/servlet/EmailSenderImp.java +++ b/wave/src/main/java/org/swellrt/server/box/servlet/EmailSenderImp.java @@ -25,6 +25,7 @@ import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.apache.velocity.tools.ToolManager; +import org.apache.velocity.tools.generic.EscapeTool; import org.apache.velocity.tools.generic.ResourceTool; import org.swellrt.server.velocity.CustomResourceTool; import org.waveprotocol.box.server.authentication.SessionManager; @@ -140,7 +141,7 @@ public class EmailSenderImp implements EmailSender, DecoupledTemplates { if (locale == null) { locale = Locale.getDefault(); } - + return ResourceBundle.getBundle(getDecoupledBundleName(messageBundleName), locale, propertyClassloader); } @@ -149,7 +150,7 @@ public class EmailSenderImp implements EmailSender, DecoupledTemplates { public String getDecoupledBundleName(String messageBundleName) { if (!isExternalPropertyClassLoader) return CLASSPATH_VELOCITY_PATH.replace("/", ".") + messageBundleName; - else + else return messageBundleName; } @@ -177,6 +178,7 @@ public class EmailSenderImp implements EmailSender, DecoupledTemplates { context.put(p.getKey(), p.getValue()); } + context.put("esc", new EscapeTool()); StringWriter sw = new StringWriter();
