CAMEL-7130 Polish the code and add a profile to run the tests with Xalan
Conflicts:
camel-core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef10ef7c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef10ef7c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef10ef7c
Branch: refs/heads/camel-2.11.x
Commit: ef10ef7cb453e23c59ea88e2e484c27aa6c589bf
Parents: 40b1576
Author: Willem Jiang <[email protected]>
Authored: Fri Jan 24 13:52:10 2014 +0800
Committer: Willem Jiang <[email protected]>
Committed: Fri Jan 24 14:19:07 2014 +0800
----------------------------------------------------------------------
camel-core/pom.xml | 11 +++++++++++
.../org/apache/camel/builder/xml/XsltBuilder.java | 18 +++++++++---------
.../builder/xml/XsltTestErrorListenerTest.java | 4 ++++
3 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ef10ef7c/camel-core/pom.xml
----------------------------------------------------------------------
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 5b7e05d..3c028cb 100755
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -377,6 +377,17 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>xalan</id>
+ <dependencies>
+ <!-- enable the Xalan processor -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/ef10ef7c/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
----------------------------------------------------------------------
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 8406794..b36d79a 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -140,7 +140,7 @@ public class XsltBuilder implements Processor {
}
}
- private boolean isXalanTransformer(Transformer transformer) {
+ boolean isXalanTransformer(Transformer transformer) {
return
transformer.getClass().getName().startsWith("org.apache.xalan.transformer");
}
@@ -463,14 +463,14 @@ public class XsltBuilder implements Processor {
}
Source source = null;
if (body != null) {
- if (isXalanTransformer) {
- XMLStreamReader reader =
exchange.getContext().getTypeConverter().tryConvertTo(XMLStreamReader.class,
exchange, body);
- if (reader != null) {
- // create a new SAXSource with stax parser API
- source = new StaxSource(reader);
- }
- } else {
- if (isAllowStAX()) {
+ if (isAllowStAX()) {
+ if (isXalanTransformer) {
+ XMLStreamReader reader =
exchange.getContext().getTypeConverter().tryConvertTo(XMLStreamReader.class,
exchange, body);
+ if (reader != null) {
+ // create a new SAXSource with stax parser API
+ source = new StaxSource(reader);
+ }
+ } else {
source =
exchange.getContext().getTypeConverter().tryConvertTo(StAXSource.class,
exchange, body);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ef10ef7c/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
----------------------------------------------------------------------
diff --git
a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
index e80c049..1951310 100644
---
a/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
+++
b/camel-core/src/test/java/org/apache/camel/builder/xml/XsltTestErrorListenerTest.java
@@ -34,6 +34,10 @@ public class XsltTestErrorListenerTest extends TestCase {
private ErrorListener errorListener = createMock(ErrorListener.class);
public void testErrorListener() throws Exception {
+ // Xalan transformer cannot work as expected, so we just skip the test
+ if
(xsltBuilder.isXalanTransformer(xsltBuilder.getTemplate().newTransformer())) {
+ return;
+ }
errorListener.error(EasyMock.<TransformerException>anyObject());
expectLastCall().atLeastOnce();