You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/12/02 08:12:28 UTC
[1/2] git commit: CAMEL-7025 revert the change of StaxConverterTest
which should not be committed yet
Updated Branches:
refs/heads/camel-2.11.x 958157b8b -> 7fa3bb401
refs/heads/camel-2.12.x 78f3531d3 -> 5c85b0dcb
CAMEL-7025 revert the change of StaxConverterTest which should not be committed yet
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5c85b0dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5c85b0dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5c85b0dc
Branch: refs/heads/camel-2.12.x
Commit: 5c85b0dcbf45ea845f0617cd8c863aed47cb2b0f
Parents: 78f3531
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Dec 2 14:54:35 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Dec 2 15:11:14 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/converter/jaxp/StaxConverterTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5c85b0dc/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
index 3caba1f..1049332 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
@@ -58,7 +58,7 @@ public class StaxConverterTest extends ContextTestSupport {
output = new ByteArrayOutputStream();
// ensure UTF-8 encoding
Exchange exchange = new DefaultExchange(context);
- //exchange.setProperty(Exchange.CHARSET_NAME, ISO_8859_1.toString());
+ exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.toString());
writer = context.getTypeConverter().mandatoryConvertTo(XMLEventWriter.class, exchange, output);
while (reader.hasNext()) {
writer.add(reader.nextEvent());
@@ -92,7 +92,7 @@ public class StaxConverterTest extends ContextTestSupport {
output = new ByteArrayOutputStream();
// ensure UTF-8 encoding
Exchange exchange = new DefaultExchange(context);
- //exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
+ exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
writer = context.getTypeConverter().mandatoryConvertTo(XMLStreamWriter.class, exchange, output);
// copy to writer
while (reader.hasNext()) {
[2/2] git commit: CAMEL-7025 revert the change of StaxConverterTest
which should not be committed yet
Posted by ni...@apache.org.
CAMEL-7025 revert the change of StaxConverterTest which should not be committed yet
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7fa3bb40
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7fa3bb40
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7fa3bb40
Branch: refs/heads/camel-2.11.x
Commit: 7fa3bb40104bad99fde04dfa809fe33ba0fe4515
Parents: 958157b
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Dec 2 14:54:35 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Dec 2 15:12:01 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/converter/jaxp/StaxConverterTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7fa3bb40/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
index c211b62..f0997bb 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
@@ -58,7 +58,7 @@ public class StaxConverterTest extends ContextTestSupport {
output = new ByteArrayOutputStream();
// ensure UTF-8 encoding
Exchange exchange = new DefaultExchange(context);
- //exchange.setProperty(Exchange.CHARSET_NAME, ISO_8859_1.toString());
+ exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.toString());
writer = context.getTypeConverter().mandatoryConvertTo(XMLEventWriter.class, exchange, output);
while (reader.hasNext()) {
writer.add(reader.nextEvent());
@@ -93,7 +93,7 @@ public class StaxConverterTest extends ContextTestSupport {
output = new ByteArrayOutputStream();
// ensure UTF-8 encoding
Exchange exchange = new DefaultExchange(context);
- //exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
+ exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
writer = context.getTypeConverter().mandatoryConvertTo(XMLStreamWriter.class, exchange, output);
// copy to writer
while (reader.hasNext()) {