svn commit: r972283 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache jetty.html

[buildbot]

Author: buildbot
Date: Fri Nov 13 09:22:52 2015
New Revision: 972283

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/jetty.html

Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Fri Nov 13 
09:22:52 2015
@@ -1075,11 +1075,11 @@ template.send(direct:alias-verify&
 ]]>
 See Also
 Configuring 
CamelComponentEndpointGetting StartedCrypto Crypto is also available as a Data Format CXF ComponentWhen using CXF as a consumer, the 
CXF Bean Component allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to cons
 ume web services. The bean component's configuration is also simpler and 
provides the fastest method to implement web services using Camel and 
CXF.When using CXF in streaming modes 
(see DataFormat option), then also read about Stream caching.The 
cxf: component provides integration with http://cxf.apache.org;>Apache CXF for connecting to JAX-WS services 
hosted in CXF./**/
+/*]]>*/
 CXF Component
 URI formatOptions
 The descriptions 
of the dataformats
@@ -5178,7 +5178,7 @@ from(direct:hello)
 .to(jdbc:testdb);
 ]]>
 See 
Also
-Configuring 
CamelComponentEndpointGetting StartedSQL Jetty ComponentThe 
jetty component provides HTTP-based endpoints for consuming and producing HTTP requests. 
That is, the Jetty component behaves as a simple Web server. 
Jetty can also be used as a http client which mean you can also use it with 
Camel as a producer.StreamJetty is stream based, which means the input it receives is submitted 
to Camel as a stream. That means you will only be able to read the content of 
the stream once.If you find a situation where 
the message body appears to be empty or you need to access the 
Exchange.HTTP_RESPONSE_CODE data multiple times (e.g.: doing multicasting, or 
redelivery error handling), you should use Stream caching or convert the message body to a 
String which is safe to be re-read multiple 
times.Maven users will need to add the following dependency 
to their pom.xml for this component:
+Configuring 
CamelComponentEndpointGetting StartedSQL Jetty ComponentThe 
jetty component provides HTTP-based endpoints for consuming and producing HTTP requests. 
That is, the Jetty component behaves as a simple Web server. 
Jetty can also be used as a http client which mean you can also use it with 
Camel as a producer.StreamTheassertcall appears in this example, because the code is part of an 
unit test.Jetty is stream based, which means the input it receives is 
submitted to Camel as a stream. That means you will only be able to read the 
content of the stream once.If you find a 
situation where the message body appears to be empty or you need to access the 
Exchange.HTTP_RESPONSE_CODE data multiple times (e.g.: doing multicasting, or 
redelivery error handling), you should use Stream caching or convert the message body to a 
String which is safe to be re-read multiple 
times.Maven users will need to add the following dependency 
to their pom.xml for this component:
 http://www.google.com"/>;
 <route>
 ]]>
-Consumer 
ExampleIn this sample we define a route that exposes a HTTP service at 
http://localhost:8080/myapp/myservice; 
rel="nofollow">http://localhost:8080/myapp/myservice:Error formatting macro: snippet: 
java.lang.IndexOutOfBoundsException: Index: 20, Size: 20 Usage of localhostWhen you specify 
localhost in a URL, Camel exposes the endpoint only on the local 
TCP/IP network interface, so it cannot be accessed from outside the machine it 
operates on.If you need to expose a Jetty endpoint on a specific network 
interface, the numerical IP addr
 ess of this interface should be used as the host. If you need to expose a 
Jetty endpoint on all network interfaces, the 0.0.0.0 address 
should be used.To listen across an entire URI 
prefix, see How 

camel git commit: Upgrade Joda-Time to version 2.9.1

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 169463371 -> 74eda663a


Upgrade Joda-Time to version 2.9.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74eda663
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74eda663
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74eda663

Branch: refs/heads/master
Commit: 74eda663a5b7bce4200753860d71a25ce52f8048
Parents: 1694633
Author: Andrea Cosentino 
Authored: Fri Nov 13 17:15:34 2015 +0100
Committer: Andrea Cosentino 
Committed: Fri Nov 13 17:15:34 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74eda663/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9923f74..68b6e05 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -290,7 +290,7 @@
 2.13
 1.5
 1.6.2
-2.9
+2.9.1
 1.3.2
 0.0.16
 0.0.16_1

[2/2] camel git commit: CAMEL-9321: Blueprint example and archetype does not work when executed with camel:run

[davsclaus]

CAMEL-9321: Blueprint example and archetype does not work when executed with 
camel:run


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6a6ef86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6a6ef86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6a6ef86

Branch: refs/heads/camel-2.16.x
Commit: e6a6ef86fa6fb577bfd8e288d1b62ce05c9f09a6
Parents: 15ec218
Author: Antonin Stefanutti 
Authored: Fri Nov 13 15:53:35 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 16:02:03 2015 +0100

--
 .../src/main/java/org/apache/camel/maven/RunMojo.java | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6a6ef86/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index dcf39e1..a3b3b46 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -747,13 +747,6 @@ public class RunMojo extends AbstractExecMojo {
 Set deps = 
resolveExecutableDependencies(artifact, true);
 if (deps != null) {
 for (Artifact dep : deps) {
-
-// we must skip org.apache.aries.blueprint.core:, 
otherwise we get duplicate blueprint extenders
-if 
(dep.getArtifactId().equals("org.apache.aries.blueprint.core")) {
-getLog().debug("Skipping 
org.apache.aries.blueprint.core -> " + dep.getGroupId() + "/" + 
dep.getArtifactId() + "/" + dep.getVersion());
-continue;
-}
-
 // we skip test scoped
 if ("test".equals(dep.getScope())) {
 getLog().debug("Skipping test scoped -> " + 
dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());

svn commit: r972308 - in /websites/production/camel/content: cache/main.pageCache rabbitmq.html

[buildbot]

Author: buildbot
Date: Fri Nov 13 15:18:45 2015
New Revision: 972308

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/rabbitmq.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/rabbitmq.html
==
--- websites/production/camel/content/rabbitmq.html (original)
+++ websites/production/camel/content/rabbitmq.html Fri Nov 13 15:18:45 2015
@@ -96,7 +96,7 @@
 URI format
 
-Where hostname is the hostname of the running 
rabbitmq instance or cluster. Port is optional and if not specified then 
defaults to the RabbitMQ client default (5672). The exchange name determines 
which exchange produced messages will sent to. In the case of consumers, the 
exchange name determines which exchange the queue will bind to.OptionsPropertyDefaultDescriptionautoAcktrueIf messages should be auto 
acknowledged<
 td colspan="1" rowspan="1" 
class="confluenceTd">autoDeletetrueIf it is true, the exchange will be deleted 
when it is no longer in usedurabletrueIf we are declaring a durable exchange (the 
exchange will survive a server restart)queuerandom uuidThe queue to receive messages 
fromroutingKeynullThe routing key to use when binding a consumer queue to 
the exchange. For producer routing keys, you set the header (see header 
section)threadPoolSize10The consumer uses a Thread Pool Executor 
with a fixed number of threads. This setting allows you to set that number of 
threads.usernamenullusername in case of authenticated 
accesspasswordnullpassword for authenticated accessvhost/the vhost for the 
channelexchangeTypedirectCamel 2.12.2: The exchange 
type such as direct or topic.bridgeEndpointfalseCamel 2.12.3: If the 
bridgeEndpoint is true, the prod
 ucer will ignore the message header of "rabbitmq.EXCHANGE_NAME" and 
"rabbitmq.ROUTING_KEY"addressesnullCamel 2.12.3: If this 
option is set, camel-rabbitmq will try to create connection based on the 
setting of option addresses. The addresses value is a string which looks like 
"server1:12345, server2:12345"connectionTimeout0Camel 2.14: Connection 
timeoutrequestedChannelMax0Camel 2.14: Connection 
requested channel max (max number of channels offered)requestedFrameMax0Camel 2.14: Connection requested frame 
max (max size of frame offered)requestedHeartbeat0Camel 2.14: Connection requested 
heartbeat (heart-beat in seconds offered)sslProtocolnullCamel 2.14:
  Enables SSL on connection, accepted value are `true`, `TLS` and 
'SSLv3`trustManagernullCamel 2.14: Configure SSL trust 
manager, SSL should be enabled for this option to be 
effectiveclientPropertiesnullCamel 2.14: Connection client 
properties (client info used in negotiating with the 
server)connectionFactorynullCamel 2.14: Custom RabbitMQ connection factory. When this option is set, all connection 
options (connectionTimeout, requestedChannelMax...) set on URI are not 
usedautomaticRecoveryEnabledfalseCamel 2.14: Enables 
connection automatic recovery (uses connection implementation that performs 
automatic recovery when connection shutdown is not initiated by the 
application)networkRecoveryInterval5000Camel 2.14: Network 
recoverty interval in milliseconds (interval used when recovering from network 
failure)topologyRecoveryEnabledtrueCamel 2.14: Enables connection 
topology recovery (should topology recovery be performed?)prefetchEnabledfalseCamel 2.14: Enables the quality of 
service on the RabbitMQConsumer side, you need to specify the option of 
prefetchSize, prefetchCount, 
prefetchGlobal at the same timeprefetchSize0Camel 2.14: The maximum 
 amount of content (measured in octets) that the server will deliver, 0 if 
unlimited.prefetchCount0Camel 2.14: The maximum number of 
messages that the server will deliver, 0 if unlimited.prefetchGlobalfalseCamel 2.14: If the settings should be 
applied to the entire channel rather than each consumerdeclaretrueCamel 2.14: If the option is 
true, came
 l declare the exchange and queue name and bind them together. If the option is 
false, camel won't declare the exchange and queue name on the 
server.concurrentConsumers1Camel 2.14: Number of 
concurrent consumers when consuming from broker. (eg similar as to the same 
option for the JMS 
component).deadLetterRoutingKeyCamel 2.14: The routing 
key for the dead letter exchangedeadLetterExchangeCamel 2.14: The name of the dead 
letter exchangedeadLetterExchangeTypedirectCamel 2.14: The type of 
the dead letter exchangechannelPoolMaxSize10Camel 2.14.1: (Producer 
only) Maximum number of channels used to send 
messageschannelPoolMaxWait1000Camel 2.14.1: (Producer only) 
Maximum time (in milliseconds) waiting for a 

camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 324c2370d -> 59b54c679


CAMEL-9311: Fix concurrency when using @DynamicRouter


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59b54c67
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59b54c67
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59b54c67

Branch: refs/heads/camel-2.16.x
Commit: 59b54c67909f215fd41bb0ee3ba66a8968195563
Parents: 324c237
Author: Gert Vanthienen 
Authored: Fri Nov 13 15:41:08 2015 +0100
Committer: Gert Vanthienen 
Committed: Fri Nov 13 17:22:56 2015 +0100

--
 .../apache/camel/processor/DynamicRouter.java   |  2 +-
 .../org/apache/camel/processor/RoutingSlip.java | 14 ++--
 .../DynamicRouterConcurrentPOJOTest.java| 77 
 3 files changed, 85 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/59b54c67/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java 
b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
index 0e1c117..565c64e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
@@ -43,7 +43,7 @@ public class DynamicRouter extends RoutingSlip {
 }
 
 @Override
-protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange) 
throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, 
Expression expression) throws Exception {
 return new DynamicRoutingSlipIterator(expression);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/59b54c67/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java 
b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index c20742c..c684593 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -183,25 +183,25 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 return true;
 }
 
-return doRoutingSlip(exchange, callback);
+return doRoutingSlipWithExpression(exchange, this.expression, 
callback);
 }
 
 public boolean doRoutingSlip(Exchange exchange, Object routingSlip, 
AsyncCallback callback) {
 if (routingSlip instanceof Expression) {
-this.expression = (Expression) routingSlip;
+return doRoutingSlipWithExpression(exchange, (Expression) 
routingSlip, callback);
 } else {
-this.expression = 
ExpressionBuilder.constantExpression(routingSlip);
+return doRoutingSlipWithExpression(exchange, 
ExpressionBuilder.constantExpression(routingSlip), callback);
 }
-return doRoutingSlip(exchange, callback);
 }
 
 /**
  * Creates the route slip iterator to be used.
  *
  * @param exchange the exchange
+ * @param expression the expression
  * @return the iterator, should never be null
  */
-protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange) throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange, final Expression expression) throws Exception {
 Object slip = expression.evaluate(exchange, Object.class);
 if (exchange.getException() != null) {
 // force any exceptions occurred during evaluation to be thrown
@@ -221,11 +221,11 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 };
 }
 
