You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2009/01/20 18:44:30 UTC
svn commit: r736047 - in /camel/branches/camel-1.x: ./
components/camel-velocity/src/main/java/org/apache/camel/component/velocity/
components/camel-velocity/src/test/java/org/apache/camel/component/velocity/
components/camel-velocity/src/test/resource...
Author: janstey
Date: Tue Jan 20 09:44:29 2009
New Revision: 736047
URL: http://svn.apache.org/viewvc?rev=736047&view=rev
Log:
Merged revisions 736046 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r736046 | janstey | 2009-01-20 14:13:25 -0330 (Tue, 20 Jan 2009) | 3 lines
CAMEL-1278 - Adding option to set encoding for velocity template. Thanks to Damian for the patch!
........
Added:
camel/branches/camel-1.x/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java
- copied unchanged from r736046, camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java
camel/branches/camel-1.x/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter-utf16.vm
- copied unchanged from r736046, camel/trunk/components/camel-velocity/src/test/resources/org/apache/camel/component/velocity/letter-utf16.vm
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=736047&r1=736046&r2=736047&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java (original)
+++ camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java Tue Jan 20 09:44:29 2009
@@ -40,6 +40,7 @@
private final VelocityComponent component;
private VelocityEngine velocityEngine;
private boolean loaderCache = true;
+ private String encoding;
public VelocityEndpoint(String uri, VelocityComponent component, String resourceUri, Map parameters) {
super(uri, component, resourceUri, null);
@@ -84,13 +85,21 @@
this.loaderCache = loaderCache;
}
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+
+ public String getEncoding() {
+ return encoding;
+ }
+
@SuppressWarnings("unchecked")
@Override
protected void onExchange(Exchange exchange) throws Exception {
Resource resource = getResource();
// getResourceAsInputStream also considers the content cache
- Reader reader = new InputStreamReader(getResourceAsInputStream());
+ Reader reader = encoding != null ? new InputStreamReader(getResourceAsInputStream(), encoding) : new InputStreamReader(getResourceAsInputStream());
StringWriter buffer = new StringWriter();
String logTag = getClass().getName();
Map variableMap = ExchangeHelper.createVariableMap(exchange);