camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1241016 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/converter/jaxp/ components/camel-http/ components/camel-saxon/src/test/java/org/apache/camel/component/xquery/
Date Mon, 06 Feb 2012 14:15:27 GMT
Author: ningjiang
Date: Mon Feb  6 14:15:26 2012
New Revision: 1241016

URL: http://svn.apache.org/viewvc?rev=1241016&view=rev
Log:
Merged revisions 1241006 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

................
  r1241006 | ningjiang | 2012-02-06 21:28:59 +0800 (Mon, 06 Feb 2012) | 9 lines
  
  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.8.x/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java
      - copied unchanged from r1241006, camel/branches/camel-2.9.x/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
    camel/branches/camel-2.8.x/components/camel-http/   (props changed)

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 14:15:26 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025
+/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=1241016&r1=1241015&r2=1241016&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
(original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
Mon Feb  6 14:15:26 2012
@@ -169,24 +169,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);
     }
 
     /**

Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 14:15:26 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x/components/camel-http:1234054
+/camel/branches/camel-2.9.x/components/camel-http:1234054,1241006
 /camel/trunk/components/camel-http:1226860,1228223,1234043



Mime
View raw message