Author: ningjiang
Date: Mon Feb 6 13:28:59 2012
New Revision: 1241006
URL: http://svn.apache.org/viewvc?rev=1241006&view=rev
Log:
Merged revisions 1240950 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1240950 | ningjiang | 2012-02-06 17:41:44 +0800 (Mon, 06 Feb 2012) | 1 line
CAMEL-4970 Fixed the issue that cannot use xquery predicate in filter after
an xpath splitter
........
Added:
camel/branches/camel-2.9.x/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java
- copied unchanged from r1240950,
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 6 13:28:59 2012
@@ -1 +1 @@
-/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063
+/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=1241006&r1=1241005&r2=1241006&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
Mon Feb 6 13:28:59 2012
@@ -171,24 +171,37 @@ public class XmlConverter {
*/
@Deprecated
public DOMSource toSource(Document document) {
- return toDOMSource(document);
+ return new DOMSource(document);
}
/**
* Converts the given Node to a Source
+ * @throws TransformerException
+ * @throws ParserConfigurationException
* @deprecated use toDOMSource instead
*/
@Deprecated
- public Source toSource(Node node) {
+ public Source toSource(Node node) throws ParserConfigurationException,
TransformerException {
return toDOMSource(node);
}
/**
* Converts the given Node to a Source
+ * @throws TransformerException
+ * @throws ParserConfigurationException
*/
@Converter
- public DOMSource toDOMSource(Node node) {
- return new DOMSource(node);
+ public DOMSource toDOMSource(Node node) throws
ParserConfigurationException, TransformerException {
+ Document document = toDOMDocument(node);
+ return new DOMSource(document);
+ }
+
+ /**
+ * Converts the given Document to a DOMSource
+ */
+ @Converter
+ public DOMSource toDOMSource(Document document) {
+ return new DOMSource(document);
}
/**
