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 2014/08/29 11:20:33 UTC
[1/4] git commit: CAMEL-7762 Fixed the Camel CxfPayload issue when
using namespace with no prefix (xmlns:xmlns)
Repository: camel
Updated Branches:
refs/heads/master feda8de9c -> d62f5120f
CAMEL-7762 Fixed the Camel CxfPayload issue when using namespace with no prefix (xmlns:xmlns)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d62f5120
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d62f5120
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d62f5120
Branch: refs/heads/master
Commit: d62f5120f41ffcf9815451457b184c61ee3fdbba
Parents: 72dd7a0
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Aug 29 17:19:20 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Aug 29 17:20:01 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/cxf/CxfPayload.java | 6 +++-
.../camel/component/cxf/DefaultCxfBinding.java | 6 +++-
.../component/cxf/DefaultCxfBindingTest.java | 35 ++++++++++++++++++++
3 files changed, 45 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d62f5120/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
index 2fad481..1330b0f 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
@@ -110,7 +110,11 @@ public class CxfPayload<T> {
protected static void addNamespace(Element element, Map<String, String> nsMap) {
if (nsMap != null) {
for (String ns : nsMap.keySet()) {
- element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + ns, nsMap.get(ns));
+ if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns)) {
+ element.setAttribute(ns, nsMap.get(ns));
+ } else {
+ element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + ns, nsMap.get(ns));
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d62f5120/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index e80c66a..1c79a4c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -735,7 +735,11 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
protected static void addNamespace(Element element, Map<String, String> nsMap) {
for (String ns : nsMap.keySet()) {
- element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + ns, nsMap.get(ns));
+ if (XMLConstants.XMLNS_ATTRIBUTE.equals(ns)) {
+ element.setAttribute(ns, nsMap.get(ns));
+ } else {
+ element.setAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + ns, nsMap.get(ns));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d62f5120/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 2faa63f..2097f3e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -27,10 +27,17 @@ import java.util.TreeMap;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.cxf.common.message.CxfConstants;
+import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
@@ -43,6 +50,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
@@ -52,6 +60,11 @@ import org.junit.Test;
*
*/
public class DefaultCxfBindingTest extends Assert {
+
+ private static final String SOAP_MESSAGE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""
+ + " xmlns=\"http://www.mycompany.com/test/\" xmlns:ns1=\"http://www.mycompany.com/test/1/\">"
+ + " <soap:Body> <request> <ns1:identifier>TEST</ns1:identifier> </request>"
+ + " </soap:Body> </soap:Envelope>";
private DefaultCamelContext context = new DefaultCamelContext();
@Test
@@ -64,6 +77,28 @@ public class DefaultCxfBindingTest extends Assert {
}
@Test
+ public void testPayloadBodyNamespace() throws Exception {
+ MessageImpl message = new MessageImpl();
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(true);
+ DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ Document document = documentBuilder.parse(IOConverter.toInputStream(SOAP_MESSAGE, null));
+ document.getDocumentElement().normalize();
+ message.setContent(Node.class, document);
+ Map<String, String> nsMap = new HashMap<String, String>();
+ DefaultCxfBinding.getPayloadBodyElements(message, nsMap);
+
+ assertEquals(2, nsMap.size());
+ assertEquals("http://www.mycompany.com/test/", nsMap.get("xmlns"));
+
+ document = documentBuilder.newDocument();
+ Element element = document.createElement("tag");
+ DefaultCxfBinding.addNamespace(element, nsMap);
+ assertEquals("http://www.mycompany.com/test/", element.getAttribute("xmlns"));
+ assertEquals("http://www.mycompany.com/test/1/", element.getAttribute("xmlns:ns1"));
+ }
+
+ @Test
public void testSetCharsetWithContentType() {
DefaultCxfBinding cxfBinding = new DefaultCxfBinding();
cxfBinding.setHeaderFilterStrategy(new DefaultHeaderFilterStrategy());
[3/4] git commit: CAMEL-7755 Fixed bunch of karaf feature issue
Posted by ni...@apache.org.
CAMEL-7755 Fixed bunch of karaf feature issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/72dd7a08
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/72dd7a08
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/72dd7a08
Branch: refs/heads/master
Commit: 72dd7a0857ebf1894b419ac1d81443ca69be5bae
Parents: 621aaa4
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Aug 29 15:49:16 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Aug 29 17:20:01 2014 +0800
----------------------------------------------------------------------
parent/pom.xml | 5 +++--
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/72dd7a08/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d49a26..a2eec91 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -61,6 +61,7 @@
<avalon-version>4.3.1</avalon-version>
<avro-version>1.7.6</avro-version>
<avro-bundle-version>1.7.6_2</avro-bundle-version>
+ <avro-ipc-bundle-version>1.7.6_1</avro-ipc-bundle-version>
<aws-java-sdk-bundle-version>1.8.3_1</aws-java-sdk-bundle-version>
<aws-java-sdk-version>1.8.3</aws-java-sdk-version>
<axiom-version>1.2.14</axiom-version>
@@ -105,7 +106,7 @@
<commons-lang-version-xmljson>2.5</commons-lang-version-xmljson>
<commons-lang3-version>3.1</commons-lang3-version>
<commons-logging-version>1.1.3</commons-logging-version>
- <commons-math-version>2.2</commons-math-version>
+ <commons-math-version>3.2</commons-math-version>
<commons-net-version>3.3</commons-net-version>
<commons-pool-version>1.6</commons-pool-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
@@ -389,7 +390,7 @@
<spring-batch-version>2.2.5.RELEASE</spring-batch-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
- <spring-data-redis-version>1.3.0.RELEASE</spring-data-redis-version>
+ <spring-data-redis-version>1.3.4.RELEASE</spring-data-redis-version>
<spring-integration-version>2.2.6.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/72dd7a08/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 1eb1d03..acc6ad3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -104,7 +104,7 @@
<bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
@@ -483,7 +483,7 @@
<bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version}</bundle>
<bundle dependency='true'>mvn:javax.jmdns/jmdns/3.4.1</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/0.9.0_1</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6</bundle>
[4/4] git commit: CAMEL-7755 Fixed the camel-optaplanner feature
install issue
Posted by ni...@apache.org.
CAMEL-7755 Fixed the camel-optaplanner feature install issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05c75b20
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05c75b20
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05c75b20
Branch: refs/heads/master
Commit: 05c75b206f50f06145164566a56994a83d3ff2bb
Parents: feda8de
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Aug 29 14:07:58 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Aug 29 17:20:01 2014 +0800
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/05c75b20/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bebed05..5d49a26 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -121,7 +121,7 @@
<dnsjava-bundle-version>2.1.1_1</dnsjava-bundle-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>5.5.1</dozer-version>
- <drools-version>6.0.1.Final</drools-version>
+ <drools-version>6.1.0.Final</drools-version>
<dropbox-version>1.7.6</dropbox-version>
<easymock-version>3.2</easymock-version>
<eclipse-compiler-version>4.2.2</eclipse-compiler-version>
@@ -270,7 +270,7 @@
<kafka-bundle-version>0.8.1_1</kafka-bundle-version>
<karaf-version>2.3.6</karaf-version>
<karaf3-version>3.0.1</karaf3-version>
- <kie-version>6.0.0.Final</kie-version>
+ <kie-version>6.1.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/05c75b20/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 2e6ca60..1eb1d03 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -889,6 +889,7 @@
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math-version}</bundle>
<bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${optaplanner-version}</bundle>
<bundle dependency='true'>mvn:org.kie/kie-api/${kie-version}</bundle>
<bundle dependency='true'>mvn:org.kie/kie-internal/${kie-version}</bundle>
@@ -900,6 +901,7 @@
<bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
</feature>
[2/4] git commit: CAMEL-7473 CAMEL-7673 Put the topic name into the
message header
Posted by ni...@apache.org.
CAMEL-7473 CAMEL-7673 Put the topic name into the message header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/621aaa4a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/621aaa4a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/621aaa4a
Branch: refs/heads/master
Commit: 621aaa4a7239cd17ad30a85db52ec1a70874efd2
Parents: 05c75b2
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Aug 29 14:46:20 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Aug 29 17:20:01 2014 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java | 2 +-
.../main/java/org/apache/camel/component/mqtt/MQTTProducer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/621aaa4a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
index 9c8dd95..651049c 100644
--- a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
+++ b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
@@ -85,7 +85,7 @@ public class MQTTEndpoint extends DefaultEndpoint {
if (!consumers.isEmpty()) {
Exchange exchange = createExchange();
exchange.getIn().setBody(body.toByteArray());
- exchange.setProperty(MQTTConfiguration.MQTT_SUBSCRIBE_TOPIC, topic.toString());
+ exchange.getIn().setHeader(MQTTConfiguration.MQTT_SUBSCRIBE_TOPIC, topic.toString());
for (MQTTConsumer consumer : consumers) {
consumer.processExchange(exchange);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/621aaa4a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
index 86dad19..59ff90b 100644
--- a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
+++ b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTProducer.java
@@ -48,7 +48,7 @@ public class MQTTProducer extends DefaultAsyncProducer implements Processor {
// where should we publish to
String topicName = configuration.getPublishTopicName();
// get the topic name by using the header of MQTT_PUBLISH_TOPIC
- Object topicValue = exchange.getProperty(MQTTConfiguration.MQTT_PUBLISH_TOPIC);
+ Object topicValue = exchange.getIn().getHeader(MQTTConfiguration.MQTT_PUBLISH_TOPIC);
if (topicValue != null) {
topicName = topicValue.toString();
}