-private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback 
callback) {
+private boolean doRoutingSlipWithExpression(final Exchange exchange, final 
Expression expression, final AsyncCallback callback) {
 Exchange current = exchange;
 RoutingSlipIterator iter;
 try {
-iter = createRoutingSlipIterator(exchange);
+iter = createRoutingSlipIterator(exchange, expression);
 } catch (Exception e) {
 exchange.setException(e);
 callback.done(true);

http://git-wip-us.apache.org/repos/asf/camel/blob/59b54c67/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 

[3/4] camel git commit: CAMEL-9283: Data Format for MIME-Multipart. Thanks to Stephan Siano for the patch.

[davsclaus]

CAMEL-9283: Data Format for MIME-Multipart. Thanks to Stephan Siano for the 
patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08aa98f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08aa98f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08aa98f8

Branch: refs/heads/master
Commit: 08aa98f8bc771b7edf2a51978c94835d0cd3624c
Parents: 74eda66
Author: Claus Ibsen 
Authored: Fri Nov 13 16:39:58 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:35:02 2015 +0100

--
 .../apache/camel/builder/DataFormatClause.java  |  63 -
 .../model/dataformat/DataFormatsDefinition.java |   1 +
 .../dataformat/MimeMultipartDataFormat.java | 124 +
 .../apache/camel/model/dataformat/jaxb.index|   1 +
 components/camel-mail/pom.xml   |   5 +-
 .../mime/multipart/MimeMultipartDataFormat.java | 241 
 .../org/apache/camel/dataformat/mime-multipart  |  18 ++
 .../multipart/MimeMultipartDataFormatTest.java  | 275 +++
 8 files changed, 724 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/08aa98f8/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 9495f4c..689ef1f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -20,8 +20,6 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
-import org.w3c.dom.Node;
-
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -41,6 +39,7 @@ import org.apache.camel.model.dataformat.JaxbDataFormat;
 import org.apache.camel.model.dataformat.JibxDataFormat;
 import org.apache.camel.model.dataformat.JsonDataFormat;
 import org.apache.camel.model.dataformat.JsonLibrary;
+import org.apache.camel.model.dataformat.MimeMultipartDataFormat;
 import org.apache.camel.model.dataformat.PGPDataFormat;
 import org.apache.camel.model.dataformat.ProtobufDataFormat;
 import org.apache.camel.model.dataformat.RssDataFormat;
@@ -57,6 +56,7 @@ import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}
@@ -272,6 +272,65 @@ public class DataFormatClause> {
 }
 
 /**
+ * Uses the MIME Multipart data format
+ */
+public T mimeMultipart() {
+MimeMultipartDataFormat mm = new MimeMultipartDataFormat();
+return dataFormat(mm);
+}
+
+/**
+ * Uses the MIME Multipart data format
+ *
+ * @param multipartSubType Specifies the subtype of the MIME Multipart
+ */
+public T mimeMultipart(String multipartSubType) {
+MimeMultipartDataFormat mm = new MimeMultipartDataFormat();
+mm.setMultipartSubType(multipartSubType);
+return dataFormat(mm);
+}
+
+/**
+ * Uses the MIME Multipart data format
+ *
+ * @param multipartSubType   the subtype of the MIME Multipart
+ * @param multipartWithoutAttachment defines whether a message without 
attachment is also marshaled
+ *   into a MIME Multipart (with only one 
body part).
+ * @param headersInline  define the MIME Multipart headers as 
part of the message body
+ *   or as Camel headers
+ * @param binaryContent  have binary encoding for binary 
content (true) or use Base-64
+ *   encoding for binary content (false)
+ */
+public T mimeMultipart(String multipartSubType, boolean 
multipartWithoutAttachment, boolean headersInline,
+   boolean binaryContent) {
+MimeMultipartDataFormat mm = new MimeMultipartDataFormat();
+mm.setMultipartSubType(multipartSubType);
+mm.setMultipartWithoutAttachment(multipartWithoutAttachment);
+mm.setHeadersInline(headersInline);
+mm.setBinaryContent(binaryContent);
+return dataFormat(mm);
+}
+
+/**
+ * Uses the MIME Multipart data format
+ *
+ * @param multipartWithoutAttachment defines whether a message without 
attachment is also 

[1/4] camel git commit: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 59b54c679 -> b2ce0f990
  refs/heads/master 74eda663a -> 7fb7b5641


Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7fb7b564
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7fb7b564
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7fb7b564

Branch: refs/heads/master
Commit: 7fb7b56413a625ea80830b3a930a7182d13a1565
Parents: 86d08e2
Author: Claus Ibsen 
Authored: Fri Nov 13 17:34:54 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:35:02 2015 +0100

--
 .../src/main/java/org/apache/camel/builder/DataFormatClause.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7fb7b564/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 689ef1f..c80f45d 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -20,6 +20,8 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -56,7 +58,6 @@ import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
-import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}

[2/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86d08e2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86d08e2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86d08e2b

Branch: refs/heads/master
Commit: 86d08e2b4c762fb4e2753807abf2603d0a09bbe0
Parents: 08aa98f
Author: Claus Ibsen 
Authored: Fri Nov 13 17:33:46 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:35:02 2015 +0100

--
 .../dynamicrouter/DynamicRouterConcurrentPOJOTest.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/86d08e2b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
index eb6db04..776c801 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.processor.dynamicrouter;
 
-import org.apache.camel.*;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.DynamicRouter;
+import org.apache.camel.Exchange;
+import org.apache.camel.Header;
 import org.apache.camel.builder.RouteBuilder;
 
 public class DynamicRouterConcurrentPOJOTest extends ContextTestSupport {

[4/4] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b2ce0f99
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b2ce0f99
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b2ce0f99

Branch: refs/heads/camel-2.16.x
Commit: b2ce0f99032fc8b9f26c97370ce8a794006e2135
Parents: 59b54c6
Author: Claus Ibsen 
Authored: Fri Nov 13 17:33:46 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:35:51 2015 +0100

--
 .../dynamicrouter/DynamicRouterConcurrentPOJOTest.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b2ce0f99/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
index eb6db04..776c801 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.processor.dynamicrouter;
 
-import org.apache.camel.*;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.DynamicRouter;
+import org.apache.camel.Exchange;
+import org.apache.camel.Header;
 import org.apache.camel.builder.RouteBuilder;
 
 public class DynamicRouterConcurrentPOJOTest extends ContextTestSupport {

[1/2] camel git commit: CAMEL-8302: Added producer label to skipQueueDeclare flag

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x b2ce0f990 -> e57e05dd3
  refs/heads/master 7fb7b5641 -> 74cb9db8e


CAMEL-8302: Added producer label to skipQueueDeclare flag


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74cb9db8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74cb9db8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74cb9db8

Branch: refs/heads/master
Commit: 74cb9db8e3e6c48cc88c2aad64c47f9f1c72fcc4
Parents: 7fb7b56
Author: davidwilliams 
Authored: Fri Nov 13 11:29:39 2015 -0500
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:36:57 2015 +0100

--
 .../java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74cb9db8/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 7735a86..bcf0e7f 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -95,7 +95,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 private String exchangeType = "direct";
 @UriParam
 private String routingKey;
-@UriParam
+@UriParam(label = "producer")
 private boolean skipQueueDeclare;
 @UriParam
 private Address[] addresses;

[2/2] camel git commit: CAMEL-8302: Added producer label to skipQueueDeclare flag

[davsclaus]

CAMEL-8302: Added producer label to skipQueueDeclare flag


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e57e05dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e57e05dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e57e05dd

Branch: refs/heads/camel-2.16.x
Commit: e57e05dd3052f6ef989e509aa973133f7325951c
Parents: b2ce0f9
Author: davidwilliams 
Authored: Fri Nov 13 11:29:39 2015 -0500
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:37:09 2015 +0100

--
 .../java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e57e05dd/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 7735a86..bcf0e7f 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -95,7 +95,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 private String exchangeType = "direct";
 @UriParam
 private String routingKey;
-@UriParam
+@UriParam(label = "producer")
 private boolean skipQueueDeclare;
 @UriParam
 private Address[] addresses;

[2/2] camel git commit: Better resolution of CDI / Blueprint and plugin transitive dependencies

[davsclaus]

Better resolution of CDI / Blueprint and plugin transitive dependencies


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/910b517f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/910b517f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/910b517f

Branch: refs/heads/camel-2.16.x
Commit: 910b517fcd9ab51f64e8b8a768a2b25548328ff2
Parents: b3bd4cd
Author: Antonin Stefanutti 
Authored: Fri Nov 13 15:03:04 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:43:39 2015 +0100

--
 .../main/java/org/apache/camel/maven/RunMojo.java  | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/910b517f/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index a3b3b46..9b6c064 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -34,6 +34,7 @@ import java.util.Set;
 
 import org.apache.camel.util.CastUtils;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -41,6 +42,7 @@ import 
org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.model.Dependency;
@@ -747,16 +749,6 @@ public class RunMojo extends AbstractExecMojo {
 Set deps = 
resolveExecutableDependencies(artifact, true);
 if (deps != null) {
 for (Artifact dep : deps) {
-// we skip test scoped
-if ("test".equals(dep.getScope())) {
-getLog().debug("Skipping test scoped -> " + 
dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());
-continue;
-}
-if ("provided".equals(dep.getScope())) {
-getLog().debug("Skipping provided scoped -> " 
+ dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());
-continue;
-}
-
 getLog().debug("Adding extra plugin dependency 
artifact: " + dep.getArtifactId()
 + " to classpath");
 path.add(dep.getFile().toURI().toURL());
@@ -959,14 +951,13 @@ public class RunMojo extends AbstractExecMojo {
 // not forgetting the Artifact of the project itself
 dependencyArtifacts.add(executableProject.getArtifact());
 
-// resolve all dependencies transitively to obtain a comprehensive
-// list of assemblies
+// resolve runtime dependencies transitively to obtain a 
comprehensive list of assemblies
 ArtifactResolutionResult result = 
artifactResolver.resolveTransitively(dependencyArtifacts,

executablePomArtifact,

Collections.emptyMap(),

this.localRepository,

this.remoteRepositories,
-   
metadataSource, null,
+   
metadataSource, new ScopeArtifactFilter(DefaultArtifact.SCOPE_RUNTIME),

Collections.emptyList());
 executableDependencies = CastUtils.cast(result.getArtifacts());
 

[1/2] camel git commit: CAMEL-9321: Blueprint example and archetype does not work when executed with camel:run

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 15ec21887 -> e6a6ef86f
  refs/heads/master 13c0a110e -> 6ff0d39e7


CAMEL-9321: Blueprint example and archetype does not work when executed with 
camel:run


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ff0d39e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ff0d39e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ff0d39e

Branch: refs/heads/master
Commit: 6ff0d39e76282047ec8e772352b5c38d792fde78
Parents: 13c0a11
Author: Antonin Stefanutti 
Authored: Fri Nov 13 15:53:35 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 16:01:26 2015 +0100

--
 .../src/main/java/org/apache/camel/maven/RunMojo.java | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6ff0d39e/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index dcf39e1..a3b3b46 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -747,13 +747,6 @@ public class RunMojo extends AbstractExecMojo {
 Set deps = 
resolveExecutableDependencies(artifact, true);
 if (deps != null) {
 for (Artifact dep : deps) {
-
-// we must skip org.apache.aries.blueprint.core:, 
otherwise we get duplicate blueprint extenders
-if 
(dep.getArtifactId().equals("org.apache.aries.blueprint.core")) {
-getLog().debug("Skipping 
org.apache.aries.blueprint.core -> " + dep.getGroupId() + "/" + 
dep.getArtifactId() + "/" + dep.getVersion());
-continue;
-}
-
 // we skip test scoped
 if ("test".equals(dep.getScope())) {
 getLog().debug("Skipping test scoped -> " + 
dep.getGroupId() + "/" + dep.getArtifactId() + "/" + dep.getVersion());

[2/2] camel git commit: camel-test-blueprint dependency is not required by the Camel Maven plugin

[davsclaus]

camel-test-blueprint dependency is not required by the Camel Maven plugin


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3bd4cd8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3bd4cd8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3bd4cd8

Branch: refs/heads/camel-2.16.x
Commit: b3bd4cd81efb65b72258beb2e61bb5ee3cd879ee
Parents: e57e05d
Author: Antonin Stefanutti 
Authored: Fri Nov 13 16:28:02 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:40:20 2015 +0100

--
 .../src/main/resources/archetype-resources/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b3bd4cd8/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index 25f8ba6..ed487f5 100644
--- 
a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -60,7 +60,7 @@
   ${log4j-version}
 
 
-
+
 
   org.apache.camel
   camel-test-blueprint

[1/2] camel git commit: camel-test-blueprint dependency is not required by the Camel Maven plugin

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x e57e05dd3 -> b3bd4cd81
  refs/heads/master 035d60eff -> 6e3210913


camel-test-blueprint dependency is not required by the Camel Maven plugin


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e321091
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e321091
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e321091

Branch: refs/heads/master
Commit: 6e3210913d47dfe701fe2ff3552aa1a7199d07e6
Parents: 035d60e
Author: Antonin Stefanutti 
Authored: Fri Nov 13 16:28:02 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 17:40:10 2015 +0100

--
 .../src/main/resources/archetype-resources/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6e321091/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
index 25f8ba6..ed487f5 100644
--- 
a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
@@ -60,7 +60,7 @@
   ${log4j-version}
 
 
-
+
 
   org.apache.camel
   camel-test-blueprint

[3/4] camel git commit: CAMEL-8302: Added skipQueueDeclare flag to camel-rabbitmq

[davsclaus]

CAMEL-8302: Added skipQueueDeclare flag to camel-rabbitmq


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73584d28
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73584d28
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73584d28

Branch: refs/heads/camel-2.16.x
Commit: 73584d289a6d6ee62cf60053512a0c534d9c6832
Parents: e6a6ef8
Author: davidwilliams 
Authored: Wed Nov 11 14:11:36 2015 -0500
Committer: Claus Ibsen 
Committed: Fri Nov 13 16:12:02 2015 +0100

--
 .../camel/component/rabbitmq/RabbitMQEndpoint.java  | 16 +++-
 .../component/rabbitmq/RabbitMQEndpointTest.java|  6 ++
 2 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/73584d28/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 50aebd2..ff57d7b 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -95,6 +95,8 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 private String exchangeType = "direct";
 @UriParam
 private String routingKey;
+@UriParam(defaultValue = "false")
+private boolean skipQueueDeclare = false;
 @UriParam
 private Address[] addresses;
 @UriParam(defaultValue = "" + ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT)
@@ -369,7 +371,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 getExchangeType(),
 isDurable(),
 isAutoDelete(), exchangeArgs);
-if (getQueue() != null) {
+if (!isSkipQueueDeclare() && getQueue() != null) {
 // need to make sure the queueDeclare is same with the exchange 
declare
 channel.queueDeclare(getQueue(), isDurable(), false,
 isAutoDelete(), queueArgs);
@@ -588,6 +590,18 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 }
 
 /**
+ * If true the producer will not declare and bind a queue.
+ * This can be used for directing messages via an existing routing key.
+ */
+public void setSkipQueueDeclare(boolean skipQueueDeclare) {
+this.skipQueueDeclare = skipQueueDeclare;
+}
+
+public boolean isSkipQueueDeclare() {
+return skipQueueDeclare;
+}
+
+/**
  * If the bridgeEndpoint is true, the producer will ignore the message 
header of "rabbitmq.EXCHANGE_NAME" and "rabbitmq.ROUTING_KEY"
  */
 public void setBridgeEndpoint(boolean bridgeEndpoint) {

http://git-wip-us.apache.org/repos/asf/camel/blob/73584d28/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
--
diff --git 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index ad9aca8..a3290c9 100644
--- 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++ 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -248,4 +248,10 @@ public class RabbitMQEndpointTest extends CamelTestSupport 
{
 RabbitMQEndpoint endpoint = 
context.getEndpoint("rabbitmq:localhost/exchange?requestTimeoutCheckerInterval=1000",
 RabbitMQEndpoint.class);
 assertEquals(1000, endpoint.getRequestTimeoutCheckerInterval());
 }
+
+@Test
+public void createEndpointWithSkipQueueDeclareEnabled() throws Exception {
+RabbitMQEndpoint endpoint = 
context.getEndpoint("rabbitmq:localhost/exchange?skipQueueDeclare=true", 
RabbitMQEndpoint.class);
+assertTrue(endpoint.isSkipQueueDeclare());
+}
 }

[1/4] camel git commit: CAMEL-8302: Added skipQueueDeclare flag to camel-rabbitmq

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x e6a6ef86f -> 324c2370d
  refs/heads/master 6ff0d39e7 -> 169463371


CAMEL-8302: Added skipQueueDeclare flag to camel-rabbitmq


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1f91ea78
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1f91ea78
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1f91ea78

Branch: refs/heads/master
Commit: 1f91ea7820f85cf968bde650bf5f9721e0fb7799
Parents: 6ff0d39
Author: davidwilliams 
Authored: Wed Nov 11 14:11:36 2015 -0500
Committer: Claus Ibsen 
Committed: Fri Nov 13 16:08:47 2015 +0100

--
 .../camel/component/rabbitmq/RabbitMQEndpoint.java  | 16 +++-
 .../component/rabbitmq/RabbitMQEndpointTest.java|  6 ++
 2 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f91ea78/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
--
diff --git 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 50aebd2..ff57d7b 100644
--- 
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ 
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -95,6 +95,8 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 private String exchangeType = "direct";
 @UriParam
 private String routingKey;
+@UriParam(defaultValue = "false")
+private boolean skipQueueDeclare = false;
 @UriParam
 private Address[] addresses;
 @UriParam(defaultValue = "" + ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT)
@@ -369,7 +371,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 getExchangeType(),
 isDurable(),
 isAutoDelete(), exchangeArgs);
-if (getQueue() != null) {
+if (!isSkipQueueDeclare() && getQueue() != null) {
 // need to make sure the queueDeclare is same with the exchange 
declare
 channel.queueDeclare(getQueue(), isDurable(), false,
 isAutoDelete(), queueArgs);
@@ -588,6 +590,18 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
 }
 
 /**
+ * If true the producer will not declare and bind a queue.
+ * This can be used for directing messages via an existing routing key.
+ */
+public void setSkipQueueDeclare(boolean skipQueueDeclare) {
+this.skipQueueDeclare = skipQueueDeclare;
+}
+
+public boolean isSkipQueueDeclare() {
+return skipQueueDeclare;
+}
+
+/**
  * If the bridgeEndpoint is true, the producer will ignore the message 
header of "rabbitmq.EXCHANGE_NAME" and "rabbitmq.ROUTING_KEY"
  */
 public void setBridgeEndpoint(boolean bridgeEndpoint) {

http://git-wip-us.apache.org/repos/asf/camel/blob/1f91ea78/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
--
diff --git 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index ad9aca8..a3290c9 100644
--- 
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++ 
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -248,4 +248,10 @@ public class RabbitMQEndpointTest extends CamelTestSupport 
{
 RabbitMQEndpoint endpoint = 
context.getEndpoint("rabbitmq:localhost/exchange?requestTimeoutCheckerInterval=1000",
 RabbitMQEndpoint.class);
 assertEquals(1000, endpoint.getRequestTimeoutCheckerInterval());
 }
+
+@Test
+public void createEndpointWithSkipQueueDeclareEnabled() throws Exception {
+RabbitMQEndpoint endpoint = 
context.getEndpoint("rabbitmq:localhost/exchange?skipQueueDeclare=true", 
RabbitMQEndpoint.class);
+assertTrue(endpoint.isSkipQueueDeclare());
+}
 }

camel git commit: Upgrade MongoDB Java Driver to version 3.1.1

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 74cb9db8e -> 035d60eff


Upgrade MongoDB Java Driver to version 3.1.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/035d60ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/035d60ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/035d60ef

Branch: refs/heads/master
Commit: 035d60eff97c1445a6584a4ae78fbc0c57696fea
Parents: 74cb9db
Author: Andrea Cosentino 
Authored: Fri Nov 13 17:30:57 2015 +0100
Committer: Andrea Cosentino 
Committed: Fri Nov 13 17:34:15 2015 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/035d60ef/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 68b6e05..6ca6c82 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -375,7 +375,7 @@
 0.9.4
 1.9
 1.9.5
-3.1.0
+3.1.1
 1.12
 2013.6.1
 0.8.18

camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter

[gertv]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x f07a33c46 -> 61ad899b6


CAMEL-9311: Fix concurrency when using @DynamicRouter


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61ad899b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61ad899b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61ad899b

Branch: refs/heads/camel-2.15.x
Commit: 61ad899b648918734014d52054915bbdf8a0b0ec
Parents: f07a33c
Author: Gert Vanthienen 
Authored: Fri Nov 13 15:41:08 2015 +0100
Committer: Gert Vanthienen 
Committed: Fri Nov 13 19:30:56 2015 +0100

--
 .../apache/camel/processor/DynamicRouter.java   |  2 +-
 .../org/apache/camel/processor/RoutingSlip.java | 14 ++--
 .../DynamicRouterConcurrentPOJOTest.java| 77 
 3 files changed, 85 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/61ad899b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java 
b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
index 0e1c117..565c64e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
@@ -43,7 +43,7 @@ public class DynamicRouter extends RoutingSlip {
 }
 
 @Override
-protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange) 
throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, 
Expression expression) throws Exception {
 return new DynamicRoutingSlipIterator(expression);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/61ad899b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java 
b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 00625d6..483e1f7 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -143,25 +143,25 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 return true;
 }
 
