svn commit: r985515 - in /websites/production/camel/content: cache/main.pageCache spring-boot.html

[buildbot]

Author: buildbot
Date: Tue Apr 12 21:18:36 2016
New Revision: 985515

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/spring-boot.html

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

Modified: websites/production/camel/content/spring-boot.html
==
--- websites/production/camel/content/spring-boot.html (original)
+++ websites/production/camel/content/spring-boot.html Tue Apr 12 21:18:36 2016
@@ -112,7 +112,7 @@ public class MyRoute extends RouteBuilde
 from(timer:foo).to(log:bar);
 }
 }]]>
-Then these routes will be started automatically.You can 
customize the Camel application in theapplication.properties 
orapplication.yml file.Auto-configured Camel contextThe most important piece 
of functionality provided by the Camel auto-configuration is 
CamelContext instance. Camelauto-configurationcreates 
aSpringCamelContext for you and takes care of the proper 
initialization and shutdown of that context. The createdCamel context is 
also registered in the Spring application context (under 
camelContext bean name), so you can access it justas 
any other Spring bean.
+Then these routes will be started automatically. To keep the 
main thread blocked so that Camel stays up, either include the 
spring-boot-starter-web dependency, or 
addcamel.springboot.main-run-controller=true to your 
application.propertiesorapplication.ymlfile.You
 can further customize the Camel application in 
theapplication.properties 
orapplication.yml file withcamel.springboot.* 
properties.Auto-configured Camel contextThe 
most important piece of functionality provided by the Camel auto-configuration 
is CamelContext instance. 
Camelauto-configurationcreates 
aSpringCamelContext for you and takes care of the proper 
initialization and shutdown of that context. The createdCamel context is 
also registe
 red in the Spring application context (under camelContext bean 
name), so you can access it justas any other Spring bean.
 

camel git commit: Upgrade Mvel to version 2.2.8.Final

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 77e342501 -> 842838089


Upgrade Mvel to version 2.2.8.Final


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

Branch: refs/heads/master
Commit: 84283808985af258faff8c12a1c7bdad1dc8422a
Parents: 77e3425
Author: Andrea Cosentino 
Authored: Tue Apr 12 14:53:28 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 14:53:28 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/84283808/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fae0569..f66a979 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -416,7 +416,7 @@
 0.9.1
 16.0
 0.9.1_2
-2.2.7.Final
+2.2.8.Final
 3.3.1
 3.0.1
 3.10.5.Final

camel git commit: Upgrade Kubernetes/Openshift client to version 1.3.83

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master d6df9d06a -> 77e342501


Upgrade Kubernetes/Openshift client to version 1.3.83


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

Branch: refs/heads/master
Commit: 77e3425018d2c9106a9ff71f9c758bbf6760e0e1
Parents: d6df9d0
Author: Andrea Cosentino 
Authored: Tue Apr 12 14:36:05 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 14:36:05 2016 +0200

--
 .../KubernetesPersistentVolumesProducer.java| 35 
 parent/pom.xml  |  4 +--
 2 files changed, 9 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/77e34250/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java
--
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java
index 051b5b1..6037206 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducer.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolumeList;
-import io.fabric8.kubernetes.client.dsl.ClientMixedOperation;
 import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.ClientResource;
 
