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 2008/12/01 14:55:01 UTC
svn commit: r722075 - in /activemq/camel/branches/camel-1.x: ./
components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/XmlBeansConverter.java
Author: ningjiang
Date: Mon Dec 1 05:55:00 2008
New Revision: 722075
URL: http://svn.apache.org/viewvc?rev=722075&view=rev
Log:
Merged revisions 722070 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r722070 | ningjiang | 2008-12-01 21:44:01 +0800 (Mon, 01 Dec 2008) | 1 line
CAMEL-1134 fixed the build of camel-xmlbeans
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/XmlBeansConverter.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 1 05:55:00 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/XmlBeansConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/XmlBeansConverter.java?rev=722075&r1=722074&r2=722075&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/XmlBeansConverter.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/XmlBeansConverter.java Mon Dec 1 05:55:00 2008
@@ -31,6 +31,7 @@
import org.xml.sax.SAXException;
import org.apache.camel.Converter;
+import org.apache.camel.Exchange;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.converter.NIOConverter;
import org.apache.camel.converter.jaxp.XmlConverter;
@@ -69,8 +70,8 @@
}
@Converter
- public static XmlObject toXmlObject(String value) throws IOException, XmlException {
- return toXmlObject(IOConverter.toInputStream(value));
+ public static XmlObject toXmlObject(String value, Exchange exchange) throws IOException, XmlException {
+ return toXmlObject(IOConverter.toInputStream(value, exchange));
}
@Converter