-return doRoutingSlip(exchange, callback);
+return doRoutingSlipWithExpression(exchange, this.expression, 
callback);
 }
 
 public boolean doRoutingSlip(Exchange exchange, Object routingSlip, 
AsyncCallback callback) {
 if (routingSlip instanceof Expression) {
-this.expression = (Expression) routingSlip;
+return doRoutingSlipWithExpression(exchange, (Expression) 
routingSlip, callback);
 } else {
-this.expression = 
ExpressionBuilder.constantExpression(routingSlip);
+return doRoutingSlipWithExpression(exchange, 
ExpressionBuilder.constantExpression(routingSlip), callback);
 }
-return doRoutingSlip(exchange, callback);
 }
 
 /**
  * Creates the route slip iterator to be used.
  *
  * @param exchange the exchange
+ * @param expression the expression
  * @return the iterator, should never be null
  */
-protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange) throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange, final Expression expression) throws Exception {
 Object slip = expression.evaluate(exchange, Object.class);
 if (exchange.getException() != null) {
 // force any exceptions occurred during evaluation to be thrown
@@ -181,11 +181,11 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 };
 }
 
-private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback 
callback) {
+private boolean doRoutingSlipWithExpression(final Exchange exchange, final 
Expression expression, final AsyncCallback callback) {
 Exchange current = exchange;
 RoutingSlipIterator iter;
 try {
-iter = createRoutingSlipIterator(exchange);
+iter = createRoutingSlipIterator(exchange, expression);
 } catch (Exception e) {
 exchange.setException(e);
 callback.done(true);

http://git-wip-us.apache.org/repos/asf/camel/blob/61ad899b/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 

[1/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.1

[gzurowski]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 910b517fc -> 2b69b9d32


http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index d15fba3..2cfc1c3 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index 3a8f859..98f34c2 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index f757ed5..4af64db 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index d054768..b9b7567 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index c4460fd..059ba8f 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index 998e55e..3802b0f 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 7ad3249..6b783b7 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.1-SNAPSHOT
+2.16.1
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index e902f8f..45951ef 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git 

[2/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.1

[gzurowski]

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 9321bbc..aac7886 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 532a608a..abc2eed 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index efff95b..f7c35ce 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index b0519d7..7f393c5 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index da3dcb7..2df23b0 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index a71e936..8f532df 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 8489188..3a99d71 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.1-SNAPSHOT
+2.16.1
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 64c58bd..6f72bc9 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.1-SNAPSHOT
+2.16.1
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 05f2e59..296b51f 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.1-SNAPSHOT
+2.16.1
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/2b69b9d3/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index 20e3328..1c7086d 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.1-SNAPSHOT
+2.16.1
   
 
   

[2/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[gzurowski]

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-jxpath/pom.xml
--
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index aac7886..478b8b3 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
   
 
   camel-jxpath

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-kafka/pom.xml
--
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index abc2eed..883a860 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
   
 
   camel-kafka

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-kestrel/pom.xml
--
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index f7c35ce..66aafbd 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-kestrel

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-krati/pom.xml
--
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index 7f393c5..fe634fb 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-krati

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 2df23b0..4eae3a2 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 8f532df..8539c65 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 3a99d71..ba62933 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 6f72bc9..c3df531 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.1
+2.16.2-SNAPSHOT
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 296b51f..584e1a8 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.16.1
+2.16.2-SNAPSHOT
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index 1c7086d..aa99243 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.16.1
+2.16.2-SNAPSHOT
   
 
   

[1/3] camel git commit: [maven-release-plugin] prepare for next development iteration

[gzurowski]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 2b69b9d32 -> b1404582b


http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-reportincident/pom.xml
--
diff --git a/examples/camel-example-reportincident/pom.xml 
b/examples/camel-example-reportincident/pom.xml
index 2cfc1c3..d19b617 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-example-reportincident

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-restlet-jdbc/pom.xml
--
diff --git a/examples/camel-example-restlet-jdbc/pom.xml 
b/examples/camel-example-restlet-jdbc/pom.xml
index 98f34c2..7d5c79d 100755
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-example-restlet-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-route-throttling/pom.xml
--
diff --git a/examples/camel-example-route-throttling/pom.xml 
b/examples/camel-example-route-throttling/pom.xml
index 4af64db..ae09020 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-example-route-throttling

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-servlet-rest-blueprint/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml 
b/examples/camel-example-servlet-rest-blueprint/pom.xml
index b9b7567..9c3e5b6 100755
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
   
 
   camel-example-servlet-rest-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-servlet-tomcat-no-spring/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml 
b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index 059ba8f..412fa2e 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-example-servlet-tomcat-no-spring

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-servlet-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-tomcat/pom.xml 
b/examples/camel-example-servlet-tomcat/pom.xml
index 3802b0f..75c3b43 100755
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -22,7 +22,7 @@
 
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-example-servlet-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-simplejirabot/javadsl/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml 
b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 6b783b7..9dcac62 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -19,7 +19,7 @@
 
 camel-example-simplejirabot
 org.apache.camel
-2.16.1
+2.16.2-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-simplejirabot/pom.xml
--
diff --git a/examples/camel-example-simplejirabot/pom.xml 
b/examples/camel-example-simplejirabot/pom.xml
index 45951ef..078d881 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 examples
-2.16.1
+2.16.2-SNAPSHOT
 
 
 camel-example-simplejirabot

http://git-wip-us.apache.org/repos/asf/camel/blob/b1404582/examples/camel-example-simplejirabot/xmlconf/pom.xml
--
diff --git 

[3/3] camel git commit: [maven-release-plugin] prepare release camel-2.16.1

[gzurowski]

[maven-release-plugin] prepare release camel-2.16.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b69b9d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b69b9d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b69b9d3

Branch: refs/heads/camel-2.16.x
Commit: 2b69b9d327def91b24c28c236c7f90d23dfd18c9
Parents: 910b517
Author: Gregor Zurowski 
Authored: Fri Nov 13 19:20:04 2015 +
Committer: Gregor Zurowski 
Committed: Fri Nov 13 19:20:04 2015 +

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components/camel-ahc-ws/pom.xml  | 2 +-
 components/camel-ahc/pom.xml | 2 +-
 components/camel-amqp/pom.xml| 2 +-
 components/camel-apns/pom.xml| 2 +-
 components/camel-atmos/pom.xml   | 2 +-
 components/camel-atmosphere-websocket/pom.xml| 2 +-
 components/camel-atom/pom.xml| 2 +-
 components/camel-avro/pom.xml| 2 +-
 components/camel-aws/pom.xml | 2 +-
 components/camel-bam/pom.xml | 2 +-
 components/camel-barcode/pom.xml | 2 +-
 components/camel-base64/pom.xml  | 2 +-
 components/camel-bean-validator/pom.xml  | 2 +-
 components/camel-beanio/pom.xml  | 2 +-
 components/camel-beanstalk/pom.xml   | 2 +-
 components/camel-bindy/pom.xml   | 2 +-
 components/camel-blueprint/pom.xml   | 2 +-
 components/camel-boon/pom.xml| 2 +-
 components/camel-box/pom.xml | 2 +-
 components/camel-cache/pom.xml   | 2 +-
 components/camel-cassandraql/pom.xml | 2 +-
 components/camel-castor/pom.xml  | 2 +-
 components/camel-cdi/pom.xml | 2 +-
 components/camel-chunk/pom.xml   | 2 +-
 components/camel-cmis/pom.xml| 2 +-
 components/camel-coap/pom.xml| 2 +-
 components/camel-cometd/pom.xml  | 2 +-
 components/camel-context/pom.xml | 2 +-
 components/camel-core-osgi/pom.xml   | 2 +-
 components/camel-core-xml/pom.xml| 2 +-
 components/camel-couchdb/pom.xml | 2 +-
 components/camel-crypto/pom.xml  | 2 +-
 components/camel-csv/pom.xml | 2 +-
 components/camel-cxf-transport/pom.xml   | 2 +-
 components/camel-cxf/pom.xml | 2 +-
 components/camel-disruptor/pom.xml   | 2 +-
 components/camel-dns/pom.xml | 2 +-
 components/camel-docker/pom.xml  | 2 +-
 components/camel-dozer/pom.xml   | 2 +-
 components/camel-dropbox/pom.xml | 2 +-
 components/camel-eclipse/pom.xml | 2 +-
 components/camel-ejb/pom.xml | 2 +-
 components/camel-elasticsearch/pom.xml   | 2 +-
 components/camel-elsql/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml  | 2 +-
 components/camel-exec/pom.xml| 2 +-
 components/camel-facebook/pom.xml| 2 +-
 components/camel-flatpack/pom.xml| 2 +-
 components/camel-fop/pom.xml | 2 +-
 components/camel-freemarker/pom.xml  | 2 +-
 components/camel-ftp/pom.xml | 2 +-
 components/camel-gae/pom.xml | 2 +-
 components/camel-ganglia/pom.xml | 2 +-
 components/camel-geocoder/pom.xml| 2 +-
 components/camel-git/pom.xml | 2 +-
 components/camel-github/pom.xml  | 2 +-
 

[2/9] camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to configure the types/permissions in the Java DSL. Updated the unit tests to do it like the end user

[davsclaus]

[CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to 
configure the types/permissions in the Java DSL. Updated the unit tests to do 
it like the end user would do it.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7afb376
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7afb376
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7afb376

Branch: refs/heads/camel-2.16.x
Commit: b7afb3769a38b8e526f8046414d4a71430d77df0
Parents: 439299b
Author: Claus Ibsen 
Authored: Fri Nov 13 15:17:07 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:17:44 2015 +0100

--
 .../apache/camel/builder/DataFormatClause.java  | 55 +---
 .../camel/model/dataformat/JsonDataFormat.java  | 47 +
 .../model/dataformat/XStreamDataFormat.java | 40 +++---
 .../xstream/MarshalDomainObjectJSONTest.java|  5 +-
 .../xstream/MarshalDomainObjectTest.java| 18 ++-
 .../xstream/UnmarshalThenMarshalJSONTest.java   |  5 +-
 .../xstream/UnmarshalThenMarshalTest.java   | 16 +-
 .../xstream/XStreamConcurrencyTest.java | 16 +-
 .../xstream/XStreamConfigurationTest.java   | 17 ++
 .../dataformat/xstream/XStreamTestUtils.java|  1 -
 .../src/test/resources/log4j.properties |  3 +-
 .../SpringMarshalDomainObjectJSONTest.xml   |  4 +-
 .../xstream/SpringMarshalListTest.xml   |  4 +-
 .../xstream/SpringMarshalOmitFieldsTest.xml |  2 +-
 .../xstream/SpringXStreamConfigurationTest.xml  |  4 +-
 15 files changed, 154 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b7afb376/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index e87195c..ffadcdf 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.builder;
 
+import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
-import org.w3c.dom.Node;
-
-
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -55,7 +53,9 @@ import org.apache.camel.model.dataformat.XStreamDataFormat;
 import org.apache.camel.model.dataformat.XmlJsonDataFormat;
 import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
+import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}
@@ -720,17 +720,60 @@ public class DataFormatClause> {
 }
 
 /**
- * Uses the XStream data format
+ * Uses the XStream data format.
+ * 
+ * Favor using {@link #xstream(String)} to pass in a permission
  */
 public T xstream() {
 return dataFormat(new XStreamDataFormat());
 }
 
 /**
+ * Uses the xstream by setting the encoding or permission
+ *
+ * @param encodingOrPermission is either an encoding or permission syntax
+ */
+public T xstream(String encodingOrPermission) {
+// is it an encoding? if not we assume its a permission
+if (Charset.isSupported(encodingOrPermission)) {
+return xstream(encodingOrPermission, (String) null);
+} else {
+return xstream(null, encodingOrPermission);
+}
+}
+
+/**
  * Uses the xstream by setting the encoding
  */
-public T xstream(String encoding) {
-return dataFormat(new XStreamDataFormat(encoding));
+public T xstream(String encoding, String permission) {
+XStreamDataFormat xdf = new XStreamDataFormat();
+xdf.setPermissions(permission);
+xdf.setEncoding(encoding);
+return dataFormat(xdf);
+}
+
+/**
+ * Uses the xstream by permitting the java type
+ *
+ * @param type the pojo xstream should use as allowed permission
+ */
+public T xstream(Class type) {
+return xstream(null, type);
+}
+
+/**
+ * Uses the xstream by permitting the java type
+ *
+ * @param encoding encoding to use
+ * @param type the pojo class(es) xstream should use as allowed permission
+ */
+public T xstream(String encoding, Class... type) {
+CollectionStringBuffer csb = new 

[7/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2d137506
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2d137506
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2d137506

Branch: refs/heads/camel-2.16.x
Commit: 2d13750605eb1bc02a08d21b3546abe8052b9a78
Parents: 55d9ba8
Author: Claus Ibsen 
Authored: Fri Nov 13 15:23:18 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:23:39 2015 +0100

--
 .../main/java/org/apache/camel/component/bean/BeanEndpoint.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2d137506/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index 34516e4..5a7c880 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -42,7 +42,8 @@ public class BeanEndpoint extends DefaultEndpoint {
 private String beanName;
 @UriParam(description = "Sets the name of the method to invoke on the 
bean")
 private String method;
-@UriParam(label = "advanced", description = "If enabled, Camel will cache 
the result of the first Registry look-up. Cache can be enabled if the bean in 
the Registry is defined as a singleton scope.")
+@UriParam(label = "advanced", description = "If enabled, Camel will cache 
the result of the first Registry look-up."
++ " Cache can be enabled if the bean in the Registry is defined as 
a singleton scope.")
 private boolean cache;
 @UriParam(label = "advanced", description = "How to treat the parameters 
which are passed from the message body."
 + "true means the message body should be an array of parameters. 
Note: This option is used internally by Camel, and is not intended for end 
users to use.")

[3/9] camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to configure the types/permissions in the Java DSL. Updated the unit tests to do it like the end user

[davsclaus]

[CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to 
configure the types/permissions in the Java DSL. Updated the unit tests to do 
it like the end user would do it.

Conflicts:
camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java

components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java

components/camel-xstream/src/test/resources/org/apache/camel/dataformat/xstream/SpringMarshalDomainObjectJSONTest.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4cdc6b17
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4cdc6b17
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4cdc6b17

Branch: refs/heads/camel-2.15.x
Commit: 4cdc6b177ee7391eedc9f0b695c05d56f84b0812
Parents: 933a245
Author: Claus Ibsen 
Authored: Fri Nov 13 15:17:07 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:20:21 2015 +0100

--
 .../apache/camel/builder/DataFormatClause.java  | 54 ++--
 .../camel/model/dataformat/JsonDataFormat.java  | 47 +
 .../model/dataformat/XStreamDataFormat.java | 40 ---
 .../xstream/MarshalDomainObjectJSONTest.java|  6 ++-
 .../xstream/MarshalDomainObjectTest.java| 18 ++-
 .../xstream/UnmarshalThenMarshalJSONTest.java   |  5 +-
 .../xstream/UnmarshalThenMarshalTest.java   | 16 +-
 .../xstream/XStreamConcurrencyTest.java | 16 +-
 .../xstream/XStreamConfigurationTest.java   | 17 ++
 .../dataformat/xstream/XStreamTestUtils.java|  1 -
 .../src/test/resources/log4j.properties |  3 +-
 .../SpringMarshalDomainObjectJSONTest.xml   |  3 +-
 .../xstream/SpringMarshalListTest.xml   |  4 +-
 .../xstream/SpringMarshalOmitFieldsTest.xml |  2 +-
 .../xstream/SpringXStreamConfigurationTest.xml  |  4 +-
 15 files changed, 156 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4cdc6b17/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index f839d58..b706602 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.builder;
 
+import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
-import org.w3c.dom.Node;
-
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -52,7 +51,9 @@ import org.apache.camel.model.dataformat.XStreamDataFormat;
 import org.apache.camel.model.dataformat.XmlJsonDataFormat;
 import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
+import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}
@@ -531,17 +532,60 @@ public class DataFormatClause> {
 }
 
 /**
- * Uses the XStream data format
+ * Uses the XStream data format.
+ * 
+ * Favor using {@link #xstream(String)} to pass in a permission
  */
 public T xstream() {
 return dataFormat(new XStreamDataFormat());
 }
 
 /**
+ * Uses the xstream by setting the encoding or permission
+ *
+ * @param encodingOrPermission is either an encoding or permission syntax
+ */
+public T xstream(String encodingOrPermission) {
+// is it an encoding? if not we assume its a permission
+if (Charset.isSupported(encodingOrPermission)) {
+return xstream(encodingOrPermission, (String) null);
+} else {
+return xstream(null, encodingOrPermission);
+}
+}
+
+/**
  * Uses the xstream by setting the encoding
  */
-public T xstream(String encoding) {
-return dataFormat(new XStreamDataFormat(encoding));
+public T xstream(String encoding, String permission) {
+XStreamDataFormat xdf = new XStreamDataFormat();
+xdf.setPermissions(permission);
+xdf.setEncoding(encoding);
+return dataFormat(xdf);
+}
+
+/**
+ * Uses the xstream by permitting the java type
+ *
+ * @param type the pojo xstream should use as allowed permission
+ */
+public T xstream(Class type) {
+

[1/9] camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to configure the types/permissions in the Java DSL. Updated the unit tests to do it like the end user

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 933a24508 -> f07a33c46
  refs/heads/camel-2.16.x 439299b39 -> 2d1375060
  refs/heads/master 741d0dadb -> 9c6bf4689


[CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to 
configure the types/permissions in the Java DSL. Updated the unit tests to do 
it like the end user would do it.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8386d8f7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8386d8f7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8386d8f7

Branch: refs/heads/master
Commit: 8386d8f7260143802553bc6dbae2880d6c0bafda
Parents: 741d0da
Author: Claus Ibsen 
Authored: Fri Nov 13 15:17:07 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:17:24 2015 +0100

--
 .../apache/camel/builder/DataFormatClause.java  | 55 +---
 .../camel/model/dataformat/JsonDataFormat.java  | 47 +
 .../model/dataformat/XStreamDataFormat.java | 40 +++---
 .../xstream/MarshalDomainObjectJSONTest.java|  5 +-
 .../xstream/MarshalDomainObjectTest.java| 18 ++-
 .../xstream/UnmarshalThenMarshalJSONTest.java   |  5 +-
 .../xstream/UnmarshalThenMarshalTest.java   | 16 +-
 .../xstream/XStreamConcurrencyTest.java | 16 +-
 .../xstream/XStreamConfigurationTest.java   | 17 ++
 .../dataformat/xstream/XStreamTestUtils.java|  1 -
 .../src/test/resources/log4j.properties |  3 +-
 .../SpringMarshalDomainObjectJSONTest.xml   |  4 +-
 .../xstream/SpringMarshalListTest.xml   |  4 +-
 .../xstream/SpringMarshalOmitFieldsTest.xml |  2 +-
 .../xstream/SpringXStreamConfigurationTest.xml  |  4 +-
 15 files changed, 154 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8386d8f7/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index e87195c..ffadcdf 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.builder;
 
+import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
-import org.w3c.dom.Node;
-
-
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -55,7 +53,9 @@ import org.apache.camel.model.dataformat.XStreamDataFormat;
 import org.apache.camel.model.dataformat.XmlJsonDataFormat;
 import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
+import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}
@@ -720,17 +720,60 @@ public class DataFormatClause> {
 }
 
 /**
- * Uses the XStream data format
+ * Uses the XStream data format.
+ * 
+ * Favor using {@link #xstream(String)} to pass in a permission
  */
 public T xstream() {
 return dataFormat(new XStreamDataFormat());
 }
 
 /**
+ * Uses the xstream by setting the encoding or permission
+ *
+ * @param encodingOrPermission is either an encoding or permission syntax
+ */
+public T xstream(String encodingOrPermission) {
+// is it an encoding? if not we assume its a permission
+if (Charset.isSupported(encodingOrPermission)) {
+return xstream(encodingOrPermission, (String) null);
+} else {
+return xstream(null, encodingOrPermission);
+}
+}
+
+/**
  * Uses the xstream by setting the encoding
  */
-public T xstream(String encoding) {
-return dataFormat(new XStreamDataFormat(encoding));
+public T xstream(String encoding, String permission) {
+XStreamDataFormat xdf = new XStreamDataFormat();
+xdf.setPermissions(permission);
+xdf.setEncoding(encoding);
+return dataFormat(xdf);
+}
+
+/**
+ * Uses the xstream by permitting the java type
+ *
+ * @param type the pojo xstream should use as allowed permission
+ */
+public T xstream(Class type) {
+return xstream(null, type);
+}
+
+/**
+ * Uses the xstream by permitting the java type
+ *
+ * @param encoding encoding to use
+ * @param type 

[4/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70b0057e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70b0057e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70b0057e

Branch: refs/heads/master
Commit: 70b0057e390c1e60047585c656ebd84eb65f74c8
Parents: 8386d8f
Author: Claus Ibsen 
Authored: Fri Nov 13 15:22:31 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:22:31 2015 +0100

--
 .../src/main/java/org/apache/camel/builder/DataFormatClause.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/70b0057e/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index ffadcdf..9495f4c 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -20,6 +20,8 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -55,7 +57,6 @@ import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
-import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}

[6/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55d9ba8f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55d9ba8f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55d9ba8f

Branch: refs/heads/camel-2.16.x
Commit: 55d9ba8f9a0893422835e98f7501a5f5e5db01e3
Parents: b7afb37
Author: Claus Ibsen 
Authored: Fri Nov 13 15:22:31 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:23:33 2015 +0100

--
 .../src/main/java/org/apache/camel/builder/DataFormatClause.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/55d9ba8f/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index ffadcdf..9495f4c 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -20,6 +20,8 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -55,7 +57,6 @@ import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
-import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}

[8/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dfdc11dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dfdc11dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dfdc11dd

Branch: refs/heads/camel-2.15.x
Commit: dfdc11ddb1ad640306786123010df9b64f57a9bb
Parents: 4cdc6b1
Author: Claus Ibsen 
Authored: Fri Nov 13 15:22:31 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:23:51 2015 +0100

--
 .../src/main/java/org/apache/camel/builder/DataFormatClause.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dfdc11dd/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index b706602..196329b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -20,6 +20,8 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.zip.Deflater;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.dataformat.AvroDataFormat;
@@ -53,7 +55,6 @@ import org.apache.camel.model.dataformat.ZipDataFormat;
 import org.apache.camel.model.dataformat.ZipFileDataFormat;
 import org.apache.camel.util.CollectionStringBuffer;
 import org.apache.camel.util.jsse.KeyStoreParameters;
-import org.w3c.dom.Node;
 
 /**
  * An expression for constructing the different possible {@link 
org.apache.camel.spi.DataFormat}

[5/9] camel git commit: Fixed CS

[davsclaus]

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c6bf468
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c6bf468
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c6bf468

Branch: refs/heads/master
Commit: 9c6bf46898bd634affe504f1eec7f343e9166c14
Parents: 70b0057
Author: Claus Ibsen 
Authored: Fri Nov 13 15:23:18 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:23:18 2015 +0100

--
 .../main/java/org/apache/camel/component/bean/BeanEndpoint.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9c6bf468/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
index 34516e4..5a7c880 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
@@ -42,7 +42,8 @@ public class BeanEndpoint extends DefaultEndpoint {
 private String beanName;
 @UriParam(description = "Sets the name of the method to invoke on the 
bean")
 private String method;
-@UriParam(label = "advanced", description = "If enabled, Camel will cache 
the result of the first Registry look-up. Cache can be enabled if the bean in 
the Registry is defined as a singleton scope.")
+@UriParam(label = "advanced", description = "If enabled, Camel will cache 
the result of the first Registry look-up."
++ " Cache can be enabled if the bean in the Registry is defined as 
a singleton scope.")
 private boolean cache;
 @UriParam(label = "advanced", description = "How to treat the parameters 
which are passed from the message body."
 + "true means the message body should be an array of parameters. 
Note: This option is used internally by Camel, and is not intended for end 
users to use.")

[9/9] camel git commit: [CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to configure the types/permissions in the Java DSL. Updated the unit tests to do it like the end user

[davsclaus]

[CAMEL-9297] Expose more configuration options from Camel's XStream. Allow to 
configure the types/permissions in the Java DSL. Updated the unit tests to do 
it like the end user would do it.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f07a33c4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f07a33c4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f07a33c4

Branch: refs/heads/camel-2.15.x
Commit: f07a33c467adb3d37aa8192698caadfee43a17dc
Parents: dfdc11d
Author: Claus Ibsen 
Authored: Fri Nov 13 15:30:50 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:30:50 2015 +0100

--
 .../camel/dataformat/xstream/MarshalDomainObjectJSONTest.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f07a33c4/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
--
diff --git 
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
 
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
index 752a9f6..c321d54 100644
--- 
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
+++ 
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java
@@ -30,9 +30,6 @@ public class MarshalDomainObjectJSONTest extends 
MarshalDomainObjectTest {
 from("direct:marshal").marshal().json();
 
 from("direct:reverse").unmarshal().json(JsonLibrary.XStream, 
PurchaseOrder.class).to("mock:reverse");
-
-from("direct:inPretty").marshal().json(true);
-
from("direct:backPretty").unmarshal().json(JsonLibrary.XStream, 
PurchaseOrder.class, true).to("mock:reverse");
 }
 };
 }

camel git commit: CAMEL-9311: Fix concurrency when using @DynamicRouter

[gertv]

Repository: camel
Updated Branches:
  refs/heads/master 9c6bf4689 -> 8a770bfee


CAMEL-9311: Fix concurrency when using @DynamicRouter


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a770bfe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a770bfe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a770bfe

Branch: refs/heads/master
Commit: 8a770bfeec6e2134eec12be6ef49a3458e99f7cc
Parents: 9c6bf46
Author: Gert Vanthienen 
Authored: Fri Nov 13 15:41:08 2015 +0100
Committer: Gert Vanthienen 
Committed: Fri Nov 13 15:41:19 2015 +0100

--
 .../apache/camel/processor/DynamicRouter.java   |  2 +-
 .../org/apache/camel/processor/RoutingSlip.java | 14 ++--
 .../DynamicRouterConcurrentPOJOTest.java| 77 
 3 files changed, 85 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8a770bfe/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java 
b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
index 0e1c117..565c64e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
@@ -43,7 +43,7 @@ public class DynamicRouter extends RoutingSlip {
 }
 
 @Override
-protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange) 
throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(Exchange exchange, 
Expression expression) throws Exception {
 return new DynamicRoutingSlipIterator(expression);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/8a770bfe/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java 
b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index c20742c..c684593 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -183,25 +183,25 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 return true;
 }
 
-return doRoutingSlip(exchange, callback);
+return doRoutingSlipWithExpression(exchange, this.expression, 
callback);
 }
 
 public boolean doRoutingSlip(Exchange exchange, Object routingSlip, 
AsyncCallback callback) {
 if (routingSlip instanceof Expression) {
-this.expression = (Expression) routingSlip;
+return doRoutingSlipWithExpression(exchange, (Expression) 
routingSlip, callback);
 } else {
-this.expression = 
ExpressionBuilder.constantExpression(routingSlip);
+return doRoutingSlipWithExpression(exchange, 
ExpressionBuilder.constantExpression(routingSlip), callback);
 }
-return doRoutingSlip(exchange, callback);
 }
 
 /**
  * Creates the route slip iterator to be used.
  *
  * @param exchange the exchange
+ * @param expression the expression
  * @return the iterator, should never be null
  */
-protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange) throws Exception {
+protected RoutingSlipIterator createRoutingSlipIterator(final Exchange 
exchange, final Expression expression) throws Exception {
 Object slip = expression.evaluate(exchange, Object.class);
 if (exchange.getException() != null) {
 // force any exceptions occurred during evaluation to be thrown
@@ -221,11 +221,11 @@ public class RoutingSlip extends ServiceSupport 
implements AsyncProcessor, Trace
 };
 }
 
-private boolean doRoutingSlip(final Exchange exchange, final AsyncCallback 
callback) {
+private boolean doRoutingSlipWithExpression(final Exchange exchange, final 
Expression expression, final AsyncCallback callback) {
 Exchange current = exchange;
 RoutingSlipIterator iter;
 try {
-iter = createRoutingSlipIterator(exchange);
+iter = createRoutingSlipIterator(exchange, expression);
 } catch (Exception e) {
 exchange.setException(e);
 callback.done(true);

http://git-wip-us.apache.org/repos/asf/camel/blob/8a770bfe/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
--
diff --git 

camel git commit: CAMEL-9318: camel-twitter event should extend default component and not direct.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 2d1375060 -> 15ec21887


CAMEL-9318: camel-twitter event should extend default component and not direct.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/15ec2188
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/15ec2188
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/15ec2188

Branch: refs/heads/camel-2.16.x
Commit: 15ec2188728bac58e15f8f00ec50985c1875bd16
Parents: 2d13750
Author: Claus Ibsen 
Authored: Fri Nov 13 15:50:55 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:52:26 2015 +0100

--
 .../twitter/consumer/TwitterConsumerDirect.java|  4 ++--
 .../twitter/consumer/TwitterConsumerEvent.java | 13 -
 2 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/15ec2188/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
--
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
index 6878ad3..ced7e3b 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
@@ -21,13 +21,13 @@ import java.util.Iterator;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.component.direct.DirectConsumer;
 import org.apache.camel.component.twitter.TwitterEndpoint;
+import org.apache.camel.impl.DefaultConsumer;
 
 /**
  * Camel DirectConsumer implementation.
  */
-public class TwitterConsumerDirect extends DirectConsumer {
+public class TwitterConsumerDirect extends DefaultConsumer {
 
 private Twitter4JConsumer twitter4jConsumer;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/15ec2188/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
--
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
index daa3ce6..4feaf8a 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
@@ -18,19 +18,17 @@ package org.apache.camel.component.twitter.consumer;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.component.direct.DirectConsumer;
 import org.apache.camel.component.twitter.TwitterEndpoint;
 import org.apache.camel.component.twitter.consumer.streaming.StreamingConsumer;
-
+import org.apache.camel.impl.DefaultConsumer;
 import twitter4j.Status;
 
-public class TwitterConsumerEvent extends DirectConsumer implements 
TweeterStatusListener {
+public class TwitterConsumerEvent extends DefaultConsumer implements 
TweeterStatusListener {
 private Twitter4JConsumer twitter4jConsumer;
 
 public TwitterConsumerEvent(TwitterEndpoint endpoint, Processor processor,
 Twitter4JConsumer twitter4jConsumer) {
 super(endpoint, processor);
-
 this.twitter4jConsumer = twitter4jConsumer;
 }
 
@@ -56,10 +54,15 @@ public class TwitterConsumerEvent extends DirectConsumer 
implements TweeterStatu
 public void onStatus(Status status) {
 Exchange exchange = getEndpoint().createExchange();
 exchange.getIn().setBody(status);
+
 try {
 getProcessor().process(exchange);
 } catch (Exception e) {
-throw new RuntimeException(e);
+exchange.setException(e);
+}
+
+if (exchange.getException() != null) {
+getExceptionHandler().handleException("Error processing exchange 
on status update", exchange, exchange.getException());
 }
 }
 }

camel git commit: CAMEL-9318: camel-twitter event should extend default component and not direct.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 8a770bfee -> 13c0a110e


CAMEL-9318: camel-twitter event should extend default component and not direct.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13c0a110
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13c0a110
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13c0a110

Branch: refs/heads/master
Commit: 13c0a110e408fb1d62cd89d9f732390b15062e47
Parents: 8a770bf
Author: Claus Ibsen 
Authored: Fri Nov 13 15:50:55 2015 +0100
Committer: Claus Ibsen 
Committed: Fri Nov 13 15:52:49 2015 +0100

--
 .../twitter/consumer/TwitterConsumerDirect.java|  4 ++--
 .../twitter/consumer/TwitterConsumerEvent.java | 13 -
 2 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/13c0a110/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
--
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
index 6878ad3..ced7e3b 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerDirect.java
@@ -21,13 +21,13 @@ import java.util.Iterator;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.component.direct.DirectConsumer;
 import org.apache.camel.component.twitter.TwitterEndpoint;
+import org.apache.camel.impl.DefaultConsumer;
 
 /**
  * Camel DirectConsumer implementation.
  */
-public class TwitterConsumerDirect extends DirectConsumer {
+public class TwitterConsumerDirect extends DefaultConsumer {
 
 private Twitter4JConsumer twitter4jConsumer;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/13c0a110/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
--
diff --git 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
index daa3ce6..4feaf8a 100644
--- 
a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
+++ 
b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerEvent.java
@@ -18,19 +18,17 @@ package org.apache.camel.component.twitter.consumer;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.component.direct.DirectConsumer;
 import org.apache.camel.component.twitter.TwitterEndpoint;
 import org.apache.camel.component.twitter.consumer.streaming.StreamingConsumer;
-
+import org.apache.camel.impl.DefaultConsumer;
 import twitter4j.Status;
 
-public class TwitterConsumerEvent extends DirectConsumer implements 
TweeterStatusListener {
+public class TwitterConsumerEvent extends DefaultConsumer implements 
TweeterStatusListener {
 private Twitter4JConsumer twitter4jConsumer;
 
 public TwitterConsumerEvent(TwitterEndpoint endpoint, Processor processor,
 Twitter4JConsumer twitter4jConsumer) {
 super(endpoint, processor);
-
 this.twitter4jConsumer = twitter4jConsumer;
 }
 
@@ -56,10 +54,15 @@ public class TwitterConsumerEvent extends DirectConsumer 
implements TweeterStatu
 public void onStatus(Status status) {
 Exchange exchange = getEndpoint().createExchange();
 exchange.getIn().setBody(status);
+
 try {
 getProcessor().process(exchange);
 } catch (Exception e) {
-throw new RuntimeException(e);
+exchange.setException(e);
+}
+
+if (exchange.getException() != null) {
+getExceptionHandler().handleException("Error processing exchange 
on status update", exchange, exchange.getException());
 }
 }
 }

camel git commit: adjust camel-twitter's test for 2.17 component info

[ay]

Repository: camel
Updated Branches:
  refs/heads/master 5aef07542 -> 741d0dadb


adjust camel-twitter's test for 2.17 component info


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/741d0dad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/741d0dad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/741d0dad

Branch: refs/heads/master
Commit: 741d0dadb235a31d9175beeb4630ce836f9e60c6
Parents: 5aef075
Author: Akitoshi Yoshida 
Authored: Fri Nov 13 14:35:05 2015 +0100
Committer: Akitoshi Yoshida 
Committed: Fri Nov 13 14:35:05 2015 +0100

--
 .../apache/camel/component/twitter/UriConfigurationTest.java| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/741d0dad/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
--
diff --git 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
index d0d64f4..840796e 100644
--- 
a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
+++ 
b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
@@ -74,8 +74,9 @@ public class UriConfigurationTest extends Assert {
 String json = compConf.createParameterJsonSchema();
 assertNotNull(json);
 
-assertTrue(json.contains("\"accessToken\": { \"kind\": \"parameter\", 
\"type\": \"string\""));
-assertTrue(json.contains("\"consumerKey\": { \"kind\": \"parameter\", 
\"type\": \"string\""));
+// REVIST this comparison test may be sensitive to some changes.
+assertTrue(json.contains("\"accessToken\": { \"kind\": \"parameter\", 
\"group\": \"common\", \"type\": \"string\""));
+assertTrue(json.contains("\"consumerKey\": { \"kind\": \"parameter\", 
\"group\": \"common\", \"type\": \"string\""));
 }
 
 @Test