@@ -82,7 +81,7 @@ public class KubernetesPersistentVolumesProducer extends 
DefaultProducer {
 
 protected void doList(Exchange exchange, String operation) throws 
Exception {
 PersistentVolumeList persistentVolumeList = getEndpoint()
-
.getKubernetesClient().persistentVolumes().inAnyNamespace().list();
+.getKubernetesClient().persistentVolumes().list();
 exchange.getOut().setBody(persistentVolumeList.getItems());
 }
 
@@ -92,24 +91,12 @@ public class KubernetesPersistentVolumesProducer extends 
DefaultProducer {
 Map labels = exchange.getIn().getHeader(
 KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS,
 Map.class);
-String namespaceName = exchange.getIn().getHeader(
-KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class);
-if (!ObjectHelper.isEmpty(namespaceName)) {
-ClientNonNamespaceOperation> pvs; 
-pvs = getEndpoint().getKubernetesClient().persistentVolumes()
-.inNamespace(namespaceName);
-for (Map.Entry entry : labels.entrySet()) {
-pvs.withLabel(entry.getKey(), entry.getValue());
-}
-pvList = pvs.list();
-} else {
-ClientMixedOperation> pvs; 
-pvs = getEndpoint().getKubernetesClient().persistentVolumes();
-for (Map.Entry entry : labels.entrySet()) {
-pvs.withLabel(entry.getKey(), entry.getValue());
-}
-pvList = pvs.list();
+ClientNonNamespaceOperation> pvs; 
+pvs = getEndpoint().getKubernetesClient().persistentVolumes();
+for (Map.Entry entry : labels.entrySet()) {
+pvs.withLabel(entry.getKey(), entry.getValue());
 }
+pvList = pvs.list();
 exchange.getOut().setBody(pvList.getItems());
 }
 
@@ -119,20 +106,12 @@ public class KubernetesPersistentVolumesProducer extends 
DefaultProducer {
 String pvName = exchange.getIn().getHeader(
 KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_NAME,
 String.class);
-String namespaceName = exchange.getIn().getHeader(
-KubernetesConstants.KUBERNETES_NAMESPACE_NAME, 

[1/2] camel git commit: CAMEL-9860: csv dataformat - Should have quoteMode option in model

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 30be3475a -> 933e7f21e


CAMEL-9860: csv dataformat - Should have quoteMode option in model


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

Branch: refs/heads/camel-2.16.x
Commit: b6d9db8114f18cee513861d9cfd62d22d1bbb6cf
Parents: 30be347
Author: Andrea Cosentino 
Authored: Tue Apr 12 13:49:35 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 14:07:36 2016 +0200

--
 .../camel/model/dataformat/CsvDataFormat.java   | 21 -
 ...arshalAutogenColumnsSpringQuoteModeTest.java | 94 
 ...utogenColumnsSpringQuoteModeTest-context.xml | 54 +++
 3 files changed, 166 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b6d9db81/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 83aeaa2..0d43eae 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -76,7 +76,8 @@ public class CsvDataFormat extends DataFormatDefinition {
 private String recordSeparator;
 @XmlAttribute
 private Boolean skipHeaderRecord;
-
+@XmlAttribute
+private String quoteMode;
 // Unmarshall options
 @XmlAttribute
 private Boolean lazyLoad;
@@ -159,7 +160,10 @@ public class CsvDataFormat extends DataFormatDefinition {
 if (skipHeaderRecord != null) {
 setProperty(camelContext, dataFormat, "skipHeaderRecord", 
skipHeaderRecord);
 }
-
+if (quoteMode != null) {
+setProperty(camelContext, dataFormat, "quoteMode", quoteMode);
+}
+
 // Unmarshall options
 if (lazyLoad != null) {
 setProperty(camelContext, dataFormat, "lazyLoad", lazyLoad);
@@ -391,7 +395,18 @@ public class CsvDataFormat extends DataFormatDefinition {
 this.skipHeaderRecord = skipHeaderRecord;
 }
 
-public Boolean getLazyLoad() {
+public String getQuoteMode() {
+   return quoteMode;
+   }
+
+/**
+ * Sets the quote mode
+ */
+   public void setQuoteMode(String quoteMode) {
+   this.quoteMode = quoteMode;
+   }
+
+   public Boolean getLazyLoad() {
 return lazyLoad;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b6d9db81/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
--
diff --git 
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
new file mode 100644
index 000..290c20d
--- /dev/null
+++ 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
@@ -0,0 +1,94 @@
+/**
+ * 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.dataformat.csv;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Spring based integration test for the CsvDataFormat 
demonstrating the usage of
+ * the autogenColumns, configRef 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.16.x
Commit: 933e7f21e00ada1c41f12e4b8d06366bfb0ab5ab
Parents: b6d9db8
Author: Andrea Cosentino 
Authored: Tue Apr 12 13:58:38 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 14:07:45 2016 +0200

--
 .../apache/camel/model/dataformat/CsvDataFormat.java| 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/933e7f21/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 0d43eae..91fa1e7 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -396,17 +396,17 @@ public class CsvDataFormat extends DataFormatDefinition {
 }
 
 public String getQuoteMode() {
-   return quoteMode;
-   }
+return quoteMode;
+}
 
 /**
  * Sets the quote mode
  */
-   public void setQuoteMode(String quoteMode) {
-   this.quoteMode = quoteMode;
-   }
+public void setQuoteMode(String quoteMode) {
+this.quoteMode = quoteMode;
+}
 
-   public Boolean getLazyLoad() {
+public Boolean getLazyLoad() {
 return lazyLoad;
 }
 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: 48470750602b9588af0a1123e7b817ddfd190eae
Parents: 3fcbad2
Author: Andrea Cosentino 
Authored: Tue Apr 12 13:58:38 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 14:02:45 2016 +0200

--
 .../apache/camel/model/dataformat/CsvDataFormat.java| 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/48470750/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 0d43eae..91fa1e7 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -396,17 +396,17 @@ public class CsvDataFormat extends DataFormatDefinition {
 }
 
 public String getQuoteMode() {
-   return quoteMode;
-   }
+return quoteMode;
+}
 
 /**
  * Sets the quote mode
  */
-   public void setQuoteMode(String quoteMode) {
-   this.quoteMode = quoteMode;
-   }
+public void setQuoteMode(String quoteMode) {
+this.quoteMode = quoteMode;
+}
 
-   public Boolean getLazyLoad() {
+public Boolean getLazyLoad() {
 return lazyLoad;
 }
 

[1/2] camel git commit: CAMEL-9860: csv dataformat - Should have quoteMode option in model

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x e3adb2e3c -> 484707506


CAMEL-9860: csv dataformat - Should have quoteMode option in model


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

Branch: refs/heads/camel-2.17.x
Commit: 3fcbad2bdd26f7f093d0f5b72a2641b6e9d9ee71
Parents: e3adb2e
Author: Andrea Cosentino 
Authored: Tue Apr 12 13:49:35 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 14:00:22 2016 +0200

--
 .../camel/model/dataformat/CsvDataFormat.java   | 21 -
 ...arshalAutogenColumnsSpringQuoteModeTest.java | 94 
 ...utogenColumnsSpringQuoteModeTest-context.xml | 54 +++
 3 files changed, 166 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3fcbad2b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 83aeaa2..0d43eae 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -76,7 +76,8 @@ public class CsvDataFormat extends DataFormatDefinition {
 private String recordSeparator;
 @XmlAttribute
 private Boolean skipHeaderRecord;
-
+@XmlAttribute
+private String quoteMode;
 // Unmarshall options
 @XmlAttribute
 private Boolean lazyLoad;
@@ -159,7 +160,10 @@ public class CsvDataFormat extends DataFormatDefinition {
 if (skipHeaderRecord != null) {
 setProperty(camelContext, dataFormat, "skipHeaderRecord", 
skipHeaderRecord);
 }
-
+if (quoteMode != null) {
+setProperty(camelContext, dataFormat, "quoteMode", quoteMode);
+}
+
 // Unmarshall options
 if (lazyLoad != null) {
 setProperty(camelContext, dataFormat, "lazyLoad", lazyLoad);
@@ -391,7 +395,18 @@ public class CsvDataFormat extends DataFormatDefinition {
 this.skipHeaderRecord = skipHeaderRecord;
 }
 
-public Boolean getLazyLoad() {
+public String getQuoteMode() {
+   return quoteMode;
+   }
+
+/**
+ * Sets the quote mode
+ */
+   public void setQuoteMode(String quoteMode) {
+   this.quoteMode = quoteMode;
+   }
+
+   public Boolean getLazyLoad() {
 return lazyLoad;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/3fcbad2b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
--
diff --git 
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
new file mode 100644
index 000..290c20d
--- /dev/null
+++ 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
@@ -0,0 +1,94 @@
+/**
+ * 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.dataformat.csv;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Spring based integration test for the CsvDataFormat 
demonstrating the usage of
+ * the autogenColumns, configRef 

[1/2] camel git commit: CAMEL-9860: csv dataformat - Should have quoteMode option in model

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 48f76064e -> d6df9d06a


CAMEL-9860: csv dataformat - Should have quoteMode option in model


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

Branch: refs/heads/master
Commit: 3c339afdaa0e9973695b55d84853ae4b9d31c7d7
Parents: 48f7606
Author: Andrea Cosentino 
Authored: Tue Apr 12 13:49:35 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 13:49:35 2016 +0200

--
 .../camel/model/dataformat/CsvDataFormat.java   | 21 -
 ...arshalAutogenColumnsSpringQuoteModeTest.java | 94 
 ...utogenColumnsSpringQuoteModeTest-context.xml | 54 +++
 3 files changed, 166 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c339afd/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 83aeaa2..0d43eae 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -76,7 +76,8 @@ public class CsvDataFormat extends DataFormatDefinition {
 private String recordSeparator;
 @XmlAttribute
 private Boolean skipHeaderRecord;
-
+@XmlAttribute
+private String quoteMode;
 // Unmarshall options
 @XmlAttribute
 private Boolean lazyLoad;
@@ -159,7 +160,10 @@ public class CsvDataFormat extends DataFormatDefinition {
 if (skipHeaderRecord != null) {
 setProperty(camelContext, dataFormat, "skipHeaderRecord", 
skipHeaderRecord);
 }
-
+if (quoteMode != null) {
+setProperty(camelContext, dataFormat, "quoteMode", quoteMode);
+}
+
 // Unmarshall options
 if (lazyLoad != null) {
 setProperty(camelContext, dataFormat, "lazyLoad", lazyLoad);
@@ -391,7 +395,18 @@ public class CsvDataFormat extends DataFormatDefinition {
 this.skipHeaderRecord = skipHeaderRecord;
 }
 
-public Boolean getLazyLoad() {
+public String getQuoteMode() {
+   return quoteMode;
+   }
+
+/**
+ * Sets the quote mode
+ */
+   public void setQuoteMode(String quoteMode) {
+   this.quoteMode = quoteMode;
+   }
+
+   public Boolean getLazyLoad() {
 return lazyLoad;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/3c339afd/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
--
diff --git 
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
new file mode 100644
index 000..290c20d
--- /dev/null
+++ 
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
@@ -0,0 +1,94 @@
+/**
+ * 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.dataformat.csv;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Spring based integration test for the CsvDataFormat 
demonstrating the usage of
+ * the autogenColumns, configRef and 

[2/2] camel git commit: Fixed CS

[acosentino]

Fixed CS


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

Branch: refs/heads/master
Commit: d6df9d06a7fd62caa89f553bccc34d8af1c04412
Parents: 3c339af
Author: Andrea Cosentino 
Authored: Tue Apr 12 13:58:38 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 13:58:38 2016 +0200

--
 .../apache/camel/model/dataformat/CsvDataFormat.java| 12 ++--
 .../org/apache/camel/processor/ThreadsProcessor.java|  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d6df9d06/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 0d43eae..91fa1e7 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -396,17 +396,17 @@ public class CsvDataFormat extends DataFormatDefinition {
 }
 
 public String getQuoteMode() {
-   return quoteMode;
-   }
+return quoteMode;
+}
 
 /**
  * Sets the quote mode
  */
-   public void setQuoteMode(String quoteMode) {
-   this.quoteMode = quoteMode;
-   }
+public void setQuoteMode(String quoteMode) {
+this.quoteMode = quoteMode;
+}
 
-   public Boolean getLazyLoad() {
+public Boolean getLazyLoad() {
 return lazyLoad;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/d6df9d06/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java 
b/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
index b3c6dc4..30bc399 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
@@ -112,7 +112,7 @@ public class ThreadsProcessor extends ServiceSupport 
implements AsyncProcessor,
 this.camelContext = camelContext;
 this.executorService = executorService;
 this.shutdownExecutorService = shutdownExecutorService;
-this.rejectedPolicy =rejectedPolicy;
+this.rejectedPolicy = rejectedPolicy;
 }
 
 public void process(final Exchange exchange) throws Exception {

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/feature/camel-xmljson-legal-license-compliance [deleted] d3f669a8a

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/feature/camel-hystrix [deleted] d8fc17c74

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/fix-8478 [deleted] 689cee2b9

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-ignite [deleted] 99c559419

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/cxf_wrong_content_length [deleted] 4dc58a500

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-atmos [deleted] 7e9cb79b5

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/CAMEL-4232 [deleted] 95dcb38f7

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/CAMEL-6555 [deleted] fd2b4a7e5

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/temp-jetty9 [deleted] 85c890f73

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/jsonpath_encoding [deleted] 8cb2e8468

[camel] Git Push Summary

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/temp-jetty9-2 [deleted] 0d96e56d2

camel git commit: CAMEL-9791: Threads EIP should use the rejection handler if configured. And only use caller runs as fallback.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master fd4378ede -> 48f76064e


CAMEL-9791: Threads EIP should use the rejection handler if configured. And 
only use caller runs as fallback.


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

Branch: refs/heads/master
Commit: 48f76064ef65ffd828940efc5fc078c638350085
Parents: fd4378e
Author: Claus Ibsen 
Authored: Tue Apr 12 11:40:48 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Apr 12 11:53:54 2016 +0200

--
 .../camel/management/mbean/ManagedThreads.java  | 11 ++-
 .../apache/camel/model/ThreadsDefinition.java   | 30 +---
 .../camel/processor/ThreadsProcessor.java   | 72 +---
 3 files changed, 59 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/48f76064/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
index 408dbcb..fe78b10 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreads.java
@@ -40,13 +40,18 @@ public class ManagedThreads extends ManagedProcessor 
implements ManagedThreadsMB
 
 @Override
 public Boolean isCallerRunsWhenRejected() {
-return processor.isCallerRunsWhenRejected();
+if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
+String name = getRejectedPolicy();
+return "CallerRuns".equals(name);
+} else {
+return null;
+}
 }
 
 @Override
 public String getRejectedPolicy() {
-if (processor.getRejectedPolicy() != null) {
-return processor.getRejectedPolicy().name();
+if (processor.getExecutorService() instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor) 
processor.getExecutorService()).getRejectedExecutionHandler().toString();
 } else {
 return null;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/48f76064/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index 065be28..a287659 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -85,6 +85,19 @@ public class ThreadsDefinition extends 
OutputDefinition imple
 // prefer any explicit configured executor service
 boolean shutdownThreadPool = 
ProcessorDefinitionHelper.willCreateNewThreadPool(routeContext, this, true);
 ExecutorService threadPool = 
ProcessorDefinitionHelper.getConfiguredExecutorService(routeContext, name, 
this, false);
+
+// resolve what rejected policy to use
+ThreadPoolRejectedPolicy policy = resolveRejectedPolicy(routeContext);
+if (policy == null) {
+if (callerRunsWhenRejected == null || callerRunsWhenRejected) {
+// should use caller runs by default if not configured
+policy = ThreadPoolRejectedPolicy.CallerRuns;
+} else {
+policy = ThreadPoolRejectedPolicy.Abort;
+}
+}
+log.debug("Using ThreadPoolRejectedPolicy: {}", policy);
+
 // if no explicit then create from the options
 if (threadPool == null) {
 ExecutorServiceManager manager = 
routeContext.getCamelContext().getExecutorServiceManager();
@@ -94,7 +107,7 @@ public class ThreadsDefinition extends 
OutputDefinition imple
 .maxPoolSize(getMaxPoolSize())
 .keepAliveTime(getKeepAliveTime(), getTimeUnit())
 .maxQueueSize(getMaxQueueSize())
-.rejectedPolicy(getRejectedPolicy())
+.rejectedPolicy(policy)
 .allowCoreThreadTimeOut(getAllowCoreThreadTimeOut())
 .build();
 threadPool = manager.newThreadPool(this, name, profile);
@@ -112,6 +125,9 @@ public class ThreadsDefinition extends 
OutputDefinition imple
 if (getKeepAliveTime() != null) {
 throw new IllegalArgumentException("KeepAliveTime and 

svn commit: r985465 - in /websites/production/camel/content: cache/main.pageCache infinispan.html

[buildbot]

Author: buildbot
Date: Tue Apr 12 09:18:55 2016
New Revision: 985465

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/infinispan.html
==
--- websites/production/camel/content/infinispan.html (original)
+++ websites/production/camel/content/infinispan.html Tue Apr 12 09:18:55 2016
@@ -130,7 +130,6 @@
 true
 );
 
-
 context.addRoutes(new RouteBuilder() {
 void configure() {
 from(direct:start)
@@ -140,6 +139,46 @@ context.addRoutes(new RouteBuilder() {
 .to(mock:result);
 }
 });]]>
+Spring 
XML
+http://www.springframework.org/schema/beans";
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
+ http://camel.apache.org/schema/spring/camel-spring.xsd">;
+
+  <bean id="cacheManagerFactory" 
class="org.infinispan.spring.provider.SpringRemoteCacheManagerFactoryBean">
+<property
+name="configurationProperties">
+  <props>
+<prop 
key="infinispan.client.hotrod.server_list">127.0.0.1:11222</prop>
+<prop 
key="infinispan.client.hotrod.force_return_values">true</prop>
+  </props>
+</property>
+  </bean>
+
+  <bean id="cacheManager" 
factory-bean="cacheManagerFactory" 
factory-method="getNativeCacheManager" init-method="start" 
destroy-method="stop">
+  </bean>
+
+  <bean id="infinispanRepo" 
class="org.apache.camel.component.infinispan.processor.idempotent.InfinispanIdempotentRepository"
+factory-method="infinispanIdempotentRepository">
+<constructor-arg ref="cacheManager"/>
+<constructor-arg value="idempotent"/>
+  </bean>
+
+  <camelContext xmlns="http://camel.apache.org/schema/spring">;
+<route id="infinispan-remote">
+  <from uri="direct:start" />
+  <idempotentConsumer 
messageIdRepositoryRef="infinispanRepo">
+<header>MessageId</header>
+<to 
uri="log:org.apache.camel.component.infinispan?level=INFO&amp;showAll=true&amp;multiline=true"
 />
+  </idempotentConsumer>
+</route>
+  </camelContext>
+
+</beans>]]>
 For more information, see these 
resources...See Also
 Configuring 
CamelComponentEndpointGetting Started
 

svn commit: r985460 - in /websites/production/camel/content: cache/main.pageCache camel-2180-release.html

[buildbot]

Author: buildbot
Date: Tue Apr 12 07:19:59 2016
New Revision: 985460

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2180-release.html

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

Modified: websites/production/camel/content/camel-2180-release.html
==
--- websites/production/camel/content/camel-2180-release.html (original)
+++ websites/production/camel/content/camel-2180-release.html Tue Apr 12 
07:19:59 2016
@@ -85,7 +85,7 @@

 
 
-Camel 2.18.0 
release (currently in progress)http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src="http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;>New and NoteworthyWelcome to 
the x.y.z release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)Improved theBean component to better match method parameter types when 
usingSimple language as parameter 
values.AddedBindyConverter that
  allows to implement custom data converters forBindyThe access in theRest DSL has been deprecated and no longer in use - 
its not part of swagger specification anymore.Camel-NATSnow uses JNATS client instead of the 
deprecated Java_nats one.During startup ofCamelContext the services that are used as part of 
routes are now deferred being started to the end of the startup process. Some 
IoC frameworks like Spring can otherwise causes a circular dependency issue if 
services are started too early. A side effect is that if service startup 
failures happen when being started later, they are now wrapped in the 
FailedToStartupRouteException to better pin point which route thas the 
problem.Improved the startup sequence ofSprin
 g Java Config to be similar toSpring Boot that helps prevent Spring 
initialization errors about circular dependencies issues.Added PATCH 
toRest DSLAdded "starts 
with" and "ends with" operator to the Simplelanguage.AddedBeanIOSplitter
 toBeanIO that can be used with 
theSplitter EIP to split big 
payloads in streaming mode without reading the entire content into 
memory.Fixed these issuesFixedBean component to avoid ambiguous error for classes that 
extends generic interface and calling which could lead to falsly duplicate 
methods (due Java type erasure inserts bridge methods)Fixed 
splitting usingtarfile could cause OOME i
 f splitting big files which was mistakenly loaded into memory. Now we work on 
the tar stream directly.FixedNetty HTTP andNetty4 HTTP issue when not specifing a port number 
then port 80 would not be used but an error about port -1 is not 
allowed.FixedSwagger 
Java when using property placeholders inRest DSL could cause invalid parameters to be included 
that was from the placeholder.ThethreadsEIP 
now letsError 
handling in Camelperform redeliveries if the thread pool would 
otherwise reject accepting the task. This allows the error handler to perform 
redeliveries to attempt to put the task on the thread pool queue, or eventually 
move the message to a dead letter queue etc.FixedRest DSL adding empty 
 >header if specifying a non required query parameter that has no defualt value 
 >assigned.New href="enterprise-integration-patterns.html">Enterprise Integration 
 >PatternsNew href="components.html">Componentscamel-cm-sms - For sending 
 >SMS messages using SM SMS Gatewaycamel-servicenow - For cloud 
 >management with ServiceNowhref="hystrix.html">camel-hystrix - For implementing circuit breaker, 
 >timeouts, bulkeahds, caching, etc.href="camel-zipkin.html">camel-zipkin - For tracking Camel message 
 >flows/timings using href="http://zipkin.io/; rel="nofollow">zipkinid="Camel2.18.0Release-NewDSL">New DSLid="Camel2.18.0Release-NewAnnotations">New Annotations
 New Data FormatsNew LanguagesNew 
ExamplesNew TutorialsAPI breakingKnown Issuescamel-guice cannot 
install in Karaf/ServiceMixImportant 
changes to consider when upgradingJava 1.8 is now 
required.camel-gae has been removed (was not working 
anyway)karaf 2.4.x is no longer supportedspring 3.x is no 
longer supported(only spring-dm using spring 3.2.x as part of 
camel-spring in osgi/k
 araf is still in use - but spring-dm is deprecated and we recommend using 
blueprint)The access in theRest DSL has been deprecated and no longer in use - 
its not part of swagger specification anymore.Removed the deprecated 
maven archetypes for SOAP WS using CXF with OSGi BlueprintGetting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows 

[2/2] camel git commit: Upgrade Atomikos to version 4.0.2

[acosentino]

Upgrade Atomikos to version 4.0.2


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

Branch: refs/heads/master
Commit: 8e5d2ed0c3d2a15d165c39f0e13e077611f30c06
Parents: c76b432
Author: Andrea Cosentino 
Authored: Tue Apr 12 08:25:07 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 08:36:17 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8e5d2ed0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 59dbe63..7705ed9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -58,7 +58,7 @@
 2.2.2
 2.4.3
 [2.4,3.0)
-3.9.3
+4.0.2
 4.3.1_1
 4.3.1
 1.8.0

[1/2] camel git commit: Upgrade Braintree to version 2.59.0

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master c76b432a9 -> fd4378ede


Upgrade Braintree to version 2.59.0


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

Branch: refs/heads/master
Commit: fd4378edeb5dc346cc37b08fd1760e928f664987
Parents: 8e5d2ed
Author: Andrea Cosentino 
Authored: Tue Apr 12 08:35:55 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Apr 12 08:36:17 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/fd4378ed/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7705ed9..38d26c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,7 +76,7 @@
 0.33
 1.54
 3.2.1
-2.58.0
+2.59.0
 3.5.0
 1.10
 0.9.5.2

[2/2] camel git commit: CAMEL-9772: Make it easier to turn on/off logExhaustedMessageBody

[davsclaus]

CAMEL-9772: Make it easier to turn on/off logExhaustedMessageBody


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

Branch: refs/heads/master
Commit: c76b432a991a8aef614f8d1c742d7d355cf64055
Parents: 52c5656
Author: Claus Ibsen 
Authored: Tue Apr 12 08:21:04 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Apr 12 08:21:04 2016 +0200

--
 .../org/apache/camel/RuntimeConfiguration.java  |  4 +--
 ...CamelContextLogExhaustedMessageBodyTest.java |  5 +--
 .../blueprint/CamelContextFactoryBean.java  | 10 ++
 .../xml/AbstractCamelContextFactoryBean.java|  5 +++
 .../spring/boot/CamelAutoConfiguration.java |  1 +
 .../boot/CamelConfigurationProperties.java  | 15 +
 ...CamelContextLogExhaustedMessageBodyTest.java | 30 ++
 ...gCamelContextLogExhaustedMessageBodyTest.xml | 33 
 8 files changed, 97 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c76b432a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java 
b/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
index 9ad8d69..7264ec0 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
@@ -67,14 +67,14 @@ public interface RuntimeConfiguration {
 Boolean isMessageHistory();
 
 /**
- * Sets whether the message body should be logged (default is disabled).
+ * Sets whether to log exhausted message body with message history.
  *
  * @param logExhaustedMessageBody whether message body should be logged
  */
 void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody);
 
 /**
- * Returns whether the message body should be logged
+ * Returns whether to log exhausted message body with message history.
  * 
  * @return true if logging of message body is enabled
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/c76b432a/camel-core/src/test/java/org/apache/camel/processor/CamelContextLogExhaustedMessageBodyTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/CamelContextLogExhaustedMessageBodyTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/CamelContextLogExhaustedMessageBodyTest.java
index bb294fd..f4d22b1 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/CamelContextLogExhaustedMessageBodyTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/CamelContextLogExhaustedMessageBodyTest.java
@@ -34,18 +34,15 @@ public class CamelContextLogExhaustedMessageBodyTest 
extends ContextTestSupport
 @Override
 protected CamelContext createCamelContext() throws Exception {
 CamelContext context = super.createCamelContext();
-context.setLogExhaustedMessageBody(Boolean.TRUE);
+context.setLogExhaustedMessageBody(true);
 return context;
 }
 
 @Override
 protected RouteBuilder createRouteBuilder() throws Exception {
-
 return new RouteBuilder() {
-
 @Override
 public void configure() throws Exception {
-
 from("direct:start")
 .log("Incoming ${body}")
 .throwException(new IllegalArgumentException("Forced"));

http://git-wip-us.apache.org/repos/asf/camel/blob/c76b432a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
--
diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 71dde2c..aaebc7f 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -87,6 +87,8 @@ public class CamelContextFactoryBean extends 
AbstractCamelContextFactoryBeanhttp://git-wip-us.apache.org/repos/asf/camel/blob/c76b432a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
--
diff --git 

[1/2] camel git commit: CAMEL-9772: Make it easier to turn on/off logExhaustedMessageBody

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 2ec62fc27 -> c76b432a9


CAMEL-9772: Make it easier to turn on/off logExhaustedMessageBody

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

Branch: refs/heads/master
Commit: 52c5656166e9dd61315af8d2eb0de38439fd91fb
Parents: 2ec62fc
Author: Preben Asmussen 
Authored: Mon Apr 11 19:12:46 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Apr 12 07:59:36 2016 +0200

--
 .../org/apache/camel/RuntimeConfiguration.java  | 14 +
 .../apache/camel/impl/DefaultCamelContext.java  | 10 
 .../apache/camel/impl/DefaultRouteContext.java  | 14 +
 .../camel/processor/RedeliveryErrorHandler.java |  6 ++-
 ...CamelContextLogExhaustedMessageBodyTest.java | 55 
 .../camel/spring/CamelContextFactoryBean.java   | 15 +-
 6 files changed, 110 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/52c56561/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java 
b/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
index e1e0e2e..9ad8d69 100644
--- a/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/RuntimeConfiguration.java
@@ -67,6 +67,20 @@ public interface RuntimeConfiguration {
 Boolean isMessageHistory();
 
 /**
+ * Sets whether the message body should be logged (default is disabled).
+ *
+ * @param logExhaustedMessageBody whether message body should be logged
+ */
+void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody);
+
+/**
+ * Returns whether the message body should be logged
+ * 
+ * @return true if logging of message body is enabled
+ */
+Boolean isLogExhaustedMessageBody();
+
+/**
  * Sets whether fault handling is enabled or not (default is disabled).
  *
  * @param handleFault whether to enable fault handling.

http://git-wip-us.apache.org/repos/asf/camel/blob/52c56561/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 a8ff760..654c7b9 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
@@ -39,6 +39,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.naming.Context;
@@ -214,6 +215,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 private Boolean autoStartup = Boolean.TRUE;
 private Boolean trace = Boolean.FALSE;
 private Boolean messageHistory = Boolean.TRUE;
+private Boolean logExhaustedMessageBody = Boolean.FALSE;
 private Boolean streamCache = Boolean.FALSE;
 private Boolean handleFault = Boolean.FALSE;
 private Boolean disableJMX = Boolean.FALSE;
@@ -2617,6 +2619,14 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 this.messageHistory = messageHistory;
 }
 
+public Boolean isLogExhaustedMessageBody() {
+return logExhaustedMessageBody;
+}
+
+public void setLogExhaustedMessageBody(Boolean logExhaustedMessageBody) {
+this.logExhaustedMessageBody = logExhaustedMessageBody;
+}
+
 public Boolean isHandleFault() {
 return handleFault;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/52c56561/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
index 089bdea..1e6da51 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
@@ -60,6 +60,7 @@ public class DefaultRouteContext implements RouteContext {
 private boolean routeAdded;
 private Boolean trace;