svn commit: r943775 - in /camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel: Exchange.java converter/IOConverter.java converter/jaxp/XmlConverter.java

[ningjiang]

Author: ningjiang
Date: Thu May 13 02:45:49 2010
New Revision: 943775

URL: http://svn.apache.org/viewvc?rev=943775&view=rev
Log:
CAMEL-2712 Using the same system property for default charset as XmlConverter 
does

Modified:
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Exchange.java
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
    
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=943775&r1=943774&r2=943775&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Exchange.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/Exchange.java
 Thu May 13 02:45:49 2010
@@ -32,6 +32,8 @@ import org.apache.camel.spi.UnitOfWork;
 public interface Exchange {
 
     String CHARSET_NAME = "org.apache.camel.Exchange.CharsetName";
+    
+    String DEFAULT_CHARSET_PROPERTY = "org.apache.camel.default.charset";
 
     String AGGREGATED_COUNT = "org.apache.camel.Exchange.AggregatedCount";
 

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=943775&r1=943774&r2=943775&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
 Thu May 13 02:45:49 2010
@@ -290,6 +290,6 @@ public final class IOConverter {
     }
     
     public static String getDefaultCharsetName() {
-        return "UTF-8";
+        return 
ObjectHelper.getSystemProperty(Exchange.DEFAULT_CHARSET_PROPERTY, "UTF-8");
     }
 }

Modified: 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=943775&r1=943774&r2=943775&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
 (original)
+++ 
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
 Thu May 13 02:45:49 2010
@@ -53,6 +53,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
 import org.apache.camel.Converter;
+import org.apache.camel.Exchange;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.converter.NIOConverter;
 import org.apache.camel.util.ObjectHelper;
@@ -67,7 +68,7 @@ import org.apache.camel.util.ObjectHelpe
 public class XmlConverter {
     public static final String DEFAULT_CHARSET_PROPERTY = 
"org.apache.camel.default.charset";
 
-    public static String defaultCharset = 
ObjectHelper.getSystemProperty(DEFAULT_CHARSET_PROPERTY, "UTF-8");
+    public static String defaultCharset = 
ObjectHelper.getSystemProperty(Exchange.DEFAULT_CHARSET_PROPERTY, "UTF-8");
 
     /*
      * When converting a DOM tree to a SAXSource, we try to use Xalan internal 
DOM parser if