[3/3] git commit: Merge branch 'CAMEL-7764' of https://github.com/kevinearls/camel
Merge branch 'CAMEL-7764' of https://github.com/kevinearls/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfa4b0af Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfa4b0af Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfa4b0af Branch: refs/heads/master Commit: bfa4b0afe8cae929b2f2d662a4fc40eccbec9fac Parents: 392cc84 a1290c3 Author: Claus Ibsen Authored: Sat Aug 30 08:52:02 2014 +0200 Committer: Claus Ibsen Committed: Sat Aug 30 08:52:02 2014 +0200 -- parent/pom.xml | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/bfa4b0af/parent/pom.xml --
[2/3] git commit: [CAMEL-7755] Fix all karaf feature definitions
[CAMEL-7755] Fix all karaf feature definitions Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/392cc843 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/392cc843 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/392cc843 Branch: refs/heads/master Commit: 392cc8438c875ce6821324a00e829b16bc4d6e63 Parents: 9430e4d Author: Guillaume Nodet Authored: Wed Aug 27 15:21:18 2014 +0200 Committer: Guillaume Nodet Committed: Fri Aug 29 17:35:08 2014 +0200 -- parent/pom.xml | 6 +++-- .../features/src/main/resources/features.xml| 23 2 files changed, 18 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/392cc843/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a2eec91..980d1f0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,7 +106,8 @@ 2.5 3.1 1.1.3 -3.2 +2.2 +3.3 3.3 1.6 2.0 @@ -382,7 +383,7 @@ 3.2.1 1.1.0.1 2.3.0_1 -4.8.9_1 +4.8.1_1 4.8.0 [4.8,5) 2.0.0 @@ -463,6 +464,7 @@ 1.2.5 2.2.0 3.0.0 + 3.0.1_1 3.4.6 http://git-wip-us.apache.org/repos/asf/camel/blob/392cc843/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 acc6ad3..3eb8274 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -164,8 +164,7 @@ camel-core -mvn:com.google.zxing/core/${zxing-version} -mvn:com.google.zxing/javase/${zxing-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.zxing/${zxing-bundle-version} mvn:org.apache.camel/camel-barcode/${project.version} @@ -175,10 +174,10 @@ camel-core mvn:org.apache.camel/camel-box/${project.version} -mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version} -mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version} -wrap:mvn:org.apache.httpcomponents/httpmime-osgi/${httpclient4-version} -wrap:mvn:org.apache.httpcomponents/httpclient-cache-osgi/${httpclient4-version} +wrap:mvn:org.apache.httpcomponents/httpcore/${httpcore4-version}$Export-Package=org.apache.http.*;version=${httpcore4-version} +wrap:mvn:org.apache.httpcomponents/httpclient/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version} +wrap:mvn:org.apache.httpcomponents/httpclient-cache/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version} +wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version} mvn:org.apache.commons/commons-lang3/${commons-lang3-version} mvn:commons-lang/commons-lang/${commons-lang-version} mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version} @@ -187,7 +186,6 @@ mvn:commons-io/commons-io/${commons-io-version} wrap:mvn:net.box/boxjavalibv2/${boxjavalibv2.version} wrap:mvn:net.sourceforge.htmlunit/htmlunit/${htmlunit.version} -wrap:mvn:net.sourceforge.htmlunit/htmlunit-core/${htmlunit.version} wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit.version} wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14 wrap:mvn:org.w3c.css/sac/1.3 @@ -205,6 +203,7 @@ camel-core + transaction mvn:net.sf.ehcache/ehcache/${ehcache-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} mvn:org.apache.camel/camel-cache/${project.version} @@ -430,6 +429,7 @@ camel-core + transaction mvn:com.hazelcast/hazelcast/${hazelcast-version} mvn:org.apache.camel/camel-hazelcast/${project.version} @@ -540,7 +540,7 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/1.7.3_1 mvn:org.apache.commons/commons-compress/${commons-compress-version} -mvn:org.apache.commons/commons-math3/3.1.1 +mvn:org.apache.commons/commons-math3/${commons-math3-version} mvn:commons-cli/commons-cli/1.2 mvn:commons-configuration/commons-configuration/${commons-configuration-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version} @@ -581,6 +581,7 @@ camel-core + transaction mvn:commons-pool/commons-p
[1/3] git commit: Fix for CAMEL-7764. Added a profile for JKD8 with updated jaxb version
Repository: camel Updated Branches: refs/heads/master 9430e4d55 -> bfa4b0afe Fix for CAMEL-7764. Added a profile for JKD8 with updated jaxb version Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1290c39 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1290c39 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1290c39 Branch: refs/heads/master Commit: a1290c39b3d1b93238b975c963ce515cd6e18970 Parents: 9430e4d Author: Kevin Earls Authored: Fri Aug 29 17:07:55 2014 +0200 Committer: Kevin Earls Committed: Fri Aug 29 17:07:55 2014 +0200 -- parent/pom.xml | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a1290c39/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a2eec91..e264451 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2916,6 +2916,24 @@ + + + jdk1.8 + + 1.8 + + + + 2.2.10-b140310.1920 + + + + +com.sun.xml.bind +jaxb-impl + + +
[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
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 Authored: Fri Aug 29 16:04:48 2014 +0200 Committer: Henryk Konsek 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;
[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 Authored: Fri Aug 29 17:19:20 2014 +0800 Committer: Willem Jiang 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 CxfPayload { protected static void addNamespace(Element element, Map 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, Map 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 org.apache.cxf.helpers.CastUtils; import org.apache.cxf.message.At
[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 Authored: Fri Aug 29 17:19:20 2014 +0800 Committer: Willem Jiang 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 CxfPayload { protected static void addNamespace(Element element, Map 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, Map 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 org.apache.cxf.message.MessageImpl; import org.easymock.EasyMock; import org
[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 Authored: Fri Aug 29 15:49:16 2014 +0800 Committer: Willem Jiang 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 @@ 4.3.1 1.7.6 1.7.6_2 +1.7.6_1 1.8.3_1 1.8.3 1.2.14 @@ -105,7 +106,7 @@ 2.5 3.1 1.1.3 -2.2 +3.2 3.3 1.6 2.0 @@ -389,7 +390,7 @@ 2.2.5.RELEASE 1.2.0 1.5.0.RELEASE -1.3.0.RELEASE +1.3.4.RELEASE 2.2.6.RELEASE 1.0.0-20090215 1.3.1.RELEASE 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 @@ mvn:io.netty/netty/${netty3-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version} -mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version} mvn:org.apache.commons/commons-compress/${commons-compress-version} mvn:commons-lang/commons-lang/${commons-lang-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version} @@ -483,7 +483,7 @@ mvn:org.codehaus.jettison/jettison/${jettison-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version} -mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version} +mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version} mvn:javax.jmdns/jmdns/3.4.1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/0.9.0_1 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6
[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 Authored: Fri Aug 29 14:46:20 2014 +0800 Committer: Willem Jiang 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(); }
[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 Authored: Fri Aug 29 17:19:20 2014 +0800 Committer: Willem Jiang 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 { protected static void addNamespace(Element element, Map 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 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
[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 Authored: Fri Aug 29 14:07:58 2014 +0800 Committer: Willem Jiang 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 @@ 2.1.1_1 1.6.1_5 5.5.1 -6.0.1.Final +6.1.0.Final 1.7.6 3.2 4.2.2 @@ -270,7 +270,7 @@ 0.8.1_1 2.3.6 3.0.1 -6.0.0.Final +6.1.0.Final 0.4.9 2.3.0_2 1.8 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 @@ mvn:commons-lang/commons-lang/${commons-lang-version} mvn:commons-io/commons-io/${commons-io-version} mvn:commons-collections/commons-collections/${commons-collections-version} +mvn:org.apache.commons/commons-math3/${commons-math-version} mvn:org.optaplanner/optaplanner-core/${optaplanner-version} mvn:org.kie/kie-api/${kie-version} mvn:org.kie/kie-internal/${kie-version} @@ -900,6 +901,7 @@ mvn:org.mvel/mvel2/${mvel-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version} mvn:com.google.protobuf/protobuf-java/${protobuf-version} +mvn:com.google.guava/guava/${google-guava-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version} mvn:org.apache.camel/camel-optaplanner/${project.version}
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 Authored: Fri Aug 29 10:33:09 2014 +0200 Committer: Claus Ibsen 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 @@ 2.0 1.5.6 1.5 -1.1.4c_6 +1.1.4c_7 1.1.4c 2013.2 1.4.7_1