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/05/11 11:56:19 UTC
svn commit: r655291 - in
/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf:
transport/spring/AbstractCamelContextBeanDefinitionParser.java
util/DataInInterceptor.java
Author: ningjiang
Date: Sun May 11 02:56:18 2008
New Revision: 655291
URL: http://svn.apache.org/viewvc?rev=655291&view=rev
Log:
Mini updates of the camel-cxf component
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java?rev=655291&r1=655290&r2=655291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java Sun May 11 02:56:18 2008
@@ -55,10 +55,10 @@
BeanDefinition bd = ctx.getDelegate().parseCustomElement((Element)n);
// Get the inner camel context id
String contextId = (String)bd.getPropertyValues().getPropertyValue("id").getValue();
- bean.addPropertyReference("camelContext", getContextId(contextId));
+ wireCamelContext(bean, getContextId(contextId));
} else if ("camelContextRef".equals(name)) {
String contextId = n.getTextContent();
- bean.addPropertyReference("camelContext", getContextId(contextId));
+ wireCamelContext(bean, getContextId(contextId));
}
}
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java?rev=655291&r1=655290&r2=655291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java Sun May 11 02:56:18 2008
@@ -22,6 +22,8 @@
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import org.w3c.dom.Document;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
import org.apache.cxf.interceptor.Fault;
@@ -41,7 +43,8 @@
DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
try {
// put the payload source as a document
- message.setContent(Source.class, new DOMSource(StaxUtils.read(xmlReader)));
+ Document doc = StaxUtils.read(xmlReader);
+ message.setContent(Source.class, new DOMSource(doc));
} catch (XMLStreamException e) {
throw new Fault(new org.apache.cxf.common.i18n.Message("XMLSTREAM_EXCEPTION",
LOG),