git commit: Upgrade bundle
Repository: camel Updated Branches: refs/heads/master a522c92e4 - feda8de9c Upgrade bundle Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/feda8de9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/feda8de9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/feda8de9 Branch: refs/heads/master Commit: feda8de9cadbdf75e174bf88b2efd28317d4c49f Parents: a522c92 Author: Claus Ibsen davscl...@apache.org Authored: Fri Aug 29 10:33:09 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Fri Aug 29 10:33:09 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/feda8de9/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index f3ae665..bebed05 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -454,7 +454,7 @@ xmlschema-version2.0/xmlschema-version xmlsec-version1.5.6/xmlsec-version xmlunit-version1.5/xmlunit-version -xpp3-bundle-version1.1.4c_6/xpp3-bundle-version +xpp3-bundle-version1.1.4c_7/xpp3-bundle-version xpp3-version1.1.4c/xpp3-version xsdlib-version2013.2/xsdlib-version xstream-bundle-version1.4.7_1/xstream-bundle-version
[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 willem.ji...@gmail.com
Authored: Fri Aug 29 17:19:20 2014 +0800
Committer: Willem Jiang willem.ji...@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 CxfPayloadT {
protected static void addNamespace(Element element, MapString, 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, MapString, 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
[2/4] git commit: CAMEL-7473 CAMEL-7673 Put the topic name into the message header
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 willem.ji...@gmail.com
Authored: Fri Aug 29 14:46:20 2014 +0800
Committer: Willem Jiang willem.ji...@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();
}
[3/4] git commit: CAMEL-7755 Fixed bunch of karaf feature issue
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 willem.ji...@gmail.com
Authored: Fri Aug 29 15:49:16 2014 +0800
Committer: Willem Jiang willem.ji...@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-version4.3.1/avalon-version
avro-version1.7.6/avro-version
avro-bundle-version1.7.6_2/avro-bundle-version
+avro-ipc-bundle-version1.7.6_1/avro-ipc-bundle-version
aws-java-sdk-bundle-version1.8.3_1/aws-java-sdk-bundle-version
aws-java-sdk-version1.8.3/aws-java-sdk-version
axiom-version1.2.14/axiom-version
@@ -105,7 +106,7 @@
commons-lang-version-xmljson2.5/commons-lang-version-xmljson
commons-lang3-version3.1/commons-lang3-version
commons-logging-version1.1.3/commons-logging-version
-commons-math-version2.2/commons-math-version
+commons-math-version3.2/commons-math-version
commons-net-version3.3/commons-net-version
commons-pool-version1.6/commons-pool-version
commons-vfs2-version2.0/commons-vfs2-version
@@ -389,7 +390,7 @@
spring-batch-version2.2.5.RELEASE/spring-batch-version
spring-castor-bundle-version1.2.0/spring-castor-bundle-version
spring-data-commons-version1.5.0.RELEASE/spring-data-commons-version
-spring-data-redis-version1.3.0.RELEASE/spring-data-redis-version
+spring-data-redis-version1.3.4.RELEASE/spring-data-redis-version
spring-integration-version2.2.6.RELEASE/spring-integration-version
spring-javaconfig-version1.0.0-20090215/spring-javaconfig-version
spring-ldap-version1.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
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 willem.ji...@gmail.com
Authored: Fri Aug 29 14:07:58 2014 +0800
Committer: Willem Jiang willem.ji...@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-version2.1.1_1/dnsjava-bundle-version
dom4j-bundle-version1.6.1_5/dom4j-bundle-version
dozer-version5.5.1/dozer-version
-drools-version6.0.1.Final/drools-version
+drools-version6.1.0.Final/drools-version
dropbox-version1.7.6/dropbox-version
easymock-version3.2/easymock-version
eclipse-compiler-version4.2.2/eclipse-compiler-version
@@ -270,7 +270,7 @@
kafka-bundle-version0.8.1_1/kafka-bundle-version
karaf-version2.3.6/karaf-version
karaf3-version3.0.1/karaf3-version
-kie-version6.0.0.Final/kie-version
+kie-version6.1.0.Final/kie-version
krati-version0.4.9/krati-version
kxml2-bundle-version2.3.0_2/kxml2-bundle-version
leveldbjni-version1.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
bundlemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}/bundle
bundlemvn:org.apache.camel/camel-optaplanner/${project.version}/bundle
/feature
[2/2] git commit: CAMEL-7762 Fixed the Camel CxfPayload issue when using namespace with no prefix (xmlns:xmlns)
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/2776fd55
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2776fd55
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2776fd55
Branch: refs/heads/camel-2.12.x
Commit: 2776fd555b52e3e0073f81fab97775c406e541d8
Parents: ad96247
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Aug 29 17:19:20 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Aug 29 17:22:47 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/2776fd55/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 CxfPayloadT {
protected static void addNamespace(Element element, MapString, 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/2776fd55/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 337bf89..97c0274 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
@@ -733,7 +733,11 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
protected static void addNamespace(Element element, MapString, 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/2776fd55/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 e6d9b3d..9b3a8ec 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
[1/2] git commit: CAMEL-7762 Fixed the Camel CxfPayload issue when using namespace with no prefix (xmlns:xmlns)
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x ad9624787 - 2776fd555
refs/heads/camel-2.13.x 4ce44057d - 1c6b76ade
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/1c6b76ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c6b76ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c6b76ad
Branch: refs/heads/camel-2.13.x
Commit: 1c6b76ade9770ee67d454ec7187770f7d4b69e33
Parents: 4ce4405
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Aug 29 17:19:20 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Aug 29 17:22:33 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/1c6b76ad/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 CxfPayloadT {
protected static void addNamespace(Element element, MapString, 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/1c6b76ad/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 4ca79df..ef4c072 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
@@ -731,7 +731,11 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
protected static void addNamespace(Element element, MapString, 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/1c6b76ad/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
git commit: [CAMEL-7763] NettyServerBootstrapConfiguration now provides default SSL settings.
Repository: camel
Updated Branches:
refs/heads/master d62f5120f - 9430e4d55
[CAMEL-7763] NettyServerBootstrapConfiguration now provides default SSL
settings.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9430e4d5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9430e4d5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9430e4d5
Branch: refs/heads/master
Commit: 9430e4d55ae7e91f46c70d7969156767a5f42da4
Parents: d62f512
Author: Henryk Konsek hekon...@gmail.com
Authored: Fri Aug 29 16:04:48 2014 +0200
Committer: Henryk Konsek hekon...@gmail.com
Committed: Fri Aug 29 16:04:48 2014 +0200
--
.../camel/component/netty/NettyServerBootstrapConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9430e4d5/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
--
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
index 666415f..fd0c498 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
@@ -53,8 +53,8 @@ public class NettyServerBootstrapConfiguration implements
Cloneable {
protected File trustStoreFile;
protected String keyStoreResource;
protected String trustStoreResource;
-protected String keyStoreFormat;
-protected String securityProvider;
+protected String keyStoreFormat = JKS;
+protected String securityProvider = SunX509;
protected String passphrase;
protected BossPool bossPool;
protected WorkerPool workerPool;
[CONF] Apache Camel Articles
Claus Ibsen edited the page: Articles ... A bit more meat: Camel applied : JMS to File by Mike McLean Matteo wrote a blog entry about using Camel with iBatis Using the Camel aggregator correctly by Torsten Mielke Spring Remoting with JMS Example on Amin Abbaspour's Weblog Camel routes and HL7 by Roger Searjeant Leverage EIP with Apache Camel and Twitter by Bruno Borges Using RSS with Apache Camel by Jeroen Reijn Axis 2 ride with Camel how to use Axis 2 with Camel by Sagara A Camel based XML payload HTTP polling provider by Christopher Hunt First steps with Apache Camel on Google App Engine by Martin Krasser Camel, CXF and JMS by Example by Silvester van der Bijl A simple file monitoring console with camel, cometd and jquery by Andrej Koelewijn Advanced Event Notification Framework with Apache Camel by Hendy Camel IRC Message Route Example by James Carr A composite REST service using Apache Camel by Andrej Koelewijn EDA events over system boundaries with Camel by Sculptur team blog Dynamic FTP Client using Apache Camel and Spring by Mattias Severson Using Apache Camel to route SOAP calls through message queues by Glen Mazza Virtual ESB - application integration made painless with Apache Camel by Piotr Jagielski Application-Monitoring Statistics-Collection with Apache Camel by Martin Huber Camel exception handling overview by Ben O'Day Remote Observer Pattern with Publish-Subscribe via XMPP by Hendy Implementing Asynchronous Observer Pattern with Bean Proxy by Hendy Apache Camel Example Application - Earthquake Mashups showing how Camel using|\ EIPs can gather online earthquake and weather data and expose REST service. RouteBuilding with inherited configurations by Martin Huber Mathew's Thoughts on Apache Camel shows how Apache Camel easily can route messages from a JMS topic to files using the Content Based Router EIP. More blog posts to come. Transparent Asynchronous Remoting via JMS by Harald Wellman Dynamic Routing Using Health Information Policy with Apache Camel by Edward Brown and Jamie Goodyear Transforming and splitting huge EDI files using Smooks and Camel by Claus Straube
