You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/10/09 11:45:50 UTC
[camel] branch master updated: Revert "CAMEL-15616:camel-saxon -
Upgrade to Saxon 10.x, correct OSGi range in xslt-saxon"
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7738cc3 Revert "CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range in xslt-saxon"
7738cc3 is described below
commit 7738cc3e4541a8fd8dfd5a99b4f794bc5ffa1416
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Oct 9 13:39:58 2020 +0200
Revert "CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range in xslt-saxon"
This reverts commit 8824941d2dda21fb59d3752fdf04ab9f5ada1784.
Revert "CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range"
This reverts commit fce17cc8ea1424a9763bd07525cdac22dd6a2615.
Revert "CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x""
This reverts commit b8c93ac50131bdd50aef3b1d436306856db4b035.
---
components/camel-saxon/pom.xml | 2 +-
.../java/org/apache/camel/component/xquery/XQueryBuilder.java | 4 ++--
.../java/org/apache/camel/converter/saxon/SaxonConverter.java | 7 +++----
.../apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java | 9 ++++-----
components/camel-xslt-saxon/pom.xml | 2 +-
parent/pom.xml | 2 +-
6 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index b166402..9ed643c 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.saxon.*;version="[10,11)"
+ net.sf.saxon.*;version="[9.9.0,10)"
</camel.osgi.import.additional>
</properties>
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
index 384d224..fd7f38a 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
@@ -223,7 +223,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
DOMResult result = new DOMResult();
DynamicQueryContext context = createDynamicContext(exchange);
XQueryExpression expression = getExpression();
- expression.run(context, result, properties);
+ expression.pull(context, result, properties);
return result.getNode();
}
@@ -232,7 +232,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
Result result = new StreamResult(buffer);
- getExpression().run(createDynamicContext(exchange), result, properties);
+ getExpression().pull(createDynamicContext(exchange), result, properties);
byte[] answer = buffer.toByteArray();
buffer.close();
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java b/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java
index 16f1bd4..b9c0d75 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java
@@ -28,8 +28,8 @@ import org.w3c.dom.NodeList;
import net.sf.saxon.Configuration;
import net.sf.saxon.dom.DOMNodeList;
import net.sf.saxon.dom.NodeOverNodeInfo;
+import net.sf.saxon.om.DocumentInfo;
import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.om.TreeInfo;
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.type.Type;
import org.apache.camel.Converter;
@@ -51,10 +51,9 @@ public final class SaxonConverter {
return (Document) NodeOverNodeInfo.wrap(node);
case Type.ELEMENT:
// ELEMENT nodes need to build a new DocumentInfo before wrapping
- //https://www.saxonica.com/documentation/#!javadoc/net.sf.saxon/Configuration@buildDocumentTree
Configuration config = node.getConfiguration();
- TreeInfo treeInfo = config.buildDocumentTree(node);
- return (Document) NodeOverNodeInfo.wrap(treeInfo.getRootNode());
+ DocumentInfo documentInfo = config.buildDocument(node);
+ return (Document) NodeOverNodeInfo.wrap(documentInfo);
default:
return null;
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
index 24186c6..241c6fc 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.xslt;
-import net.sf.saxon.trans.XPathException;
+import net.sf.saxon.trans.UncheckedXPathException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -39,10 +39,9 @@ public class SaxonXsltFeatureRouteTest extends CamelTestSupport {
template.sendBody("direct:start1", message);
fail("expect an exception here");
} catch (Exception ex) {
-
- assertTrue(ex instanceof CamelExecutionException);
- assertTrue(ex.getCause() instanceof XPathException);
-
+ // expect an exception here
+ assertTrue(ex instanceof CamelExecutionException, "Get a wrong exception");
+ assertTrue(ex.getCause() instanceof UncheckedXPathException, "Get a wrong exception cause");
}
}
diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml
index d10ce41..523a1ee 100644
--- a/components/camel-xslt-saxon/pom.xml
+++ b/components/camel-xslt-saxon/pom.xml
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.saxon.*;version="[10,11)"
+ net.sf.saxon.*;version="[9.9.0,10)"
</camel.osgi.import.additional>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 82671f3..7797119 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -487,7 +487,7 @@
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
<rxjava2-version>2.2.19</rxjava2-version>
- <saxon-version>10.2</saxon-version>
+ <saxon-version>9.9.1-7</saxon-version>
<scala-version>2.11.7</scala-version>
<scribe-version>1.3.7</scribe-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>