camel git commit: Fixed javadoc generation

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master ad4cba096 -> 8a0b905dc


Fixed javadoc generation


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

Branch: refs/heads/master
Commit: 8a0b905dc71f5bc395637710c4f71400500c7b0b
Parents: ad4cba0
Author: Claus Ibsen 
Authored: Sat Mar 5 08:41:15 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Mar 5 08:42:53 2016 +0100

--
 .../src/main/java/org/apache/camel/example/cdi/osgi/Config.java | 2 +-
 .../main/java/org/apache/camel/example/cdi/osgi/Consumer.java   | 2 +-
 .../src/main/java/org/apache/camel/example/cdi/osgi/Jms.java| 2 +-
 .../main/java/org/apache/camel/example/cdi/osgi/Producer.java   | 2 +-
 .../java/org/apache/camel/example/cdi/test/Application.java | 5 -
 5 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8a0b905d/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Config.java
--
diff --git 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Config.java
 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Config.java
index d480326..ed57006 100644
--- 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Config.java
+++ 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Config.java
@@ -22,7 +22,7 @@ import javax.inject.Named;
 
 import org.apache.camel.component.properties.PropertiesComponent;
 
-class Config {
+public class Config {
 
 @Produces
 @ApplicationScoped

http://git-wip-us.apache.org/repos/asf/camel/blob/8a0b905d/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Consumer.java
--
diff --git 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Consumer.java
 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Consumer.java
index e3afae8..b524f45 100644
--- 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Consumer.java
+++ 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Consumer.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.ContextName;
 
 @ContextName("osgi-example")
-class Consumer extends RouteBuilder {
+public class Consumer extends RouteBuilder {
 
 @Override
 public void configure() {

http://git-wip-us.apache.org/repos/asf/camel/blob/8a0b905d/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Jms.java
--
diff --git 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Jms.java
 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Jms.java
index ef7e28a..fe71c42 100644
--- 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Jms.java
+++ 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Jms.java
@@ -24,7 +24,7 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.PropertyInject;
 import org.apache.camel.component.sjms.SjmsComponent;
 
-class Jms {
+public class Jms {
 
 @PropertyInject("jms.maxConnections")
 int maxConnections;

http://git-wip-us.apache.org/repos/asf/camel/blob/8a0b905d/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Producer.java
--
diff --git 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Producer.java
 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Producer.java
index 89accc9..dd508cc 100644
--- 
a/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Producer.java
+++ 
b/examples/camel-example-cdi-osgi/src/main/java/org/apache/camel/example/cdi/osgi/Producer.java
@@ -22,7 +22,7 @@ import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.Uri;
 import org.apache.camel.management.event.CamelContextStartedEvent;
 
-class Producer {
+public class Producer {
 
 void sendMessage(@Observes CamelContextStartedEvent event, 
@Uri("sjms:sample.queue") ProducerTemplate producer) {
 producer.sendBodyAndHeader("Sample Message", "Sender", 
getClass().getSimpleName());

camel git commit: Fixed compile error

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 47ee5ea5f -> ad4cba096


Fixed compile error


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

Branch: refs/heads/master
Commit: ad4cba096e9ce6bfc0bae01b8a76982925ce1f68
Parents: 47ee5ea
Author: Claus Ibsen 
Authored: Sat Mar 5 08:16:32 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Mar 5 08:16:32 2016 +0100

--
 .../component/mllp/MllpTcpClientProducerAcknowledgementTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ad4cba09/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
--
diff --git 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
index 03a7197..125df76 100644
--- 
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
+++ 
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpClientProducerAcknowledgementTest.java
@@ -36,9 +36,7 @@ import static 
org.apache.camel.test.mllp.Hl7MessageGenerator.generateMessage;
 public class MllpTcpClientProducerAcknowledgementTest extends CamelTestSupport 
{
 
 @Rule
-public MllpServerResource mllpServer = new MllpServerResource(mllpHost, 
AvailablePortFinder.getNextAvailable());
-
-String mllpHost = "localhost";
+public MllpServerResource mllpServer = new MllpServerResource("localhost", 
AvailablePortFinder.getNextAvailable());
 
 @EndpointInject(uri = "direct://source")
 ProducerTemplate source;

camel git commit: Fix example link discrepancy

[astefanutti]

Repository: camel
Updated Branches:
  refs/heads/master 3d46f62ea -> 47ee5ea5f


Fix example link discrepancy


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

Branch: refs/heads/master
Commit: 47ee5ea5fee8663555aa2870b221e8d1e2cd3445
Parents: 3d46f62
Author: Antonin Stefanutti 
Authored: Fri Mar 4 18:43:17 2016 +0100
Committer: Antonin Stefanutti 
Committed: Fri Mar 4 18:43:17 2016 +0100

--
 examples/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/47ee5ea5/examples/README.md
--
diff --git a/examples/README.md b/examples/README.md
index 154a396..657c861 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -47,7 +47,7 @@ All examples have been sort by type/category
 * [camel-example-cdi-properties](camel-example-cdi-properties/README.md)
 * [camel-example-cdi-rest-servlet](camel-example-cdi-rest-servlet/README.md)
 * [camel-example-cdi-test](camel-example-cdi-test/README.md)
-* [camel-example-widget-gadget-java](camel-example-widget-gadget-cdi/README.md)
+* [camel-example-widget-gadget-cdi](camel-example-widget-gadget-cdi/README.md)
 
 # OSGi
 

[2/2] camel git commit: Add a Camel CDI test module example

[astefanutti]

Add a Camel CDI test module example


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

Branch: refs/heads/master
Commit: 3d46f62ea3129a4f36662a9fddfb396c0ef90329
Parents: 701651e
Author: Antonin Stefanutti 
Authored: Fri Mar 4 18:31:35 2016 +0100
Committer: Antonin Stefanutti 
Committed: Fri Mar 4 18:41:00 2016 +0100

--
 examples/README.md  |   1 +
 examples/camel-example-cdi-test/README.md   |  65 ++
 examples/camel-example-cdi-test/pom.xml | 100 +
 .../camel/example/cdi/test/Application.java |  55 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../src/main/resources/META-INF/beans.xml   |  24 +++
 .../src/main/resources/log4j.properties |  28 +++
 .../camel/example/cdi/test/AdviceTest.java  |  72 +++
 .../example/cdi/test/ApplicationScopedTest.java |  70 +++
 .../example/cdi/test/CustomContextTest.java |  51 +
 .../camel/example/cdi/test/OrderTest.java   |  90 
 examples/pom.xml|   1 +
 13 files changed, 771 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3d46f62e/examples/README.md
--
diff --git a/examples/README.md b/examples/README.md
index 75f988a..154a396 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -46,6 +46,7 @@ All examples have been sort by type/category
 * [camel-example-cdi-metrics](camel-example-cdi-metrics/README.md)
 * [camel-example-cdi-properties](camel-example-cdi-properties/README.md)
 * [camel-example-cdi-rest-servlet](camel-example-cdi-rest-servlet/README.md)
+* [camel-example-cdi-test](camel-example-cdi-test/README.md)
 * [camel-example-widget-gadget-java](camel-example-widget-gadget-cdi/README.md)
 
 # OSGi

http://git-wip-us.apache.org/repos/asf/camel/blob/3d46f62e/examples/camel-example-cdi-test/README.md
--
diff --git a/examples/camel-example-cdi-test/README.md 
b/examples/camel-example-cdi-test/README.md
new file mode 100644
index 000..6ee83a5
--- /dev/null
+++ b/examples/camel-example-cdi-test/README.md
@@ -0,0 +1,65 @@
+# Testing Example - CDI
+
+### Introduction
+
+This example demonstrates the testing features that are provided as part of
+the integration between Camel and CDI.
+
+The example is implemented in Java with CDI dependency injection. It uses 
JBoss Weld
+as the minimal CDI container to run the application, though you can run the 
application
+in any CDI compliant container.
+
+This example comes with a series of test classes that each demonstrates 
particular
+features provided by the `camel-test-cdi` module: 
+
+| Test class  | Description
   |
+| --- | 
- |
+| [`AdviceTest`][]| Adds a test route using Camel advice API   
   |
+| [`ApplicationScopedTest`][] | A stateful `@ApplicationScoped` test class 
   |
+| [`CustomContextTest`][] | Declares a custom Camel context bean for test 
purpose |
+| [`OrderTest`][] | Orders the test methods execution with 
`@Order`   |
+
+[`AdviceTest`]: src/test/java/org/apache/camel/example/cdi/test/AdviceTest.java
+[`ApplicationScopedTest`]: 
src/test/java/org/apache/camel/example/cdi/test/ApplicationScopedTest.java
+[`CustomContextTest`]: 
src/test/java/org/apache/camel/example/cdi/test/CustomContextTest.java
+[`OrderTest`]: src/test/java/org/apache/camel/example/cdi/test/OrderTest.java
+
+### Build
+
+You can build this example using:
+
+```sh
+$ mvn package
+```
+
+### Run
+
+You can run this example using:
+
+```sh
+$ mvn camel:run
+```
+
+When the Camel application runs, you should see the following message being 
logged
+to the console, e.g.:
+
+```
+2016-03-04 17:54:04,147 [cdi.Main.main()] INFO  route - Hello from 
camel-test-cdi at 05:54:04 PM!
+```
+
+The Camel application can be stopped pressing ctrl+c in 
the shell.
+
+You should see the following message being logged to the console:
+
+```
+2016-03-04 17:54:18,725 [Thread-1   ] INFO  route - Bye from 
camel-test-cdi at 05:54:18 PM!
+```
+
+### Forum, Help, etc
+
+If you hit an problems please let us know on the Camel Forums
+
+
+Please help us make Apache Camel better - we appreciate any feedback you may 
have. Enjoy!
+
+The Camel riders!

[1/2] camel git commit: CAMEL-8936: Create a test module for CDI

[astefanutti]

Repository: camel
Updated Branches:
  refs/heads/master 39b79b97b -> 3d46f62ea


CAMEL-8936: Create a test module for CDI


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

Branch: refs/heads/master
Commit: 701651e9f3b318ccb4b8a8872c1e8e989fcf3ffd
Parents: 39b79b9
Author: Antonin Stefanutti 
Authored: Fri Mar 4 18:30:48 2016 +0100
Committer: Antonin Stefanutti 
Committed: Fri Mar 4 18:30:48 2016 +0100

--
 apache-camel/pom.xml|   4 +
 .../src/main/descriptors/common-bin.xml |   1 +
 components/camel-test-cdi/pom.xml   |  57 ++
 .../org/apache/camel/test/cdi/AnyLiteral.java   |  30 +++
 .../apache/camel/test/cdi/CamelCdiContext.java  |  45 
 .../camel/test/cdi/CamelCdiDeployment.java  |  62 ++
 .../apache/camel/test/cdi/CamelCdiRunner.java   |  96 +
 .../test/cdi/FrameworkAnnotatedParameter.java   |  90 
 .../test/cdi/FrameworkMethodCdiInjection.java   |  51 +
 .../test/cdi/FrameworkMethodInjectionPoint.java |  88 
 .../camel/test/cdi/FrameworkMethodSorter.java   |  37 
 .../java/org/apache/camel/test/cdi/Order.java   |  31 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 components/pom.xml  |   1 +
 parent/pom.xml  |   5 +
 16 files changed, 812 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/701651e9/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 0eb7c9d..df7f691 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -840,6 +840,10 @@
 
 
   org.apache.camel
+  camel-test-cdi
+
+
+  org.apache.camel
   camel-test-spring
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/701651e9/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index b00bd97..81779eb 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -221,6 +221,7 @@
 org.apache.camel:camel-tagsoup
 org.apache.camel:camel-test
 org.apache.camel:camel-test-blueprint
+org.apache.camel:camel-test-cdi
 org.apache.camel:camel-test-spring
 org.apache.camel:camel-test-spring3
 org.apache.camel:camel-test-spring40

http://git-wip-us.apache.org/repos/asf/camel/blob/701651e9/components/camel-test-cdi/pom.xml
--
diff --git a/components/camel-test-cdi/pom.xml 
b/components/camel-test-cdi/pom.xml
new file mode 100644
index 000..315b163
--- /dev/null
+++ b/components/camel-test-cdi/pom.xml
@@ -0,0 +1,57 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+  4.0.0
+
+  
+org.apache.camel
+components
+2.17-SNAPSHOT
+  
+
+  camel-test-cdi
+  bundle
+  Camel :: Test :: CDI
+  Camel Testing Library using JUnit and CDI
+
+  
+org.apache.camel.test.cdi.*
+  
+
+  
+
+
+  org.apache.camel
+  camel-test
+
+
+  org.apache.camel
+  camel-cdi
+
+
+  org.jboss.weld.se
+  weld-se-core
+  ${weld2-version}
+
+
+
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/camel/blob/701651e9/components/camel-test-cdi/src/main/java/org/apache/camel/test/cdi/AnyLiteral.java
--
diff --git 
a/components/camel-test-cdi/src/main/java/org/apache/camel/test/cdi/AnyLiteral.java
 
b/components/camel-test-cdi/src/main/java/org/apache/camel/test/cdi/AnyLiteral.java
new file mode 100755
index 000..7413de4
--- /dev/null
+++ 
b/components/camel-test-cdi/src/main/java/org/apache/camel/test/cdi/AnyLiteral.java
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ 

svn commit: r981815 [5/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Modified: websites/production/camel/content/components.html
==
--- websites/production/camel/content/components.html (original)
+++ websites/production/camel/content/components.html Fri Mar  4 17:21:12 2016
@@ -89,19 +89,19 @@
 Components IncludedCamel includes 
the following Component 
implementations via URIs.importantMake sure to read How do I configure endpoints to 
learn more about configuring endpoints. For example how to refer to beans in 
the Registry or how to use raw values 
for password options, and using property placeholders 
etc.Component / ArtifactId / URIDescriptionAHC / 
camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -138,18 +138,18 @@
 For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -157,7 +157,7 @@
 ]]>
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / camel-cassandraql
 
-For integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
+  
For 
integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
 
 Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 

svn commit: r981815 [2/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Fri Mar  4 17:21:12 
2016
@@ -474,19 +474,19 @@ Camel uses a Java based Component / ArtifactId / 
URIDescriptionAHC / 
camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -523,18 +523,18 @@ Camel uses a Java based For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -542,7 +542,7 @@ Camel uses a Java based 
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / camel-cassandraql
 
-For integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
+  
For 
integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
 
 Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Chunk / 
camel-chunk
@@ -593,13 +593,13 @@ Camel uses a Java based 
-To 
provide the implementation of SEDA which 
is based on https://github.com/LMAX-Exchange/disruptor; 
rel="nofollow">disruptorDocker / 
camel-docker
+To 

svn commit: r981815 [6/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Added: websites/production/camel/content/mongodb-gridfs.html
==
--- websites/production/camel/content/mongodb-gridfs.html (added)
+++ websites/production/camel/content/mongodb-gridfs.html Fri Mar  4 17:21:12 
2016
@@ -0,0 +1,218 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  
+
+
+Apache Camel: MongoDB GridFS
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+   
+http://camel.apache.org/;>Camel
+http://www.apache.org;>Apache
+   
+
+  
+
+  
+
+Apache CamelSiteIncludesComponent ListMongoDB GridFS
+  
+  
+Download 
| JavaDoc | Source | Forums | Support
+  
+
+
+   
+   
+
+
+Camel MongoDB GridFS 
componentAvailable as of Camel 2.17Maven users 
will need to add the following dependency to their pom.xml for 
this component:
+
+URI format
+
+Endpoint 
optionsGridFS endpoints support the following options, depending on 
whether they are acting like a Producer or as a Consumer (options vary based on 
the consumer type too).NameDefault ValueDescriptionProducerConsumerdatabasenoneRequired. The name of the database to 
which this endpoint will be bound. All operations will be execu
 ted against this database.https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">bucketfsThe name of the GridFS bucket within the Database. The 
default is the GridFS.DEFAULT_BUCKET value ("fs").https://cwiki
 
.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"
 data-emoticon-name="tick" alt="(tick)">https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">operationcreateThe id of the operation this endpoint will 
execute. Pick from the following:Query operations: 
findOne, listAll, countWrite 
operations: createDelete operations: 
removehttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">querynoneCombined with the query strategy parameters to create the 
query used to search for new files.https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">queryStrategyTimeStampThe strategy that is used to 
find new files. Can be one of:TimeStamp - files that are uploaded 
after the Consumer starts are processedPersistentTimestamp - Like 
TimeStamp, but the last timestamp used is persisted to a collection so when the 
Consumer restarts, it can resume where it left offFileAttribute - 
finds files that do NOT have the give attribute. After processing, it adds the 
attribute.TimestampAndFileAttribute - finds files that are newer than 
the TimeStamp and are missing the 
attributePersistentTimestampAndFileAttributehttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">persistentTSCollectioncamel-timestampsWhen using persistent timestamps, this is the 
Collection that the timestamp is stored into.https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">persistenTSObjectcamel-timestampWhen using persistent timestamps, this is the 
object ID for the timestamp object. Each consumer can have it's own timestamp 
ID stored in a common Collectionhttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">fileAttributeNamecamel-processedWhen using FileAttribute, this is the name of 
the attribute that is used. When a file is about to be processed, the attribute 
is set to "processing" and then set to "done" when the file processing is 

svn commit: r981815 [1/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Author: buildbot
Date: Fri Mar  4 17:21:12 2016
New Revision: 981815

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/mongodb-gridfs.html
Modified:
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/component-list.html
websites/production/camel/content/component.html
websites/production/camel/content/components.html
websites/production/camel/content/transport.html
websites/production/camel/content/uris.html

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Fri Mar  4 
17:21:12 2016
@@ -113,19 +113,19 @@ Camel uses a Java based Component / ArtifactId / 
URIDescriptionAHC / 
camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -162,18 +162,18 @@ Camel uses a Java based For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -181,7 +181,7 @@ Camel uses a Java based 
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / 

svn commit: r981815 [8/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Modified: websites/production/camel/content/uris.html
==
--- websites/production/camel/content/uris.html (original)
+++ websites/production/camel/content/uris.html Fri Mar  4 17:21:12 2016
@@ -98,19 +98,19 @@
 Component / ArtifactId / 
URIDescriptionAHC / 
camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -147,18 +147,18 @@
 For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -166,7 +166,7 @@
 ]]>
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / camel-cassandraql
 
-For integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
+  
For 
integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
 
 Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Chunk / 
camel-chunk
@@ -217,13 +217,13 @@
 
-To 
provide the implementation of SEDA which 
is based on https://github.com/LMAX-Exchange/disruptor; 
rel="nofollow">disruptorDocker / 
camel-docker
+To 
provide the implementation of SEDA which 
is 

svn commit: r981815 [3/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Modified: websites/production/camel/content/component-list.html
==
--- websites/production/camel/content/component-list.html (original)
+++ websites/production/camel/content/component-list.html Fri Mar  4 17:21:12 
2016
@@ -88,19 +88,19 @@
 Component / ArtifactId / URIDescriptionAHC / camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -137,18 +137,18 @@
 For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -156,7 +156,7 @@
 ]]>
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / camel-cassandraql
 
-For integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
+  
For 
integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
 
 Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Chunk / 
camel-chunk
@@ -207,13 +207,13 @@
 
-To 
provide the implementation of SEDA which 
is based on https://github.com/LMAX-Exchange/disruptor; 
rel="nofollow">disruptorDocker / 
camel-docker
+To 
provide the 

svn commit: r981815 [7/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Modified: websites/production/camel/content/transport.html
==
--- websites/production/camel/content/transport.html (original)
+++ websites/production/camel/content/transport.html Fri Mar  4 17:21:12 2016
@@ -93,19 +93,19 @@
 Components IncludedCamel 
includes the following Component 
implementations via URIs.importantMake sure to read How do I configure endpoints to 
learn more about configuring endpoints. For example how to refer to beans in 
the Registry or how to use raw values 
for password options, and using property placeholders 
etc.Compon
 ent / ArtifactId / URIDescriptionAHC / 
camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -142,18 +142,18 @@
 For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -161,7 +161,7 @@
 ]]>
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / camel-cassandraql
 
-For integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
+  
For 
integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
 
 Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 

svn commit: r981815 [4/8] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html component.html components.html mongodb-gridfs.h

[buildbot]

Modified: websites/production/camel/content/component.html
==
--- websites/production/camel/content/component.html (original)
+++ websites/production/camel/content/component.html Fri Mar  4 17:21:12 2016
@@ -89,19 +89,19 @@
 ComponentsA Component is essentially a factory of Endpoint instances.You can explicitly configure 
Component instances and add them to a 
CamelContext in an IoC container 
like Spring or Guice, or they can be auto-discovered using URIs.Components 
IncludedCamel includes the following Component implementations via URIs.importantMak
 e sure to read How do 
I configure endpoints to learn more about configuring endpoints. For 
example how to refer to beans in the Registry or how to use raw values for password 
options, and using property placeholders 
etc.Component / ArtifactId / URIDescriptionAHC / camel-ahc
 
-To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS / 
camel-ahc-ws
+To call 
external HTTP services using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAHC-WS  / 
camel-ahc-ws
 
-To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
+  To exchange data with external Websocket 
servers using http://github.com/sonatype/async-http-client; rel="nofollow">Async Http 
ClientAMQP / camel-amqp
 
 For 
Messaging with http://www.amqp.org/; rel="nofollow">AMQP 
protocolAPNS / 
camel-apns
 
-For 
sending notifications to Apple iOS devicesAtmosphere-Websocket
 / camel-atmosphere-websocket
+For 
sending notifications to Apple iOS devicesAtmosphere-Websocket  
 / camel-atmosphere-websocket
 
-To exchange data with external 
Websocket clients using https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
+  To exchange data with external 
Websocket clients using  https://github.com/Atmosphere/atmosphere; 
rel="nofollow">AtmosphereAtom / 
camel-atom
 
 Working 
with http://incubator.apache.org/abdera/;>Apache Abdera for atom 
integration, such as consuming an atom feed.Avro / 
camel-avro
@@ -138,18 +138,18 @@
 For 
working with http://aws.amazon.com/s3/; rel="nofollow">Amazon's Simple Storage Service 
(S3).Bean / 
camel-core
 
-Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk / camel-beanstalk
+Uses the 
Bean Binding to bind message 
exchanges to beans in the Registry. Is 
also used for exposing and invoking POJO (Plain Old Java 
Objects).Beanstalk 
 / camel-beanstalk
 
-For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
+  For working with http://aws.amazon.com/elasticbeanstalk/; 
rel="nofollow">Amazon's Beanstalk.Bean 
Validator / camel-bean-validator
 
 Validates 
the payload of a message using the Java Validation API (http://jcp.org/en/jsr/detail?id=303; 
rel="nofollow">JSR 303 and JAXP Validation) and its reference 
implementation http://docs.jboss.org/hibernate/stable/validator/reference/en/html_single/;
 rel="nofollow">Hibernate ValidatorBox / 
camel-box
 
-For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com.Braintree / camel-braintree
+For 
uploading, downloading and managing files, managing files, folders, groups, 
collaborations, etc. on Box.com. Braintree / camel-braintree
 
-Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
+  Component for interacting with Braintree 
Payments via Braintree Java SDKBrowse / 
camel-core
 
 Provides 
a simple BrowsableEndpoint 
which can be useful for testing, visualisation tools or debugging. The 
exchanges sent to the endpoint are all available to be 
browsed.Cache / 
camel-cache
@@ -157,7 +157,7 @@
 ]]>
 The cache 
component facilitates creation of caching endpoints and processors using http://ehcache.org/; 
rel="nofollow">EHCache as the cache implementation.Cassandra / camel-cassandraql
 
-For integrating with http://cassandra.apache.org/;>Apache Cassandra.Class / camel-core
+  
For 
integrating with 

[2/3] camel git commit: Rename camel-gridfs to camel-mongodb-gridfs

[dkulp]

Rename camel-gridfs to camel-mongodb-gridfs


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

Branch: refs/heads/master
Commit: b4845575fcf22e64aa35da0a971b55c35a4ebf14
Parents: 2d5000e
Author: Daniel Kulp 
Authored: Fri Mar 4 11:55:35 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Mar 4 11:55:35 2016 -0500

--
 components/camel-gridfs/.gitignore  |   3 -
 components/camel-gridfs/pom.xml |  69 
 .../camel/component/gridfs/GridFsComponent.java |  64 
 .../camel/component/gridfs/GridFsConsumer.java  | 178 -
 .../camel/component/gridfs/GridFsEndpoint.java  | 360 ---
 .../camel/component/gridfs/GridFsProducer.java  | 145 
 .../src/main/resources/META-INF/LICENSE.txt | 203 ---
 .../src/main/resources/META-INF/NOTICE.txt  |  11 -
 .../services/org/apache/camel/component/gridfs  |  18 -
 .../component/gridfs/AbstractMongoDbTest.java   |  62 
 .../gridfs/EmbedMongoConfiguration.java |  58 ---
 .../component/gridfs/GridFsConsumerTest.java|  99 -
 .../gridfs/GridFsProducerOperationsTest.java|  74 
 .../src/test/resources/log4j.properties |  37 --
 .../src/test/resources/mongodb.test.properties  |  21 --
 components/camel-mongodb-gridfs/.gitignore  |   3 +
 components/camel-mongodb-gridfs/pom.xml |  69 
 .../camel/component/gridfs/GridFsComponent.java |  64 
 .../camel/component/gridfs/GridFsConsumer.java  | 178 +
 .../camel/component/gridfs/GridFsEndpoint.java  | 360 +++
 .../camel/component/gridfs/GridFsProducer.java  | 145 
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/gridfs  |  18 +
 .../component/gridfs/AbstractMongoDbTest.java   |  62 
 .../gridfs/EmbedMongoConfiguration.java |  58 +++
 .../component/gridfs/GridFsConsumerTest.java|  99 +
 .../gridfs/GridFsProducerOperationsTest.java|  74 
 .../src/test/resources/log4j.properties |  37 ++
 .../src/test/resources/mongodb.test.properties  |  21 ++
 components/pom.xml  |   2 +-
 .../features/src/main/resources/features.xml|   4 +-
 32 files changed, 1405 insertions(+), 1405 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-gridfs/.gitignore
--
diff --git a/components/camel-gridfs/.gitignore 
b/components/camel-gridfs/.gitignore
deleted file mode 100644
index fe30fe5..000
--- a/components/camel-gridfs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-target
-*.i??
-.idea

http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-gridfs/pom.xml
--
diff --git a/components/camel-gridfs/pom.xml b/components/camel-gridfs/pom.xml
deleted file mode 100644
index ec8e6bd..000
--- a/components/camel-gridfs/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
-
-4.0.0
-
-
-org.apache.camel
-components
-2.17-SNAPSHOT
-
-
-camel-gridfs
-bundle
-Camel :: MongoDB GridFS
-Camel MongoDB GridFS component
-
-
-
org.apache.camel.component.gridfs.*
-
org.apache.camel.spi.ComponentResolver;component=gridfs
-
-
-
-
-
-org.apache.camel
-camel-core
-
-
-
-org.apache.camel
-camel-jackson
-
-
-
-org.mongodb
-mongo-java-driver
-3.2.2
-
-
-de.flapdoodle.embed
-de.flapdoodle.embed.mongo
-test
-
-   
-  org.apache.camel
-  camel-test-spring
-  test
-
-
-
-

http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
--
diff --git 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsComponent.java
deleted file mode 100644
index 62701a0..000
--- 

[3/3] camel git commit: Remove unnneeded .gitignore

[dkulp]

Remove unnneeded .gitignore


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

Branch: refs/heads/master
Commit: 39b79b97bf5690e2e3417ed2e75ae3cff330249e
Parents: b484557
Author: Daniel Kulp 
Authored: Fri Mar 4 11:56:13 2016 -0500
Committer: Daniel Kulp 
Committed: Fri Mar 4 11:56:13 2016 -0500

--
 components/camel-mongodb-gridfs/.gitignore | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/39b79b97/components/camel-mongodb-gridfs/.gitignore
--
diff --git a/components/camel-mongodb-gridfs/.gitignore 
b/components/camel-mongodb-gridfs/.gitignore
deleted file mode 100644
index fe30fe5..000
--- a/components/camel-mongodb-gridfs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-target
-*.i??
-.idea

[1/3] camel git commit: Rename camel-gridfs to camel-mongodb-gridfs

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 2d5000ea0 -> 39b79b97b


http://git-wip-us.apache.org/repos/asf/camel/blob/b4845575/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
--
diff --git 
a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
 
b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
new file mode 100644
index 000..4856a7f
--- /dev/null
+++ 
b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java
@@ -0,0 +1,360 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.gridfs;
+
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.Mongo;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.gridfs.GridFS;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@UriEndpoint(scheme = "gridfs", title = "MongoDBGridFS", syntax = 
"gridfs:connectionBean", 
+label = "database,nosql")
+public class GridFsEndpoint extends DefaultEndpoint {
+
+public enum QueryStrategy {
+TimeStamp,
+PersistentTimestamp,
+FileAttribute,
+TimeStampAndFileAttribute,
+PersistentTimestampAndFileAttribute
+};
+public static final String GRIDFS_OPERATION = "gridfs.operation";
+public static final String GRIDFS_METADATA = "gridfs.metadata";
+public static final String GRIDFS_CHUNKSIZE = "gridfs.chunksize";
+
+private static final Logger LOG = 
LoggerFactory.getLogger(GridFsEndpoint.class);
+
+@UriPath @Metadata(required = "true")
+private String connectionBean;
+@UriParam @Metadata(required = "true")
+private String database;
+@UriParam(defaultValue = GridFS.DEFAULT_BUCKET)
+private String bucket;
+@UriParam(enums = 
"ACKNOWLEDGED,W1,W2,W3,UNACKNOWLEDGED,JOURNALED,MAJORITY,SAFE")
+private WriteConcern writeConcern;
+@UriParam
+private WriteConcern writeConcernRef;
+@UriParam
+private ReadPreference readPreference;
+
+@UriParam(label = "producer")
+private String operation;
+
+@UriParam(label = "consumer")
+private String query;
+@UriParam(label = "consumer", defaultValue = "1000")
+private long initialDelay = 1000;
+@UriParam(label = "consumer", defaultValue = "500")
+private long delay = 500;
+
+@UriParam(label = "consumer", defaultValue = "TimeStamp")
+private QueryStrategy queryStrategy = QueryStrategy.TimeStamp;
+@UriParam(label = "consumer", defaultValue = "camel-timestamps")
+private String persistentTSCollection = "camel-timestamps";
+@UriParam(label = "consumer", defaultValue = "camel-timestamp")
+private String persistentTSObject = "camel-timestamp";
+@UriParam(label = "consumer", defaultValue = "camel-processed")
+private String fileAttributeName = "camel-processed";
+
+
+private Mongo mongoConnection;
+private DB db;
+private GridFS gridFs;
+private DBCollection filesCollection;
+
+public GridFsEndpoint(String uri, GridFsComponent component) {
+super(uri, component);
+}
+
+@Override
+public Producer createProducer() throws Exception {
+initializeConnection();
+return new GridFsProducer(this);
+}
+
+@Override
+public Consumer createConsumer(Processor processor) throws Exception {
+initializeConnection();
+return new GridFsConsumer(this, processor);
+}
+
+public boolean isSingleton() {
+return true;
+}
+
+@SuppressWarnings("deprecation")
+public void initializeConnection() throws Exception {
+LOG.info("Initialize GridFS endpoint: {}", this.toString());
+if 

camel git commit: Improvements to PollEnricher Tests

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 97cd326de -> 2d5000ea0


Improvements to PollEnricher Tests


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

Branch: refs/heads/master
Commit: 2d5000ea0bc16be3c7cddd6d7cec2c71772fae6b
Parents: 97cd326
Author: Andrea Cosentino 
Authored: Fri Mar 4 16:08:33 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 16:08:33 2016 +0100

--
 ...EnrichFileCustomAggregationStrategyTest.java | 53 +++-
 ...nrichFileDefaultAggregationStrategyTest.java | 52 ++-
 2 files changed, 59 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2d5000ea/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
index 4e46667..3a8bfd4 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
@@ -17,40 +17,44 @@
 package org.apache.camel.processor.enricher;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.util.List;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.junit.Test;
 
 public class PollEnrichFileCustomAggregationStrategyTest extends 
ContextTestSupport {
 
+@Override
+protected void setUp() throws Exception {
+deleteDirectory("target/enrich");
+deleteDirectory("target/enrichdata");
+super.setUp();
+}
+
 @Test
 public void testPollEnrichDefaultAggregationStrategyBody() throws 
Exception {
 
-Thread.sleep(2000);
-String enrichFilename = "target/pollEnrich/enrich.txt";
-String msgText = "Hello Camel";
-FileWriter enrichFile = new FileWriter(enrichFilename);
-enrichFile.write(msgText);
-enrichFile.close();
+getMockEndpoint("mock:start").expectedBodiesReceived("Start");
 
-getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
+MockEndpoint mock = getMockEndpoint("mock:result");
+mock.expectedBodiesReceived("Big file");
+mock.expectedFileExists("target/enrich/.done/AAA.fin");
+mock.expectedFileExists("target/enrichdata/.done/AAA.dat");
 
-assertMockEndpointsSatisfied();
+template.sendBodyAndHeader("file://target/enrich", "Start", 
Exchange.FILE_NAME, "AAA.fin");
 
-List exchanges = 
getMockEndpoint("mock:result").getExchanges();
-assertEquals(1, exchanges.size());
-Exchange ex = (Exchange) exchanges.get(0);
-assertEquals(msgText, ex.getIn().getBody().toString());
+log.info("Sleeping for 1 sec before writing enrichdata file");
+Thread.sleep(1000);
+template.sendBodyAndHeader("file://target/enrichdata", "Big file", 
Exchange.FILE_NAME, "AAA.dat");
+log.info("... write done");
 
-//This file should be deleted but it's there when the test end, so we 
have to use AssertTrue for the moment
-Thread.sleep(300);
-File markerFile = new File(enrichFilename + ".camelLock");
-assertTrue("Camel markerFile " + enrichFilename + ".camelLock did not 
get deleted after file consumption.", markerFile.exists());
+assertMockEndpointsSatisfied();
+
+// With Custom Aggregation Strategy The readLock continues to exist 
even if it should be deleted
+// assertFileDoesNotExists("target/enrichdata/AAA.dat.camelLock");
 }
 
 @Override
@@ -58,16 +62,19 @@ public class PollEnrichFileCustomAggregationStrategyTest 
extends ContextTestSupp
 return new RouteBuilder() {
 @Override
 public void configure() throws Exception {
-from("timer:foo?period=1000=1")
-.setBody().constant("Hello from Camel.")
-
.pollEnrich("file:target/pollEnrich?fileName=enrich.txt=markerFile", 
new ReplaceAggregationStrategy())
-.convertBodyTo(String.class)
-.log("The body is ${body}")
+

camel git commit: Add a couple of tests for PollEnricher

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 192a3b2bc -> 97cd326de


Add a couple of tests for PollEnricher


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

Branch: refs/heads/master
Commit: 97cd326dedf0872ce5ef910df0f8f00fc844461a
Parents: 192a3b2
Author: Andrea Cosentino 
Authored: Fri Mar 4 15:50:09 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 15:50:43 2016 +0100

--
 ...EnrichFileCustomAggregationStrategyTest.java | 83 
 ...nrichFileDefaultAggregationStrategyTest.java | 69 
 2 files changed, 152 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/97cd326d/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
new file mode 100644
index 000..4e46667
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichFileCustomAggregationStrategyTest.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.enricher;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.util.List;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.junit.Test;
+
+public class PollEnrichFileCustomAggregationStrategyTest extends 
ContextTestSupport {
+
+@Test
+public void testPollEnrichDefaultAggregationStrategyBody() throws 
Exception {
+
+Thread.sleep(2000);
+String enrichFilename = "target/pollEnrich/enrich.txt";
+String msgText = "Hello Camel";
+FileWriter enrichFile = new FileWriter(enrichFilename);
+enrichFile.write(msgText);
+enrichFile.close();
+
+getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
+
+assertMockEndpointsSatisfied();
+
+List exchanges = 
getMockEndpoint("mock:result").getExchanges();
+assertEquals(1, exchanges.size());
+Exchange ex = (Exchange) exchanges.get(0);
+assertEquals(msgText, ex.getIn().getBody().toString());
+
+//This file should be deleted but it's there when the test end, so we 
have to use AssertTrue for the moment
+Thread.sleep(300);
+File markerFile = new File(enrichFilename + ".camelLock");
+assertTrue("Camel markerFile " + enrichFilename + ".camelLock did not 
get deleted after file consumption.", markerFile.exists());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("timer:foo?period=1000=1")
+.setBody().constant("Hello from Camel.")
+
.pollEnrich("file:target/pollEnrich?fileName=enrich.txt=markerFile", 
new ReplaceAggregationStrategy())
+.convertBodyTo(String.class)
+.log("The body is ${body}")
+.to("mock:result");
+}
+};
+}
+
+class ReplaceAggregationStrategy implements AggregationStrategy {
+
+public Exchange aggregate(Exchange original, Exchange resource) {
+Object resourceResponse = resource.getIn().getBody();
+if (original.getPattern().isOutCapable()) {
+original.getOut().setBody(resourceResponse);
+} else {
+

[2/3] camel git commit: Deprecated those mvn archetypes

[davsclaus]

Deprecated those mvn archetypes


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

Branch: refs/heads/master
Commit: 77be4fae958375a133f4da3a674ae47355cd2ea1
Parents: df09287
Author: Claus Ibsen 
Authored: Fri Mar 4 15:40:08 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:40:08 2016 +0100

--
 .../archetypes/camel-archetype-cxf-code-first-blueprint/pom.xml| 2 +-
 .../camel-archetype-cxf-contract-first-blueprint/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/77be4fae/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/pom.xml 
b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/pom.xml
index 91d9e33..cd871e3 100644
--- a/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/pom.xml
+++ b/tooling/archetypes/camel-archetype-cxf-code-first-blueprint/pom.xml
@@ -29,7 +29,7 @@
 
   org.apache.camel.archetypes
   camel-archetype-cxf-code-first-blueprint
-  Camel :: Archetypes :: CXF :: Code First :: Blueprint (OSGi)
+  Camel :: Archetypes :: CXF :: Code First :: Blueprint (OSGi) 
(deprecated)
   Creates a new Camel project with Apache CXF code-first example 
using OSGi blueprint.
   maven-archetype
 

http://git-wip-us.apache.org/repos/asf/camel/blob/77be4fae/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/pom.xml 
b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/pom.xml
index 0d4c25a..544a428 100644
--- a/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/pom.xml
+++ b/tooling/archetypes/camel-archetype-cxf-contract-first-blueprint/pom.xml
@@ -29,7 +29,7 @@
 
   org.apache.camel.archetypes
   camel-archetype-cxf-contract-first-blueprint
-  Camel :: Archetypes :: CXF :: Contract First :: Blueprint (OSGi)
+  Camel :: Archetypes :: CXF :: Contract First :: Blueprint (OSGi) 
(deprecated)
   Creates a new Camel project with Apache CXF contract-first 
example using OSGi blueprint.
   maven-archetype
 

[3/3] 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/192a3b2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/192a3b2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/192a3b2b

Branch: refs/heads/master
Commit: 192a3b2bc7f8e161c0853bb4f9c356a6f1bc3898
Parents: 77be4fa
Author: Claus Ibsen 
Authored: Fri Mar 4 15:40:43 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:40:43 2016 +0100

--
 .../camel/processor/resequencer/ResequencerBatchOrderTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/192a3b2b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
index 0bfc82d..e677b9c 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[1/3] camel git commit: CAMEL-9667: Added unit test.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 59939fddd -> 192a3b2bc


CAMEL-9667: Added unit test.


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

Branch: refs/heads/master
Commit: df092872f124a9682ac15e65d3920021035cd7d9
Parents: 59939fd
Author: Claus Ibsen 
Authored: Fri Mar 4 15:38:01 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:38:01 2016 +0100

--
 .../apache/camel/processor/BatchProcessor.java  | 11 +--
 .../resequencer/ResequencerBatchOrderTest.java  | 73 
 2 files changed, 79 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/df092872/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java 
b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
index f7056e0..f6059ba 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -335,7 +336,7 @@ public class BatchProcessor extends ServiceSupport 
implements AsyncProcessor, Na
 
 private Queue queue;
 private Lock queueLock = new ReentrantLock();
-private boolean exchangeEnqueued;
+private final AtomicBoolean exchangeEnqueued = new AtomicBoolean();
 private final Queue completionPredicateMatched = new 
ConcurrentLinkedQueue();
 private Condition exchangeEnqueuedCondition = queueLock.newCondition();
 
@@ -372,7 +373,7 @@ public class BatchProcessor extends ServiceSupport 
implements AsyncProcessor, Na
 try {
 do {
 try {
-if (!exchangeEnqueued) {
+if (!exchangeEnqueued.get()) {
 LOG.trace("Waiting for new exchange to arrive or 
batchTimeout to occur after {} ms.", batchTimeout);
 exchangeEnqueuedCondition.await(batchTimeout, 
TimeUnit.MILLISECONDS);
 }
@@ -383,7 +384,7 @@ public class BatchProcessor extends ServiceSupport 
implements AsyncProcessor, Na
 id = completionPredicateMatched.poll();
 }
 
-if (id != null || !exchangeEnqueued) {
+if (id != null || !exchangeEnqueued.get()) {
 if (id != null) {
 LOG.trace("Collecting exchanges to be 
aggregated triggered by completion predicate");
 } else {
@@ -391,7 +392,7 @@ public class BatchProcessor extends ServiceSupport 
implements AsyncProcessor, Na
 }
 drainQueueTo(collection, batchSize, id);
 } else {
-exchangeEnqueued = false;
+exchangeEnqueued.set(false);
 boolean drained = false;
 while (isInBatchCompleted(queue.size())) {
 drained = true;
@@ -471,7 +472,7 @@ public class BatchProcessor extends ServiceSupport 
implements AsyncProcessor, Na
 }
 }
 queue.add(exchange);
-exchangeEnqueued = true;
+exchangeEnqueued.set(true);
 exchangeEnqueuedCondition.signal();
 } finally {
 queueLock.unlock();

http://git-wip-us.apache.org/repos/asf/camel/blob/df092872/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
new file mode 100644
index 000..0bfc82d
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerBatchOrderTest.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one 

[1/2] camel git commit: CAMEL-9664: Fixed mediatype matching to use equals method and ignore parameters.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 5cd27e2d2 -> c272e40bc
  refs/heads/master af8c3283a -> 59939fddd


CAMEL-9664: Fixed mediatype matching to use equals method and ignore parameters.


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

Branch: refs/heads/master
Commit: 59939fddd703f0880268ee1dc33fded2dc54cd9e
Parents: af8c328
Author: Claus Ibsen 
Authored: Fri Mar 4 15:10:23 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:10:23 2016 +0100

--
 .../apache/camel/component/restlet/DefaultRestletBinding.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/59939fdd/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index 57037e4..b95ef7a 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -119,7 +119,7 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 }
 
 // only deal with the form if the content type is 
"application/x-www-form-urlencoded"
-if (request.getEntity().getMediaType() != null && 
request.getEntity().getMediaType().equals(MediaType.APPLICATION_WWW_FORM)) {
+if (request.getEntity().getMediaType() != null && 
request.getEntity().getMediaType().equals(MediaType.APPLICATION_WWW_FORM, 
true)) {
 Form form = new Form(request.getEntity());
 for (String paramName : form.getValuesMap().keySet()) {
 String[] values = form.getValuesArray(paramName);
@@ -161,7 +161,7 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 
 Form form = null;
 // Use forms only for PUT, POST and x-www-form-urlencoded
-if ((Method.PUT == method || Method.POST == method) && mediaType == 
MediaType.APPLICATION_WWW_FORM) {
+if ((Method.PUT == method || Method.POST == method) && 
MediaType.APPLICATION_WWW_FORM.equals(mediaType, true)) {
 form = new Form();
 // must use string based for forms
 String body = exchange.getIn().getBody(String.class);

[2/2] camel git commit: CAMEL-9664: Fixed mediatype matching to use equals method and ignore parameters.

[davsclaus]

CAMEL-9664: Fixed mediatype matching to use equals method and ignore parameters.


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

Branch: refs/heads/camel-2.16.x
Commit: c272e40bccc6b424983140b8dad39adb0df9b53f
Parents: 5cd27e2
Author: Claus Ibsen 
Authored: Fri Mar 4 15:10:23 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:10:43 2016 +0100

--
 .../apache/camel/component/restlet/DefaultRestletBinding.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c272e40b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index a106104..80ddd4c 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -119,7 +119,7 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 }
 
 // only deal with the form if the content type is 
"application/x-www-form-urlencoded"
-if (request.getEntity().getMediaType() != null && 
request.getEntity().getMediaType().equals(MediaType.APPLICATION_WWW_FORM)) {
+if (request.getEntity().getMediaType() != null && 
request.getEntity().getMediaType().equals(MediaType.APPLICATION_WWW_FORM, 
true)) {
 Form form = new Form(request.getEntity());
 for (String paramName : form.getValuesMap().keySet()) {
 String[] values = form.getValuesArray(paramName);
@@ -161,7 +161,7 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 
 Form form = null;
 // Use forms only for PUT, POST and x-www-form-urlencoded
-if ((Method.PUT == method || Method.POST == method) && mediaType == 
MediaType.APPLICATION_WWW_FORM) {
+if ((Method.PUT == method || Method.POST == method) && 
MediaType.APPLICATION_WWW_FORM.equals(mediaType, true)) {
 form = new Form();
 // must use string based for forms
 String body = exchange.getIn().getBody(String.class);

[08/11] 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/366ccefb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/366ccefb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/366ccefb

Branch: refs/heads/master
Commit: 366ccefb143e8b2b7f4a0d980fc814a1d6282ce0
Parents: 3500b83
Author: Claus Ibsen 
Authored: Fri Mar 4 14:33:55 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:33:55 2016 +0100

--
 .../apache/camel/component/sparkrest/SparkConfiguration.java   | 6 +++---
 .../org/apache/camel/component/sparkrest/SparkConsumer.java| 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/366ccefb/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConfiguration.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConfiguration.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConfiguration.java
index 4ed3574..9f6d866 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConfiguration.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConfiguration.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/366ccefb/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
index 5419d99..4b41523 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[02/11] 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/3a172f74
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a172f74
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a172f74

Branch: refs/heads/master
Commit: 3a172f74a9fe1931ec488be71b66a3999cc3ceb0
Parents: b8e2604
Author: Claus Ibsen 
Authored: Fri Mar 4 14:02:59 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:02:59 2016 +0100

--
 .../netty4/http/NettyHttpRedeliveryTest.java| 26 ++--
 1 file changed, 13 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3a172f74/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
index 0f65024..cab7d8f 100644
--- 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.netty4.http;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -50,22 +49,23 @@ public class NettyHttpRedeliveryTest extends BaseNettyTest {
 @Override
 public void configure() throws Exception {
 onException(Exception.class)
-
.maximumRedeliveries(50).redeliveryDelay(100).onExceptionOccurred(new 
Processor() {
-@Override
-public void process(Exchange exchange) throws Exception {
-// signal to start the route (after 5 attempts)
-latch.countDown();
-// and there is only 1 inflight
-assertEquals(1, 
context.getInflightRepository().size());
-}
-});
+
.maximumRedeliveries(50).redeliveryDelay(100).onExceptionOccurred(
+new Processor() {
+@Override
+public void process(Exchange exchange) throws 
Exception {
+// signal to start the route (after 5 attempts)
+latch.countDown();
+// and there is only 1 inflight
+assertEquals(1, 
context.getInflightRepository().size());
+}
+});
 
 from("timer:foo").routeId("foo")
-
.to("netty4-http:http://0.0.0.0:{{port}}/bar?keepAlive=false=true;)
-.to("mock:result");
+
.to("netty4-http:http://0.0.0.0:{{port}}/bar?keepAlive=false=true;)
+.to("mock:result");
 
 
from("netty4-http:http://0.0.0.0:{{port}}/bar;).routeId("bar").autoStartup(false)
-.setBody().constant("Bye World");
+.setBody().constant("Bye World");
 }
 };
 }

[11/11] 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/af8c3283
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af8c3283
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af8c3283

Branch: refs/heads/master
Commit: af8c3283a55161d836c61f2d78c4b188dbd2db62
Parents: 93483a7
Author: Claus Ibsen 
Authored: Fri Mar 4 15:00:24 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 15:00:24 2016 +0100

--
 .../main/java/org/apache/camel/example/spark/UserMain.java| 6 +-
 .../org/apache/camel/example/widget/WidgetApplication.java| 7 ++-
 .../main/java/org/apache/camel/example/widget/WidgetMain.java | 6 +-
 3 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/af8c3283/examples/camel-example-spark-rest/src/main/java/org/apache/camel/example/spark/UserMain.java
--
diff --git 
a/examples/camel-example-spark-rest/src/main/java/org/apache/camel/example/spark/UserMain.java
 
b/examples/camel-example-spark-rest/src/main/java/org/apache/camel/example/spark/UserMain.java
index 0220ec0..9608f5f 100644
--- 
a/examples/camel-example-spark-rest/src/main/java/org/apache/camel/example/spark/UserMain.java
+++ 
b/examples/camel-example-spark-rest/src/main/java/org/apache/camel/example/spark/UserMain.java
@@ -18,7 +18,11 @@ package org.apache.camel.example.spark;
 
 import org.apache.camel.main.Main;
 
-public class UserMain {
+public final class UserMain {
+
+private UserMain() {
+// to comply with checkstyle rule
+}
 
 public static void main(String[] args) throws Exception {
 Main main = new Main();

http://git-wip-us.apache.org/repos/asf/camel/blob/af8c3283/examples/camel-example-widget-gadget-cdi/src/main/java/org/apache/camel/example/widget/WidgetApplication.java
--
diff --git 
a/examples/camel-example-widget-gadget-cdi/src/main/java/org/apache/camel/example/widget/WidgetApplication.java
 
b/examples/camel-example-widget-gadget-cdi/src/main/java/org/apache/camel/example/widget/WidgetApplication.java
index 88e7f98..d21e988 100644
--- 
a/examples/camel-example-widget-gadget-cdi/src/main/java/org/apache/camel/example/widget/WidgetApplication.java
+++ 
b/examples/camel-example-widget-gadget-cdi/src/main/java/org/apache/camel/example/widget/WidgetApplication.java
@@ -23,7 +23,12 @@ import org.apache.activemq.camel.component.ActiveMQComponent;
 /**
  * To configure the widget-gadget application
  */
-public class WidgetApplication {
+public final class WidgetApplication {
+
+private WidgetApplication() {
+
+// to comply with checkstyle
+}
 
 /**
  * Factory to create the {@link ActiveMQComponent} which is used in this 
application

http://git-wip-us.apache.org/repos/asf/camel/blob/af8c3283/examples/camel-example-widget-gadget-java/src/main/java/org/apache/camel/example/widget/WidgetMain.java
--
diff --git 
a/examples/camel-example-widget-gadget-java/src/main/java/org/apache/camel/example/widget/WidgetMain.java
 
b/examples/camel-example-widget-gadget-java/src/main/java/org/apache/camel/example/widget/WidgetMain.java
index 420e483..3400c67 100644
--- 
a/examples/camel-example-widget-gadget-java/src/main/java/org/apache/camel/example/widget/WidgetMain.java
+++ 
b/examples/camel-example-widget-gadget-java/src/main/java/org/apache/camel/example/widget/WidgetMain.java
@@ -22,11 +22,15 @@ import org.apache.camel.main.Main;
 /**
  * A plain Java Main to start the widget and gadget example.
  */
-public class WidgetMain {
+public final class WidgetMain {
 
 // use Camel Main to setup and run Camel
 private static Main main = new Main();
 
+private WidgetMain() {
+// to comply with checkstyle
+}
+
 public static void main(String[] args) throws Exception {
 // create the ActiveMQ component
 main.bind("activemq", createActiveMQComponent());

[06/11] 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/8592aaa6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8592aaa6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8592aaa6

Branch: refs/heads/master
Commit: 8592aaa6408b207bf8dedcdc8339bee57f98736f
Parents: 1de99e9
Author: Claus Ibsen 
Authored: Fri Mar 4 14:31:10 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:31:10 2016 +0100

--
 .../org/apache/camel/builder/script/JavaScriptLanguage.java| 6 +++---
 .../main/java/org/apache/camel/builder/script/PhpLanguage.java | 6 +++---
 .../java/org/apache/camel/builder/script/PythonLanguage.java   | 6 +++---
 .../java/org/apache/camel/builder/script/RubyLanguage.java | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8592aaa6/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScriptLanguage.java
--
diff --git 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScriptLanguage.java
 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScriptLanguage.java
index e6a7d80..3b2e403 100644
--- 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScriptLanguage.java
+++ 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScriptLanguage.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/8592aaa6/components/camel-script/src/main/java/org/apache/camel/builder/script/PhpLanguage.java
--
diff --git 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/PhpLanguage.java
 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/PhpLanguage.java
index 2cd015a..3275442 100644
--- 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/PhpLanguage.java
+++ 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/PhpLanguage.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/8592aaa6/components/camel-script/src/main/java/org/apache/camel/builder/script/PythonLanguage.java
--
diff --git 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/PythonLanguage.java
 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/PythonLanguage.java
index 57bf701..7c20e18 100644
--- 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/PythonLanguage.java
+++ 
b/components/camel-script/src/main/java/org/apache/camel/builder/script/PythonLanguage.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/8592aaa6/components/camel-script/src/main/java/org/apache/camel/builder/script/RubyLanguage.java
--
diff --git 
a/components/camel-script/src/main/java/org/apache/camel/builder/script/RubyLanguage.java
 

[01/11] camel git commit: Fixed CS. Break up to smaller methods.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master ab7d838b4 -> af8c3283a


Fixed CS. Break up to smaller methods.


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

Branch: refs/heads/master
Commit: b8e2604d92c9ef7454a67452a4154791433762a6
Parents: ab7d838
Author: Claus Ibsen 
Authored: Fri Mar 4 13:51:57 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 13:51:57 2016 +0100

--
 .../apache/camel/swagger/RestSwaggerReader.java | 230 ++-
 1 file changed, 119 insertions(+), 111 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b8e2604d/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
--
diff --git 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index bc01e37..e3e65ef 100644
--- 
a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ 
b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -151,6 +151,10 @@ public class RestSwaggerReader {
 appendModels(clazz, swagger);
 }
 
+doParseVerbs(swagger, rest, camelContextId, verbs, pathAsTag);
+}
+
+private void doParseVerbs(Swagger swagger, RestDefinition rest, String 
camelContextId, List verbs, String pathAsTag) {
 // used during gathering of apis
 List paths = new ArrayList<>();
 
@@ -291,128 +295,132 @@ public class RestSwaggerReader {
 }
 
 // enrich with configured response messages from the rest-dsl
-for (RestOperationResponseMsgDefinition msg : 
verb.getResponseMsgs()) {
-Response response = null;
-if (op.getResponses() != null) {
-response = op.getResponses().get(msg.getCode());
-}
-if (response == null) {
-response = new Response();
-}
-if (ObjectHelper.isNotEmpty(msg.getResponseModel())) {
-Property prop = 
modelTypeAsProperty(msg.getResponseModel(), swagger);
-response.setSchema(prop);
-}
-response.setDescription(msg.getMessage());
-
-// add headers
-if (msg.getHeaders() != null) {
-for (RestOperationResponseHeaderDefinition header : 
msg.getHeaders()) {
-String name = header.getName();
-String type = header.getDataType();
-if ("string".equals(type)) {
-StringProperty sp = new StringProperty();
-sp.setName(name);
-sp.setDescription(header.getDescription());
-if (header.getAllowableValues() != null) {
-sp.setEnum(header.getAllowableValues());
+doParseResponseMessages(swagger, verb, op);
+
+// add path
+swagger.path(opPath, path);
+}
+}
+
+private void doParseResponseMessages(Swagger swagger, VerbDefinition verb, 
Operation op) {
+for (RestOperationResponseMsgDefinition msg : verb.getResponseMsgs()) {
+Response response = null;
+if (op.getResponses() != null) {
+response = op.getResponses().get(msg.getCode());
+}
+if (response == null) {
+response = new Response();
+}
+if (ObjectHelper.isNotEmpty(msg.getResponseModel())) {
+Property prop = modelTypeAsProperty(msg.getResponseModel(), 
swagger);
+response.setSchema(prop);
+}
+response.setDescription(msg.getMessage());
+
+// add headers
+if (msg.getHeaders() != null) {
+for (RestOperationResponseHeaderDefinition header : 
msg.getHeaders()) {
+String name = header.getName();
+String type = header.getDataType();
+if ("string".equals(type)) {
+StringProperty sp = new StringProperty();
+sp.setName(name);
+sp.setDescription(header.getDescription());
+if (header.getAllowableValues() != null) {
+sp.setEnum(header.getAllowableValues());
+}
+

[10/11] 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/93483a71
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93483a71
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93483a71

Branch: refs/heads/master
Commit: 93483a71f66b34cfacb41c9faefd31a39b35b8bd
Parents: 69c0182
Author: Claus Ibsen 
Authored: Fri Mar 4 14:46:14 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:46:14 2016 +0100

--
 .../camel/component/spring/ws/SpringWebserviceEndpoint.java   | 6 +++---
 .../camel/springboot/commands/crsh/CamelCommandsFacade.java   | 7 +++
 2 files changed, 6 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/93483a71/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
--
diff --git 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
index 10c2262..6dc51aa 100644
--- 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
+++ 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/camel/blob/93483a71/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
--
diff --git 
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
 
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
index 8bd71b6..68fcd6f 100644
--- 
a/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
+++ 
b/platforms/commands/commands-spring-boot/src/main/java/org/apache/camel/springboot/commands/crsh/CamelCommandsFacade.java
@@ -110,7 +110,7 @@ public class CamelCommandsFacade {
 
 if (contextNames.size() != 1) {
 StringBuffer error = new StringBuffer();
-error.append("Cannot infer Camel Context. Please provide 
manually.");
+error.append("Cannot infer CamelContext. Please provide 
manually.");
 
 if (contextNames.size() > 1) {
 error.append(" Contexts : " + contextNames.toString());
@@ -123,9 +123,8 @@ public class CamelCommandsFacade {
 }
 
 private String getFirstCamelContextName() throws Exception {
-if (null == camelController.getLocalCamelContexts() ||
-camelController.getLocalCamelContexts().size() == 0) {
-throw new org.crsh.cli.impl.SyntaxException("No camel contexts 
available");
+if (camelController.getLocalCamelContexts() == null || 
camelController.getLocalCamelContexts().size() == 0) {
+throw new org.crsh.cli.impl.SyntaxException("No CamelContexts 
available");
 }
 
 return camelController.getLocalCamelContexts().get(0).getName();

[03/11] 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/39543f18
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39543f18
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39543f18

Branch: refs/heads/master
Commit: 39543f188111b79d2a78de761fd75cc26241df31
Parents: 3a172f7
Author: Claus Ibsen 
Authored: Fri Mar 4 14:08:18 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:08:18 2016 +0100

--
 .../main/java/org/apache/camel/component/boon/BoonDataFormat.java  | 2 +-
 .../main/java/org/apache/camel/component/gora/GoraOperation.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/39543f18/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java
--
diff --git 
a/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java
 
b/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java
index fc6fa0b..5e9f7cd 100644
--- 
a/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java
+++ 
b/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java
@@ -94,7 +94,7 @@ public class BoonDataFormat extends ServiceSupport implements 
DataFormat, DataFo
 @Override
 protected void doStart() throws Exception {
 if (useList) {
-   useList();
+useList();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/39543f18/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
--
diff --git 
a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
 
b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
index 400c186..244ba86 100644
--- 
a/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
+++ 
b/components/camel-gora/src/main/java/org/apache/camel/component/gora/GoraOperation.java
@@ -74,7 +74,7 @@ public enum GoraOperation {
 /**
  * Enum constructor
  */
- GoraOperation(final String str) {
+GoraOperation(final String str) {
 value = str;
 }
 }

[07/11] 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/3500b833
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3500b833
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3500b833

Branch: refs/heads/master
Commit: 3500b833f9b12d95eb70dea38ee6c8275a3e3773
Parents: 8592aaa
Author: Claus Ibsen 
Authored: Fri Mar 4 14:33:15 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:33:15 2016 +0100

--
 .../java/org/apache/camel/component/solr/SolrEndpoint.java  | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3500b833/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
--
diff --git 
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
 
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
index 56f9b3e..dd29913 100644
--- 
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
+++ 
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrEndpoint.java
@@ -40,7 +40,8 @@ public class SolrEndpoint extends DefaultEndpoint {
 
 private String scheme = "http://;;
 
-@UriPath(description = "Hostname and port for the solr server") 
@Metadata(required = "true")
+@UriPath(description = "Hostname and port for the solr server")
+@Metadata(required = "true")
 private String url;
 @UriParam(defaultValue = "" + SolrConstants.DEFUALT_STREAMING_QUEUE_SIZE)
 private int streamingQueueSize = 
SolrConstants.DEFUALT_STREAMING_QUEUE_SIZE;
@@ -103,16 +104,16 @@ public class SolrEndpoint extends DefaultEndpoint {
 public SolrComponent getComponent() {
 return (SolrComponent) super.getComponent();
 }
-
+
 private CloudSolrClient getCloudServer() {
-   CloudSolrClient rVal = null;
+CloudSolrClient rVal = null;
 if (this.getZkHost() != null && this.getCollection() != null) {
 rVal = new CloudSolrClient(zkHost);
 rVal.setDefaultCollection(this.getCollection());
 }
 return rVal;
 }
-
+
 @Override
 public Producer createProducer() throws Exception {
 // do we have servers?

[04/11] 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/aace1744
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aace1744
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aace1744

Branch: refs/heads/master
Commit: aace1744f9ffa4527394900d9e7701eb486d711b
Parents: 39543f1
Author: Claus Ibsen 
Authored: Fri Mar 4 14:23:28 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:23:28 2016 +0100

--
 .../component/mllp/MllpTcpClientProducer.java   | 64 ++--
 .../component/mllp/MllpTcpServerConsumer.java   |  6 +-
 .../camel/component/mllp/impl/MllpUtil.java |  4 +-
 ...llpTcpClientProducerAcknowledgementTest.java |  4 +-
 .../MllpTcpServerConsumerBindTimeoutTest.java   |  4 +-
 .../MllpTcpServerConsumerBlueprintTest.java |  7 +--
 .../junit/rule/mllp/MllpServerResource.java | 54 -
 7 files changed, 68 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/aace1744/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
--
diff --git 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 17979c4..2e74f6c 100644
--- 
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++ 
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -150,39 +150,39 @@ public class MllpTcpClientProducer extends 
DefaultProducer {
 } else {
 String acknowledgemenTypeString;
 switch (acknowledgementBytes[i + 6]) {
-case bA:
-// We have an AA or CA- make sure 
that's the end of the field
-if (fieldDelim != 
acknowledgementBytes[i + 7]) {
-exchange.setException(new 
MllpInvalidAcknowledgementException(new String(acknowledgementBytes)));
-}
-if (bA == acknowledgementBytes[i + 5]) 
{
-
message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AA");
-} else {
-
message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "CA");
-}
-break;
-case bE:
-// We have an AE or CE
-if (bA == acknowledgementBytes[i + 5]) 
{
-
message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AE");
-exchange.setException(new 
MllpApplicationErrorAcknowledgementException(new String(acknowledgementBytes)));
-} else {
-
message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "CE");
-exchange.setException(new 
MllpCommitErrorAcknowledgementException(new String(acknowledgementBytes)));
-}
-break;
-case bR:
-// We have an AR or CR
-if (bA == acknowledgementBytes[i + 5]) 
{
-
message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "AR");
-exchange.setException(new 
MllpApplicationRejectAcknowledgementException(new 
String(acknowledgementBytes)));
-} else {
-
message.setHeader(MLLP_ACKNOWLEDGEMENT_TYPE, "CR");
-exchange.setException(new 
MllpCommitRejectAcknowledgementException(new String(acknowledgementBytes)));
-}
-break;
-default:
+case bA:
+// We have an AA or CA- make sure that's 
the end of the field
+if (fieldDelim != acknowledgementBytes[i + 
7]) {
 exchange.setException(new 
MllpInvalidAcknowledgementException(new 

[05/11] 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/1de99e9d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1de99e9d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1de99e9d

Branch: refs/heads/master
Commit: 1de99e9da7d74aad6a00f9c55cdd084454e9b691
Parents: aace174
Author: Claus Ibsen 
Authored: Fri Mar 4 14:29:40 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 14:29:40 2016 +0100

--
 .../xslt/extensions/MyExtensionFunction1.java   | 57 +-
 .../xslt/extensions/MyExtensionFunction2.java   | 63 ++--
 .../SaxonSpringExtensionFunctionsTest.java  |  2 +-
 3 files changed, 60 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1de99e9d/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java
--
diff --git 
a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java
 
b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java
index 251f7a0..f0130bb 100644
--- 
a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java
+++ 
b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.xslt.extensions;
 
 import net.sf.saxon.expr.XPathContext;
@@ -33,11 +32,11 @@ import org.slf4j.LoggerFactory;
 
 public class MyExtensionFunction1 extends ExtensionFunctionDefinition {
 
-   private static final long serialVersionUID = 1L;
-   
-   private static final Logger LOG = 
LoggerFactory.getLogger(MyExtensionFunction1.class);
+private static final long serialVersionUID = 1L;
+
+private static final Logger LOG = 
LoggerFactory.getLogger(MyExtensionFunction1.class);
 
-   @Override
+@Override
 public StructuredQName getFunctionQName() {
 return new StructuredQName("", "http://mytest/;, 
"myExtensionFunction1");
 }
@@ -54,37 +53,37 @@ public class MyExtensionFunction1 extends 
ExtensionFunctionDefinition {
 
 @Override
 public SequenceType[] getArgumentTypes() {
-return new SequenceType[] { SequenceType.SINGLE_INTEGER, 
SequenceType.SINGLE_INTEGER };
+return new SequenceType[]{SequenceType.SINGLE_INTEGER, 
SequenceType.SINGLE_INTEGER};
 }
 
 @Override
 public SequenceType getResultType(SequenceType[] suppliedArgumentTypes) {
-   int resultCardinality = 1;
-   return 
SequenceType.makeSequenceType(SequenceType.SINGLE_INTEGER.getPrimaryType(), 
resultCardinality);
+int resultCardinality = 1;
+return 
SequenceType.makeSequenceType(SequenceType.SINGLE_INTEGER.getPrimaryType(), 
resultCardinality);
 }
 
 @Override
 public ExtensionFunctionCall makeCallExpression() {
-   return new ExtensionFunctionCall() {
-   private static final long serialVersionUID = 1L;
+return new ExtensionFunctionCall() {
+private static final long serialVersionUID = 1L;
+
+@Override
+public Sequence call(XPathContext xPathContext, Sequence[] 
arguments) throws XPathException {
+// 1st argument (mandatory, index 0)
+Int64Value arg1 = (Int64Value) arguments[0].iterate().next();
+int arg1Int = arg1.getDecimalValue().toBigInteger().intValue();
 
-   @Override
-   public Sequence call(XPathContext xPathContext, Sequence[] 
arguments) throws XPathException {
-   // 1st argument (mandatory, index 0)
-   Int64Value arg1 = (Int64Value) 
arguments[0].iterate().next();
-   int arg1Int = 
arg1.getDecimalValue().toBigInteger().intValue();
-   
-   // 2nd argument (mandatory, index 1)
-   Int64Value arg2 = (Int64Value) 
arguments[1].iterate().next();
-   int arg2Int = 
arg2.getDecimalValue().toBigInteger().intValue();
-   
-   // Functionality goes here
-   int resultInt = arg1Int + arg2Int;
-   
-   Item result = new Int64Value(resultInt);
-   return 

[1/2] camel git commit: Added test based on user forum issue

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 642f16b7b -> ab7d838b4


Added test based on user forum issue


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

Branch: refs/heads/master
Commit: f23d56258a63fa5e5e40d7bf745fe4a39c4c3e01
Parents: 642f16b
Author: Claus Ibsen 
Authored: Fri Mar 4 13:38:17 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 13:38:17 2016 +0100

--
 .../netty4/http/NettyHttpRedeliveryTest.java| 73 
 .../src/test/resources/log4j.properties |  8 +--
 2 files changed, 77 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f23d5625/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
--
diff --git 
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
new file mode 100644
index 000..0f65024
--- /dev/null
+++ 
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.netty4.http;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class NettyHttpRedeliveryTest extends BaseNettyTest {
+
+private final CountDownLatch latch = new CountDownLatch(5);
+
+@Test
+public void testHttpRedelivery() throws Exception {
+getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+assertTrue(latch.await(5, TimeUnit.SECONDS));
+
+context.startRoute("bar");
+
+assertMockEndpointsSatisfied();
+
+context.stopRoute("foo");
+
+assertEquals(0, context.getInflightRepository().size());
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+onException(Exception.class)
+
.maximumRedeliveries(50).redeliveryDelay(100).onExceptionOccurred(new 
Processor() {
+@Override
+public void process(Exchange exchange) throws Exception {
+// signal to start the route (after 5 attempts)
+latch.countDown();
+// and there is only 1 inflight
+assertEquals(1, 
context.getInflightRepository().size());
+}
+});
+
+from("timer:foo").routeId("foo")
+
.to("netty4-http:http://0.0.0.0:{{port}}/bar?keepAlive=false=true;)
+.to("mock:result");
+
+
from("netty4-http:http://0.0.0.0:{{port}}/bar;).routeId("bar").autoStartup(false)
+.setBody().constant("Bye World");
+}
+};
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/f23d5625/components/camel-netty4-http/src/test/resources/log4j.properties
--
diff --git a/components/camel-netty4-http/src/test/resources/log4j.properties 
b/components/camel-netty4-http/src/test/resources/log4j.properties
index a9d61c7..6c00420 100644
--- a/components/camel-netty4-http/src/test/resources/log4j.properties
+++ b/components/camel-netty4-http/src/test/resources/log4j.properties
@@ -30,14 +30,14 @@ 

[2/2] 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/ab7d838b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab7d838b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab7d838b

Branch: refs/heads/master
Commit: ab7d838b44f4dcf766cf49333cda365fad6a6151
Parents: f23d562
Author: Claus Ibsen 
Authored: Fri Mar 4 13:42:27 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 13:42:27 2016 +0100

--
 .../src/main/java/org/apache/camel/builder/DataFormatClause.java  | 3 ++-
 .../java/org/apache/camel/model/dataformat/YAMLDataFormat.java| 2 +-
 .../main/java/org/apache/camel/model/dataformat/YAMLLibrary.java  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ab7d838b/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 33b5403..cb92335 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;
@@ -59,7 +61,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}

http://git-wip-us.apache.org/repos/asf/camel/blob/ab7d838b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
index 77be7a6..9b06c1c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.

http://git-wip-us.apache.org/repos/asf/camel/blob/ab7d838b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
index 4f47b3a..75b3bb6 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.

camel git commit: [CAMEL-9657] Move container management of camel contexts to start method

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 45475b357 -> 642f16b7b


[CAMEL-9657] Move container management of camel contexts to start method


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

Branch: refs/heads/master
Commit: 642f16b7b90328a48e784f9a3aaa8ead14420791
Parents: 45475b3
Author: James Netherton 
Authored: Tue Mar 1 20:51:05 2016 +
Committer: Claus Ibsen 
Committed: Fri Mar 4 11:54:33 2016 +0100

--
 .../apache/camel/impl/DefaultCamelContext.java| 14 --
 .../main/java/org/apache/camel/spi/Container.java | 18 +-
 .../java/org/apache/camel/spi/ContainerTest.java  |  9 +
 3 files changed, 26 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/642f16b7/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index d0c2c37..dd397b4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -295,9 +295,6 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 // Call all registered trackers with this context
 // Note, this may use a partially constructed object
 CamelContextTrackerRegistry.INSTANCE.contextCreated(this);
-
-// [TODO] Remove in 3.0
-Container.Instance.manage(this);
 }
 
 /**
@@ -898,7 +895,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 
 return answer;
 }
-
+
 public synchronized void addRouteDefinitions(Collection 
routeDefinitions) throws Exception {
 if (routeDefinitions == null || routeDefinitions.isEmpty()) {
 return;
@@ -2521,7 +2518,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 }
 
 public void addRestConfiguration(RestConfiguration restConfiguration) {
-restConfigurations.put(restConfiguration.getComponent(), 
restConfiguration);
+restConfigurations.put(restConfiguration.getComponent(), 
restConfiguration);
 }
 public RestConfiguration getRestConfiguration(String component, boolean 
defaultIfNotExist) {
 if (component == null) {
@@ -2537,7 +2534,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 }
 return config;
 }
-
+
 public List getInterceptStrategies() {
 return interceptStrategies;
 }
@@ -2796,6 +2793,11 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 stopWatch.restart();
 log.info("Apache Camel " + getVersion() + " (CamelContext: " + 
getName() + ") is starting");
 
+// Note: This is done on context start as we want to avoid doing it 
during object construction
+// where we could be dealing with CDI proxied camel contexts which may 
never be started (CAMEL-9657)
+// [TODO] Remove in 3.0
+Container.Instance.manage(this);
+
 doNotStartRoutesOnFirstStart = !firstStartDone && !isAutoStartup();
 
 // if the context was configured with auto startup = false, and we are 
already started,

http://git-wip-us.apache.org/repos/asf/camel/blob/642f16b7/camel-core/src/main/java/org/apache/camel/spi/Container.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/spi/Container.java 
b/camel-core/src/main/java/org/apache/camel/spi/Container.java
index 8287c95..79c9509 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/Container.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/Container.java
@@ -82,9 +82,9 @@ public interface Container {
 }
 
 /**
- * Called by Camel when a CamelContext has been created.
+ * Called by Camel when a CamelContext is being started.
  *
- * @param camelContext the newly created CamelContext
+ * @param camelContext the CamelContext to manage
  */
 public static void manage(CamelContext camelContext) {
 Container cnt = container;
@@ -105,9 +105,9 @@ public interface Container {
 }
 
 /**
- * Called by Camel when a CamelContext has been destroyed.
+ * Called by Camel when a CamelContext is being stopped.
  *

[1/2] camel git commit: CAMEL-9670 - Camel-ftp: No error message on invalid credentials, thanks to Dirk Reske for the patch

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x a092bb3cb -> 0dd343e9a


CAMEL-9670 - Camel-ftp: No error message on invalid credentials, thanks to Dirk 
Reske 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/4dc578ce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dc578ce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dc578ce

Branch: refs/heads/camel-2.15.x
Commit: 4dc578ce2d7e747c9b694d5e9f4794ac121066d6
Parents: a092bb3
Author: Andrea Cosentino 
Authored: Fri Mar 4 11:33:52 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 11:42:01 2016 +0100

--
 .../org/apache/camel/component/file/remote/FtpOperations.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4dc578ce/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 0528362..8621046 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -175,9 +175,13 @@ public class FtpOperations implements 
RemoteFileOperations {
 }
 log.trace("User {} logged in: {}", username != null ? username : 
"anonymous", login);
 if (!login) {
+// store replyString, because disconnect() will reset ist
+String replyString = client.getReplyString();
+int replyCode = client.getReplyCode();
+
 // disconnect to prevent connection leaks
 client.disconnect();
-throw new 
GenericFileOperationFailedException(client.getReplyCode(), 
client.getReplyString());
+throw new GenericFileOperationFailedException(replyCode, 
replyString);
 }
 client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE 
: FTP.ASCII_FILE_TYPE);
 } catch (IOException e) {

[2/2] camel git commit: Fixed CS and adjusted comment in camel-ftp FTPOperations

[acosentino]

Fixed CS and adjusted comment in camel-ftp FTPOperations


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

Branch: refs/heads/camel-2.15.x
Commit: 0dd343e9afb397de03ede194aece69cbbea1a287
Parents: 4dc578c
Author: Andrea Cosentino 
Authored: Fri Mar 4 11:37:30 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 11:42:07 2016 +0100

--
 .../apache/camel/component/file/remote/FtpOperations.java   | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0dd343e9/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 8621046..cfc72f7 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -175,13 +175,12 @@ public class FtpOperations implements 
RemoteFileOperations {
 }
 log.trace("User {} logged in: {}", username != null ? username : 
"anonymous", login);
 if (!login) {
-// store replyString, because disconnect() will reset ist
-String replyString = client.getReplyString();
-int replyCode = client.getReplyCode();
-
+// store replyString, because disconnect() will reset it
+String replyString = client.getReplyString();
+int replyCode = client.getReplyCode();
 // disconnect to prevent connection leaks
 client.disconnect();
-throw new GenericFileOperationFailedException(replyCode, 
replyString);
+throw new GenericFileOperationFailedException(replyCode, 
replyString);
 }
 client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE 
: FTP.ASCII_FILE_TYPE);
 } catch (IOException e) {

[2/2] camel git commit: Fixed CS and adjusted comment in camel-ftp FTPOperations

[acosentino]

Fixed CS and adjusted comment in camel-ftp FTPOperations


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

Branch: refs/heads/camel-2.16.x
Commit: 9a000e8b7e0e48e5979bce39a589cf8500267035
Parents: 7b35019
Author: Andrea Cosentino 
Authored: Fri Mar 4 11:37:30 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 11:40:16 2016 +0100

--
 .../apache/camel/component/file/remote/FtpOperations.java   | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9a000e8b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 8621046..cfc72f7 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -175,13 +175,12 @@ public class FtpOperations implements 
RemoteFileOperations {
 }
 log.trace("User {} logged in: {}", username != null ? username : 
"anonymous", login);
 if (!login) {
-// store replyString, because disconnect() will reset ist
-String replyString = client.getReplyString();
-int replyCode = client.getReplyCode();
-
+// store replyString, because disconnect() will reset it
+String replyString = client.getReplyString();
+int replyCode = client.getReplyCode();
 // disconnect to prevent connection leaks
 client.disconnect();
-throw new GenericFileOperationFailedException(replyCode, 
replyString);
+throw new GenericFileOperationFailedException(replyCode, 
replyString);
 }
 client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE 
: FTP.ASCII_FILE_TYPE);
 } catch (IOException e) {

[1/2] camel git commit: CAMEL-9670 - Camel-ftp: No error message on invalid credentials, thanks to Dirk Reske for the patch

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 8f11babb7 -> 9a000e8b7


CAMEL-9670 - Camel-ftp: No error message on invalid credentials, thanks to Dirk 
Reske 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/7b350193
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b350193
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b350193

Branch: refs/heads/camel-2.16.x
Commit: 7b350193c448b0fbe532947ad746fa6614f5063c
Parents: 8f11bab
Author: Andrea Cosentino 
Authored: Fri Mar 4 11:33:52 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 11:39:57 2016 +0100

--
 .../org/apache/camel/component/file/remote/FtpOperations.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7b350193/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 0528362..8621046 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -175,9 +175,13 @@ public class FtpOperations implements 
RemoteFileOperations {
 }
 log.trace("User {} logged in: {}", username != null ? username : 
"anonymous", login);
 if (!login) {
+// store replyString, because disconnect() will reset ist
+String replyString = client.getReplyString();
+int replyCode = client.getReplyCode();
+
 // disconnect to prevent connection leaks
 client.disconnect();
-throw new 
GenericFileOperationFailedException(client.getReplyCode(), 
client.getReplyString());
+throw new GenericFileOperationFailedException(replyCode, 
replyString);
 }
 client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE 
: FTP.ASCII_FILE_TYPE);
 } catch (IOException e) {

[1/2] camel git commit: CAMEL-9670 - Camel-ftp: No error message on invalid credentials, thanks to Dirk Reske for the patch

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 8bcbd5b03 -> 45475b357


CAMEL-9670 - Camel-ftp: No error message on invalid credentials, thanks to Dirk 
Reske 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/4677897e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4677897e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4677897e

Branch: refs/heads/master
Commit: 4677897e82abed1ae0211ae873d95b6365edb50e
Parents: 8bcbd5b
Author: Andrea Cosentino 
Authored: Fri Mar 4 11:33:52 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 11:33:52 2016 +0100

--
 .../org/apache/camel/component/file/remote/FtpOperations.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4677897e/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 0528362..8621046 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -175,9 +175,13 @@ public class FtpOperations implements 
RemoteFileOperations {
 }
 log.trace("User {} logged in: {}", username != null ? username : 
"anonymous", login);
 if (!login) {
+// store replyString, because disconnect() will reset ist
+String replyString = client.getReplyString();
+int replyCode = client.getReplyCode();
+
 // disconnect to prevent connection leaks
 client.disconnect();
-throw new 
GenericFileOperationFailedException(client.getReplyCode(), 
client.getReplyString());
+throw new GenericFileOperationFailedException(replyCode, 
replyString);
 }
 client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE 
: FTP.ASCII_FILE_TYPE);
 } catch (IOException e) {

[2/2] camel git commit: Fixed CS and adjusted comment in camel-ftp FTPOperations

[acosentino]

Fixed CS and adjusted comment in camel-ftp FTPOperations


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

Branch: refs/heads/master
Commit: 45475b357c788f47cd4690439c77dff50ec9132d
Parents: 4677897
Author: Andrea Cosentino 
Authored: Fri Mar 4 11:37:30 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 11:37:30 2016 +0100

--
 .../apache/camel/component/file/remote/FtpOperations.java   | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/45475b35/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 8621046..cfc72f7 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -175,13 +175,12 @@ public class FtpOperations implements 
RemoteFileOperations {
 }
 log.trace("User {} logged in: {}", username != null ? username : 
"anonymous", login);
 if (!login) {
-// store replyString, because disconnect() will reset ist
-String replyString = client.getReplyString();
-int replyCode = client.getReplyCode();
-
+// store replyString, because disconnect() will reset it
+String replyString = client.getReplyString();
+int replyCode = client.getReplyCode();
 // disconnect to prevent connection leaks
 client.disconnect();
-throw new GenericFileOperationFailedException(replyCode, 
replyString);
+throw new GenericFileOperationFailedException(replyCode, 
replyString);
 }
 client.setFileType(configuration.isBinary() ? FTP.BINARY_FILE_TYPE 
: FTP.ASCII_FILE_TYPE);
 } catch (IOException e) {

svn commit: r981788 [3/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache smpp.html

[buildbot]

Modified: websites/production/camel/content/smpp.html
==
--- websites/production/camel/content/smpp.html (original)
+++ websites/production/camel/content/smpp.html Fri Mar  4 10:19:05 2016
@@ -100,7 +100,7 @@
 
-If no username is provided, then Camel will 
provide the default value smppclient. If no 
port number is provided, then Camel will provide the default 
value 2775. Camel 2.3: If the 
protocol name is "smpps", camel-smpp with try to use SSLSocket to init a 
connection to the server.You can append query options to the URI in the 
following format, ?option=valueoption=value...URI OptionsNameDefault ValueDescriptionpasswordpasswordSpecifies the password to use to log in to 
the SMSC.systemTypecpThis parameter is used to categorize the 
type of ESME (External Short Message Entity) that is binding to the SMSC (max. 
13 characters).dataCoding0Camel 2.11 Defines the 
data coding according the SMPP 3.4 specification, section 5.2.19. (Prior to 
Camel 2.9, this option is also supported.) Example data 
encodings are: 0: SMSC Default Alphabet 3: Latin 1 (ISO-8859-1) 4: Octet unspecified 
(8-bit binary) 8: UCS2 
(ISO/IEC-10646) 13: 
Extended Kanji JIS(X 0212-1990)alphabet0Camel 2.5 Defines encoding 
of data according the SMPP 3.4 specification, section 5.2.19. This option is 
mapped to http://code.google.com/p/jsmpp/source/browse/tags/2.1.0/src/java/main/org/jsmpp/bean/Alphabet.java;
 rel="nofollow">Alphabet.java and used to create the 
byte[] which is send 
 to the SMSC. Example alphabets are: 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 
AlphabetencodingISO-8859-1only for SubmitSm, 
ReplaceSm and SubmitMulti Defines the encoding scheme of the short 
message user data.enquireLinkTimer5000Defines the interval in milliseconds 
between the confidence checks. The confidence check is used to test the 
communication path between 
 an ESME and an SMSC.transactionTimer1Defines the maximum period of inactivity 
allowed after a transaction, after which an SMPP entity may assume that the 
session is no longer active. This timer may be active on either communicating 
SMPP entity (i.e. SMSC or ESME).initialReconnectDelay5000Defines the initial delay in 
milliseconds after the consumer/producer tries to reconnect to the SMSC, after 
the connection was lost.reconnectDelay5000Defines the interval in milliseconds between the 
reconnect attempts, if the connection to the SMSC was lost and the previous was 
not succeed.registeredDelivery1only for SubmitSm, ReplaceSm, 
SubmitMulti and DataSm Is used to request an SMSC delivery receipt 
and/or SME originated acknowledgements. The following values are defined: 0: No SMSC delivery 
receipt requested. 1: 
SMSC delivery receipt requested where final delivery outcome is success or 
failure. 2: SMSC 
delivery receipt requested
  where the final delivery outcome is delivery failure.serviceTypeCMTThe service type parameter can be used to 
indicate the SMS Application service associated with the message. The following 
generic service_types are defined: 
CMT: Cellular Messaging CPT: Cellular Paging VMN: Voice Mail Notification VMA: Voice Mail 
Alerting WAP: Wireless 
Application Protocol 
USSD: Unstructured Supplementary Services 
DatasourceAddr1616Defines the address of SME 
(Short Message Entity) which originated this message.destAddr1717only for SubmitSm, SubmitMulti, 
CancelSm and DataSm Defines the destination SME address. For mobile 
terminated messages, this is the directory number of the recipient 
MS.sourceAddrTon0Defines the type of number (TON) to be used 
in the SME originator ad
 dress parameters. The following TON values are defined: 0: Unknown 1: International 2: National 3: Network Specific 4: Subscriber Number 5: Alphanumeric 6: AbbreviateddestAddrTon0only for SubmitSm, SubmitMulti, 
CancelSm and DataSm Defines the type of number (TON) to be used in the 
SME destination address parameters. Same as the sourceAddrTon 
values
  defined above.sourceAddrNpi0Defines the numeric plan indicator (NPI) to 
be used in the SME originator address parameters. The following NPI values are 
defined:  0: 
Unknown 1: ISDN 
(E163/E164) 2: Data 
(X.121) 3: Telex 
(F.69) 6: Land Mobile 
(E.212) 8: National 9: Private 10: ERMES 13: Internet (IP) 
 > 18: WAP Client Id (to be defined by WAP 
 > Forum) class="confluenceTd">destAddrNpi rowspan="1" class="confluenceTd">0 rowspan="1" class="confluenceTd">only for SubmitSm, SubmitMulti, 
 > CancelSm and DataSm Defines the numeric plan indicator (NPI) to be 
 > used in the SME destination address parameters. Same as the 
 > sourceAddrNpi values defined above. colspan="1" rowspan="1" 
 > class="confluenceTd">priorityFlag rowspan="1" class="confluenceTd">1 rowspan="1" class="confluenceTd">only for SubmitSm and 
 > SubmitMulti Allows the originating SME to assign a 

svn commit: r981788 [2/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache smpp.html

[buildbot]

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Fri Mar  4 10:19:05 
2016
@@ -3742,11 +3742,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMSThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -5861,11 +5861,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example
@@ -17320,11 +17320,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 consume 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
@@ -25809,7 +25809,7 @@ protected RouteBuilder createRouteBuilde
 
-If no username is provided, then Camel will 
provide the default value smppclient. If no 
port number is provided, then Camel will provide the default 
value 2775. Camel 2.3: If the 
protocol name is "smpps", camel-smpp with try to use SSLSocket to init a 
connection to the server.You can append query options to the URI in the 
following format, ?option=valueoption=value...URI OptionsNameDefault ValueDescriptionpasswordpasswordSpecifies the password to use 
to log in to the SMSC.systemTypecpThis parameter is used to categorize the 
type of ESME (External Short Message Entity) that is binding to the SMSC (max. 
13 characters).dataCoding0Camel 2.11 Defines the 
data coding according the SMPP 3.4 specification, section 5.2.19. (Prior to 
Camel 2.9, this option is also supported.) Example data 
encodings are: 0: SMSC Default Alphabet 3: Latin 1 (ISO-8859-1) 4: Octet unspecified 
(8-bit binary) 8: UCS2 
(ISO/IEC-10646) 13: 
Extended Kanji JIS(X 0212-1990)alphabet0Camel 2.5 Defines encoding 
of data according the SMPP 3.4 specification, section 5.2.19. This option is 
mapped to http://code.google.com/p/jsmpp/source/browse/tags/2.1.0/src/java/main/org/jsmpp/bean/Alphabet.java;
 rel="nofollow">Alphabet.java and used to create the 
byte[] whi
 ch is send to the SMSC. Example alphabets are: 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 
AlphabetencodingISO-8859-1only for 

svn commit: r981788 [1/3] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache smpp.html

[buildbot]

Author: buildbot
Date: Fri Mar  4 10:19:05 2016
New Revision: 981788

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/smpp.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 Mar  4 
10:19:05 2016
@@ -1016,11 +1016,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
@@ -9505,7 +9505,7 @@ protected RouteBuilder createRouteBuilde
 
-If no username is provided, then Camel will 
provide the default value smppclient. If no 
port number is provided, then Camel will provide the default 
value 2775. Camel 2.3: If the 
protocol name is "smpps", camel-smpp with try to use SSLSocket to init a 
connection to the server.You can append query options to the URI in the 
following format, ?option=valueoption=value...URI OptionsNameDefault ValueDescriptionpasswordpasswordSpecifies the password to use to log in to 
the SMSC.systemTypecpThis parameter is used to categorize the 
type of ESME (External Short Message Entity) that is binding to the SMSC (max. 
13 characters).dataCoding0Camel 2.11 Defines the 
data coding according the SMPP 3.4 specification, section 5.2.19. (Prior to 
Camel 2.9, this option is also supported.) Example data 
encodings are: 0: SMSC Default Alphabet 3: Latin 1 
(ISO-8859-1) 4: Octet 
unspecified (8-bit binary) 
8: UCS2 (ISO/IEC-10646) 13: Extended Kanji JIS(X 
0212-1990)alphabet0Camel 2.5 Defines encoding 
of data according the SMPP 3.4 specification, section 5.2.19. This option is 
mapped to http://code.google.com/p/jsmpp/source/browse/tags/2.1.0/src/java/main/org/jsmpp/bean/Alphabet.java;
 rel="nofollow">Alphabet.java and used to create the 
byte[] which is send to the SMSC. Example alphabets are: 0: SMSC Default Alphabet 4: 8 bit Alphabet 8: UCS2 
AlphabetencodingISO-8859-1only for SubmitSm, 
ReplaceSm and SubmitMulti Defines the encoding scheme of the short 
message user data.enquireLinkTimer5000Defines the interval in milliseconds 
between the confidence checks. The confidence check is used to test the communic
 ation path between an ESME and an SMSC.transactionTimer1Defines the maximum period of 
inactivity allowed after a transaction, after which an SMPP entity may assume 
that the session is no longer active. This timer may be active on either 
communicating SMPP entity (i.e. SMSC or ESME).initialReconnectDelay5000Defines the initial delay in 
milliseconds after the consumer/producer tries to reconnect to the SMSC, after 
the connection was lost.reconnectDelay5000Defines the interval in 
milliseconds between the reconnect attempts, if the connection to the SMSC was 
lost and the previous was not succeed.registeredDelivery1only for SubmitSm, 
ReplaceSm, SubmitMulti and DataSm Is used to request an SMSC delivery 
receipt and/or SME originated acknowledgements. The following values are 
defined: 0: No SMSC 
delivery receipt requested. 
1: SMSC delivery receipt requested where final delivery outcome is 
success or failure. 2: 
SMSC deliver
 y receipt requested where the final delivery outcome is delivery 
failure.serviceTypeCMTThe service type parameter can be used to 
indicate the SMS Application service associated with the message. The following 
generic service_types are defined: 
CMT: Cellular Messaging CPT: Cellular Paging VMN: Voice Mail Notification VMA: 

camel git commit: CAMEL-9280: Allow passing custom headers to the proxy server in camel-smpp component. Thanks to Anshu Avinash for the patch.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 3169b03de -> 8bcbd5b03


CAMEL-9280: Allow passing custom headers to the proxy server in camel-smpp 
component. Thanks to Anshu Avinash 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/8bcbd5b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bcbd5b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bcbd5b0

Branch: refs/heads/master
Commit: 8bcbd5b030a59f1fa0c91a15173eb4faf7af1bcb
Parents: 3169b03
Author: Claus Ibsen 
Authored: Fri Mar 4 10:55:34 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:55:34 2016 +0100

--
 .../camel/component/smpp/SmppConfiguration.java | 25 
 .../component/smpp/SmppConnectionFactory.java   |  9 +++
 .../component/smpp/SmppConfigurationTest.java   | 12 --
 3 files changed, 39 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8bcbd5b0/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
--
diff --git 
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
 
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
index dec1661..dcf2899 100644
--- 
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
+++ 
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.smpp;
 import java.net.URI;
 import java.nio.charset.Charset;
 
+import java.util.Map;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
@@ -97,18 +98,20 @@ public class SmppConfiguration implements Cloneable {
 private long reconnectDelay = 5000;
 @UriParam
 private boolean lazySessionCreation;
-@UriParam
+@UriParam(label = "proxy")
 private String httpProxyHost;
-@UriParam(defaultValue = "3128")
+@UriParam(label = "proxy", defaultValue = "3128")
 private Integer httpProxyPort = 3128;
-@UriParam
+@UriParam(label = "proxy")
 private String httpProxyUsername;
-@UriParam
+@UriParam(label = "proxy")
 private String httpProxyPassword;
-@UriParam
+@UriParam(label = "advanced")
 private SessionStateListener sessionStateListener;
 @UriParam(defaultValue = "ALLOW")
 private SmppSplittingPolicy splittingPolicy = SmppSplittingPolicy.ALLOW;
+@UriParam(label = "proxy")
+private Map proxyHeaders;
 
 
 /**
@@ -637,6 +640,17 @@ public class SmppConfiguration implements Cloneable {
 this.splittingPolicy = splittingPolicy;
 }
 
+/**
+ * These headers will be passed to the proxy server while establishing the 
connection.
+ */
+public void setProxyHeaders(Map proxyHeaders) {
+this.proxyHeaders = proxyHeaders;
+}
+
+public Map getProxyHeaders() {
+return proxyHeaders;
+}
+
 @Override
 public String toString() {
 return "SmppConfiguration[usingSSL=" + usingSSL 
@@ -672,6 +686,7 @@ public class SmppConfiguration implements Cloneable {
 + ", httpProxyUsername=" + httpProxyUsername
 + ", httpProxyPassword=" + httpProxyPassword
 + ", splittingPolicy=" + splittingPolicy
++ ", proxyHeaders=" + proxyHeaders
 + "]";
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8bcbd5b0/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
--
diff --git 
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
 
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
index ff8a57b..cab3301 100644
--- 
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
+++ 
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConnectionFactory.java
@@ -54,6 +54,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Socket;
 
+import java.util.Map;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
@@ -127,6 +128,14 @@ public final class SmppConnectionFactory implements 
ConnectionFactory {
 out.write(code);
 out.write("\r\n".getBytes());
 }
+
+Map proxyHeaders = config.getProxyHeaders();
+if 

[1/2] camel git commit: CAMEL-9660 - HTTP producers crash when Exchange.HTTP_URI header contains unencoded unsafe characters

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x ac83e1023 -> 8f11babb7


CAMEL-9660 - HTTP producers crash when Exchange.HTTP_URI header contains 
unencoded unsafe characters


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

Branch: refs/heads/camel-2.16.x
Commit: 5d84ac78777974de44b4a338483e201e3501f876
Parents: ac83e10
Author: Tadayoshi Sato 
Authored: Wed Mar 2 15:26:46 2016 +0900
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:44:39 2016 +0100

--
 .../apache/camel/http/common/HttpHelper.java|  2 +
 .../component/http/HttpBridgeEndpointTest.java  | 13 ++
 .../http4/helper/HttpMethodHelper.java  |  7 ++-
 .../component/http4/HttpBridgeEndpointTest.java | 14 ++
 .../jetty/HttpProducerUnsafeCharsTest.java  | 47 
 5 files changed, 79 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5d84ac78/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 08f2e2d..9749b97 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -497,6 +497,8 @@ public final class HttpHelper {
 throw new RuntimeExchangeException("Cannot resolve property 
placeholders with uri: " + uriString, exchange, e);
 }
 if (uriString != null) {
+// in case the URI string contains unsafe characters
+uriString = UnsafeUriCharactersEncoder.encodeHttpURI(uriString);
 URI uri = new URI(uriString);
 queryString = uri.getQuery();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/5d84ac78/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
--
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
index 3e021e9..02484df 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
@@ -106,4 +106,17 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 assertExchange(exchange);
 }
 
+@Test
+public void unsafeCharsInHttpURIHeader() throws Exception {
+Exchange exchange = template.request("http://localhost:; + PORT + 
"/?bridgeEndpoint=true", new Processor() {
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(Exchange.HTTP_URI, "/<>{}");
+}
+});
+
+assertNull(exchange.getException());
+assertExchange(exchange);
+}
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/5d84ac78/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
--
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
index ddf408f..57c4c9d 100644
--- 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
@@ -23,13 +23,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.component.http4.HttpEndpoint;
 import org.apache.camel.component.http4.HttpMethods;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
 
 public final class HttpMethodHelper {
 
-private static final Logger LOG = 
LoggerFactory.getLogger(HttpMethodHelper.class);
-
 private HttpMethodHelper() {
 // Helper class
 }
@@ -54,6 +51,8 @@ public final class HttpMethodHelper {
 throw new RuntimeExchangeException("Cannot resolve property 
placeholders with uri: " + uriString, 

[2/2] camel git commit: CAMEL-9658 - Path gets decoded when bridging HTTP endpoints

[davsclaus]

CAMEL-9658 - Path gets decoded when bridging HTTP endpoints


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

Branch: refs/heads/camel-2.16.x
Commit: 8f11babb72927f2b88e3c87b1b81d1acc621b29a
Parents: 5d84ac7
Author: Tadayoshi Sato 
Authored: Tue Mar 1 22:04:59 2016 +0900
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:44:47 2016 +0100

--
 .../camel/http/common/DefaultHttpBinding.java   | 14 ++--
 .../jetty/CamelContinuationServlet.java | 22 +++-
 .../jetty/HttpBridgeEncodedPathTest.java| 37 +---
 .../netty/http/DefaultNettyHttpBinding.java |  2 +-
 .../http/NettyHttpBridgeEncodedPathTest.java| 36 +--
 .../netty4/http/DefaultNettyHttpBinding.java|  2 +-
 .../http/NettyHttpBridgeEncodedPathTest.java| 36 +--
 7 files changed, 128 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8f11babb/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 04f5851..ad9adfe 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -137,11 +137,12 @@ public class DefaultHttpBinding implements HttpBinding {
 }
 
 // store the method and query and other info in headers as String types
+String rawPath = getRawPath(request);
 headers.put(Exchange.HTTP_METHOD, request.getMethod());
 headers.put(Exchange.HTTP_QUERY, request.getQueryString());
 headers.put(Exchange.HTTP_URL, request.getRequestURL().toString());
 headers.put(Exchange.HTTP_URI, request.getRequestURI());
-headers.put(Exchange.HTTP_PATH, request.getPathInfo());
+headers.put(Exchange.HTTP_PATH, rawPath);
 headers.put(Exchange.CONTENT_TYPE, request.getContentType());
 
 if (LOG.isTraceEnabled()) {
@@ -149,7 +150,7 @@ public class DefaultHttpBinding implements HttpBinding {
 LOG.trace("HTTP query {}", request.getQueryString());
 LOG.trace("HTTP url {}", request.getRequestURL());
 LOG.trace("HTTP uri {}", request.getRequestURI());
-LOG.trace("HTTP path {}", request.getPathInfo());
+LOG.trace("HTTP path {}", rawPath);
 LOG.trace("HTTP content-type {}", request.getContentType());
 }
 
@@ -224,7 +225,14 @@ public class DefaultHttpBinding implements HttpBinding {
 }
 }
 }
-
+
+private String getRawPath(HttpServletRequest request) {
+String uri = request.getRequestURI();
+String contextPath = request.getContextPath();
+String servletPath = request.getServletPath();
+return uri.substring(contextPath.length() + servletPath.length());
+}
+
 protected void populateAttachments(HttpServletRequest request, HttpMessage 
message) {
 // check if there is multipart files, if so will put it into 
DataHandler
 Enumeration names = request.getAttributeNames();

http://git-wip-us.apache.org/repos/asf/camel/blob/8f11babb/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index a6a2e9c..9e77b29 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -35,6 +35,7 @@ import org.apache.camel.http.common.HttpHelper;
 import org.apache.camel.http.common.HttpMessage;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 
@@ -161,14 +162,8 @@ public class CamelContinuationServlet extends CamelServlet 
{
 // set 

[2/4] camel git commit: CAMEL-9658 - Path gets decoded when bridging HTTP endpoints

[davsclaus]

CAMEL-9658 - Path gets decoded when bridging HTTP endpoints


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

Branch: refs/heads/master
Commit: 0859e2506799e7087ff554d8433ae23ffb5d
Parents: 09fbc0b
Author: Tadayoshi Sato 
Authored: Tue Mar 1 22:04:59 2016 +0900
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:15:23 2016 +0100

--
 .../camel/http/common/DefaultHttpBinding.java   | 14 ++--
 .../jetty/CamelContinuationServlet.java | 22 +++-
 .../jetty/HttpBridgeEncodedPathTest.java| 37 +---
 .../netty/http/DefaultNettyHttpBinding.java |  2 +-
 .../http/NettyHttpBridgeEncodedPathTest.java| 36 +--
 .../netty4/http/DefaultNettyHttpBinding.java|  2 +-
 .../http/NettyHttpBridgeEncodedPathTest.java| 36 +--
 7 files changed, 128 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0859e250/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 04f5851..ad9adfe 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -137,11 +137,12 @@ public class DefaultHttpBinding implements HttpBinding {
 }
 
 // store the method and query and other info in headers as String types
+String rawPath = getRawPath(request);
 headers.put(Exchange.HTTP_METHOD, request.getMethod());
 headers.put(Exchange.HTTP_QUERY, request.getQueryString());
 headers.put(Exchange.HTTP_URL, request.getRequestURL().toString());
 headers.put(Exchange.HTTP_URI, request.getRequestURI());
-headers.put(Exchange.HTTP_PATH, request.getPathInfo());
+headers.put(Exchange.HTTP_PATH, rawPath);
 headers.put(Exchange.CONTENT_TYPE, request.getContentType());
 
 if (LOG.isTraceEnabled()) {
@@ -149,7 +150,7 @@ public class DefaultHttpBinding implements HttpBinding {
 LOG.trace("HTTP query {}", request.getQueryString());
 LOG.trace("HTTP url {}", request.getRequestURL());
 LOG.trace("HTTP uri {}", request.getRequestURI());
-LOG.trace("HTTP path {}", request.getPathInfo());
+LOG.trace("HTTP path {}", rawPath);
 LOG.trace("HTTP content-type {}", request.getContentType());
 }
 
@@ -224,7 +225,14 @@ public class DefaultHttpBinding implements HttpBinding {
 }
 }
 }
-
+
+private String getRawPath(HttpServletRequest request) {
+String uri = request.getRequestURI();
+String contextPath = request.getContextPath();
+String servletPath = request.getServletPath();
+return uri.substring(contextPath.length() + servletPath.length());
+}
+
 protected void populateAttachments(HttpServletRequest request, HttpMessage 
message) {
 // check if there is multipart files, if so will put it into 
DataHandler
 Enumeration names = request.getAttributeNames();

http://git-wip-us.apache.org/repos/asf/camel/blob/0859e250/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index a6a2e9c..9e77b29 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -35,6 +35,7 @@ import org.apache.camel.http.common.HttpHelper;
 import org.apache.camel.http.common.HttpMessage;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 
@@ -161,14 +162,8 @@ public class CamelContinuationServlet extends CamelServlet 
{
 // set context 

[4/4] camel git commit: CAMEL-9660 - HTTP producers crash when Exchange.HTTP_URI header contains unencoded unsafe characters

[davsclaus]

CAMEL-9660 - HTTP producers crash when Exchange.HTTP_URI header contains 
unencoded unsafe characters


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

Branch: refs/heads/master
Commit: 09fbc0bb382e19cef0793ef0592bcb1d03a1b8c5
Parents: da03595
Author: Tadayoshi Sato 
Authored: Wed Mar 2 15:26:46 2016 +0900
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:15:23 2016 +0100

--
 .../apache/camel/http/common/HttpHelper.java|  2 +
 .../component/http/HttpBridgeEndpointTest.java  | 13 ++
 .../http4/helper/HttpMethodHelper.java  |  7 ++-
 .../component/http4/HttpBridgeEndpointTest.java | 14 ++
 .../jetty/HttpProducerUnsafeCharsTest.java  | 47 
 5 files changed, 79 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/09fbc0bb/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 08f2e2d..9749b97 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -497,6 +497,8 @@ public final class HttpHelper {
 throw new RuntimeExchangeException("Cannot resolve property 
placeholders with uri: " + uriString, exchange, e);
 }
 if (uriString != null) {
+// in case the URI string contains unsafe characters
+uriString = UnsafeUriCharactersEncoder.encodeHttpURI(uriString);
 URI uri = new URI(uriString);
 queryString = uri.getQuery();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/09fbc0bb/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
--
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
index 3e021e9..02484df 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
@@ -106,4 +106,17 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
 assertExchange(exchange);
 }
 
+@Test
+public void unsafeCharsInHttpURIHeader() throws Exception {
+Exchange exchange = template.request("http://localhost:; + PORT + 
"/?bridgeEndpoint=true", new Processor() {
+@Override
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(Exchange.HTTP_URI, "/<>{}");
+}
+});
+
+assertNull(exchange.getException());
+assertExchange(exchange);
+}
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/09fbc0bb/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
--
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
index ddf408f..57c4c9d 100644
--- 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
@@ -23,13 +23,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.component.http4.HttpEndpoint;
 import org.apache.camel.component.http4.HttpMethods;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.camel.util.UnsafeUriCharactersEncoder;
 
 public final class HttpMethodHelper {
 
-private static final Logger LOG = 
LoggerFactory.getLogger(HttpMethodHelper.class);
-
 private HttpMethodHelper() {
 // Helper class
 }
@@ -54,6 +51,8 @@ public final class HttpMethodHelper {
 throw new RuntimeExchangeException("Cannot resolve property 
placeholders with uri: " + uriString, exchange, e);
 }
 if (uriString != null) {
+// in case the URI 

[1/4] camel git commit: Removed unused code

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master da0359526 -> 3169b03de


Removed unused code


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

Branch: refs/heads/master
Commit: 3169b03def906d3f224e4ce40c62ed90706ab9e2
Parents: 99ab3ae
Author: Claus Ibsen 
Authored: Fri Mar 4 10:06:07 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:15:23 2016 +0100

--
 .../main/java/org/apache/camel/language/bean/BeanExpression.java   | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3169b03d/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java 
b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index f5834ee..5c6bba2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -279,7 +279,6 @@ public class BeanExpression implements Expression, 
Predicate {
 // and we would like to keep the dots within the key name
 List methods = OgnlHelper.splitOgnl(ognl);
 
-String methodChain = "";
 for (String methodName : methods) {
 BeanHolder holder;
 if (beanToCall != null) {
@@ -323,7 +322,6 @@ public class BeanExpression implements Expression, 
Predicate {
 }
 
 result = invoke.getResult();
-methodChain += "." + methodName;
 }
 
 // if there was a key then we need to lookup using the key

[3/4] camel git commit: Fix CS

[davsclaus]

Fix CS


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

Branch: refs/heads/master
Commit: 99ab3ae5a5cfcce55a9db80cf27f44aff70692e3
Parents: 0859e25
Author: Tadayoshi Sato 
Authored: Tue Mar 1 22:09:07 2016 +0900
Committer: Claus Ibsen 
Committed: Fri Mar 4 10:15:23 2016 +0100

--
 .../camel/component/jetty/rest/RestJettyDefaultValueTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/99ab3ae5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
index 881bd1d..28d07a8 100644
--- 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java
@@ -65,7 +65,8 @@ public class RestJettyDefaultValueTest extends BaseJettyTest {
 
 if ("true".equals(verbose)) {
 exchange.getOut().setBody(id + ";Donald 
Duck;1113 Quack Street Duckburg");
-} if ("false".equals(verbose)) {
+}
+if ("false".equals(verbose)) {
 exchange.getOut().setBody(id + ";Donald 
Duck");
 }
 }

svn commit: r981786 - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache data-format-list.html data-format.html yaml-data-format.html

[buildbot]

Author: buildbot
Date: Fri Mar  4 09:22:46 2016
New Revision: 981786

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/yaml-data-format.html
Modified:
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/data-format-list.html
websites/production/camel/content/data-format.html

Modified: websites/production/camel/content/book-dataformat-appendix.html
==
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Fri Mar  4 
09:22:46 2016
@@ -95,7 +95,7 @@
 
 The following data formats are currently supported:
 
-Standard JVM object marshallingSerializationStringObject 
marshallingAvroBoonJSONProtobufObject/XML 
marshallingCastorJAXBXmlBeansXStreamJiBXJackson 
XMLObject/XML/Webservice marshallingSOAPDirect JSON / 
XML marshallingXmlJsonFlat data structure 
marshallingBeanIOBindyCSVEDIFlatpack DataFormatuniVocity-parsers 
formatsDomain specific marshallingHL7 
DataFormatCompressionGZip data formatZip DataFormatZip File DataFormatLZF Data 
FormatSecurityCryptoPGPhref="xmlsecurity-dataformat.html">XMLSecurity 
 >DataFormatMisc.href="base64.html">Base64href="custom-dataformat.html">Custom DataFormat - to use your own custom 
 >implementationhref="mime-multipart.html">MIME-Multiparthref="rss.html">RSShref="tidymarkup.html">TidyMarkuphref="syslog.html">Sysloghref="ical.html">ICalhref="barcode-data-format.html">Barcode - to read and generate barcodes 
 >(QR-Code, PDF417, ...)
+Standard JVM object marshallingSerializationStringObject 
marshallingAvroBoonJSONProtobufYAMLObject/XML 
marshallingCastorJAXBXmlBeansXStreamJiBXJackson 
XMLObject/XML/Webservice marshallingSOAPDir
 ect JSON / XML marshallingXmlJsonFlat data structure 
marshallingBeanIOBindyCSVEDIFlatpack DataFormatuniVocity-parsers 
formatsDomain specific marshallingHL7 
DataFormatCompressionGZip data formatZip DataFormatZip File DataFormatLZF Data FormatSecurityCryptoPGPXMLSecurity 
DataFormatMisc.Base64Custom DataFormat - to use your own custom 
implementationMIME-MultipartRSSTidyMarkupSyslogICalBarcode - to read and generate barcodes 
(QR-Code, PDF417, ...)
 
 And related is the following:
 DataFormat Component for working with Data Formats as if it was a regular Component supporting Endpoints and URIs.Dozer Type Conversion using Dozer for 
type converting POJOs

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Fri Mar  4 09:22:46 
2016
@@ -3742,11 +3742,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMSThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -5861,11 +5861,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example
@@ -9140,7 +9140,7 @@ from(direct:start).
 
 The following data formats are currently supported:
 
-Standard JVM object marshallingSerializationStringObject 

[2/2] camel git commit: CAMEL-9666: Propagate 'fault' property to soft copy

[davsclaus]

CAMEL-9666: Propagate 'fault' property to soft copy


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

Branch: refs/heads/camel-2.16.x
Commit: ac83e102321c777bbdd18d05e25992d7a72d031a
Parents: e67d08c
Author: Martin Basovnik 
Authored: Thu Mar 3 11:19:04 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 09:34:19 2016 +0100

--
 .../org/apache/camel/impl/DefaultExchange.java  |  2 ++
 .../apache/camel/impl/DefaultExchangeTest.java  | 21 
 2 files changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ac83e102/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index 58aa50b..47d6458 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -97,6 +97,7 @@ public final class DefaultExchange implements Exchange {
 
 if (safeCopy) {
 exchange.getIn().setBody(getIn().getBody());
+exchange.getIn().setFault(getIn().isFault());
 if (getIn().hasHeaders()) {
 
exchange.getIn().setHeaders(safeCopyHeaders(getIn().getHeaders()));
 // just copy the attachments here
@@ -104,6 +105,7 @@ public final class DefaultExchange implements Exchange {
 }
 if (hasOut()) {
 exchange.getOut().setBody(getOut().getBody());
+exchange.getOut().setFault(getOut().isFault());
 if (getOut().hasHeaders()) {
 
exchange.getOut().setHeaders(safeCopyHeaders(getOut().getHeaders()));
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ac83e102/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
index c8395ac..43bd8ff 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
@@ -216,6 +216,27 @@ public class DefaultExchangeTest extends 
ExchangeTestSupport {
  sourceIn.getClass(), destIn.getClass());
 }
 
+public void testFaultCopy() {
+testFaultCopy(false);
+}
+
+public void testFaultSafeCopy() {
+testFaultCopy(true);
+}
+
+private void testFaultCopy(boolean safe) {
+DefaultExchange sourceExchange = new DefaultExchange(context);
+MyMessage source = new MyMessage();
+source.setFault(true);
+sourceExchange.setIn(source);
+sourceExchange.setOut(source);
+Exchange destExchange = sourceExchange.copy(safe);
+assertEquals("Fault property was not copied to IN message",
+sourceExchange.getIn().isFault(), 
destExchange.getIn().isFault());
+assertEquals("Fault property was not copied to OUT message",
+sourceExchange.getOut().isFault(), 
destExchange.getOut().isFault());
+}
+
 public static class MyMessage extends DefaultMessage {
 @Override
 public MyMessage newInstance() {

[1/2] camel git commit: CAMEL-9666: Propagate 'fault' property to soft copy

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x e67d08c2e -> ac83e1023
  refs/heads/master 53600cfaf -> da0359526


CAMEL-9666: Propagate 'fault' property to soft copy


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

Branch: refs/heads/master
Commit: da0359526d08fc5b40a202ba050b310f3c05c3a6
Parents: 53600cf
Author: Martin Basovnik 
Authored: Thu Mar 3 11:19:04 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 09:03:57 2016 +0100

--
 .../org/apache/camel/impl/DefaultExchange.java  |  2 ++
 .../apache/camel/impl/DefaultExchangeTest.java  | 21 
 2 files changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/da035952/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index e1f83f6..923c0d8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -98,6 +98,7 @@ public final class DefaultExchange implements Exchange {
 
 if (safeCopy) {
 exchange.getIn().setBody(getIn().getBody());
+exchange.getIn().setFault(getIn().isFault());
 if (getIn().hasHeaders()) {
 
exchange.getIn().setHeaders(safeCopyHeaders(getIn().getHeaders()));
 // just copy the attachments here
@@ -105,6 +106,7 @@ public final class DefaultExchange implements Exchange {
 }
 if (hasOut()) {
 exchange.getOut().setBody(getOut().getBody());
+exchange.getOut().setFault(getOut().isFault());
 if (getOut().hasHeaders()) {
 
exchange.getOut().setHeaders(safeCopyHeaders(getOut().getHeaders()));
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/da035952/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
index c8395ac..43bd8ff 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeTest.java
@@ -216,6 +216,27 @@ public class DefaultExchangeTest extends 
ExchangeTestSupport {
  sourceIn.getClass(), destIn.getClass());
 }
 
+public void testFaultCopy() {
+testFaultCopy(false);
+}
+
+public void testFaultSafeCopy() {
+testFaultCopy(true);
+}
+
+private void testFaultCopy(boolean safe) {
+DefaultExchange sourceExchange = new DefaultExchange(context);
+MyMessage source = new MyMessage();
+source.setFault(true);
+sourceExchange.setIn(source);
+sourceExchange.setOut(source);
+Exchange destExchange = sourceExchange.copy(safe);
+assertEquals("Fault property was not copied to IN message",
+sourceExchange.getIn().isFault(), 
destExchange.getIn().isFault());
+assertEquals("Fault property was not copied to OUT message",
+sourceExchange.getOut().isFault(), 
destExchange.getOut().isFault());
+}
+
 public static class MyMessage extends DefaultMessage {
 @Override
 public MyMessage newInstance() {

[1/2] camel git commit: CAMEL-9661 - YAML Data Format

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 4e5599c6c -> 53600cfaf


CAMEL-9661 - YAML Data Format


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

Branch: refs/heads/master
Commit: 53600cfaf16966ed01b4e888993e7700106ed97b
Parents: 4a3c464
Author: lburgazzoli 
Authored: Wed Mar 2 16:17:55 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 08:53:04 2016 +0100

--
 apache-camel/pom.xml|   4 +
 .../src/main/descriptors/common-bin.xml |   1 +
 .../apache/camel/builder/DataFormatClause.java  |  24 +-
 .../model/dataformat/DataFormatsDefinition.java |   1 +
 .../camel/model/dataformat/YAMLDataFormat.java  | 241 +++
 .../camel/model/dataformat/YAMLLibrary.java |  31 ++
 .../apache/camel/model/dataformat/jaxb.index|   2 +
 components/camel-snakeyaml/pom.xml  |  67 
 .../snakeyaml/SnakeYAMLDataFormat.java  | 304 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../org/apache/camel/dataformat/yaml-snakeyaml  |  18 ++
 .../snakeyaml/SnakeYAMLMarshalTest.java | 100 ++
 .../snakeyaml/SnakeYAMLMarshalTestHelper.java   |  84 +
 .../snakeyaml/SnakeYAMLSpringMarshalTest.java   |  73 +
 .../component/snakeyaml/model/TestPojo.java |  52 
 .../src/test/resources/log4j.properties |  36 +++
 .../snakeyaml/SnakeYAMLSpringMarshalTest.xml|  76 +
 components/pom.xml  |   1 +
 parent/pom.xml  |   7 +-
 .../features/src/main/resources/features.xml|   5 +
 .../camel/itest/karaf/CamelSnakeyamlTest.java   |  40 +++
 .../maven/packaging/PackageDataFormatMojo.java  |   4 +
 23 files changed, 1382 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/53600cfa/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index ae628ec..0eb7c9d 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -736,6 +736,10 @@
 
 
   org.apache.camel
+  camel-snakeyaml
+
+
+  org.apache.camel
   camel-snmp
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/53600cfa/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index ad76d9b..b00bd97 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -195,6 +195,7 @@
 org.apache.camel:camel-sjms
 org.apache.camel:camel-slack
 org.apache.camel:camel-smpp
+org.apache.camel:camel-snakeyaml
 org.apache.camel:camel-snmp
 org.apache.camel:camel-soap
 org.apache.camel:camel-solr

http://git-wip-us.apache.org/repos/asf/camel/blob/53600cfa/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 de2a7c1..33b5403 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;
@@ -55,10 +53,13 @@ import org.apache.camel.model.dataformat.XMLBeansDataFormat;
 import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
 import org.apache.camel.model.dataformat.XStreamDataFormat;
 import org.apache.camel.model.dataformat.XmlJsonDataFormat;
+import org.apache.camel.model.dataformat.YAMLDataFormat;
+import org.apache.camel.model.dataformat.YAMLLibrary;
 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}
@@ -871,6 +872,25 @@ public