camel git commit: Upgraded roaster

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 0b46b0820 -> 7e15cf58d


Upgraded roaster


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

Branch: refs/heads/master
Commit: 7e15cf58d7fcbcc8f95d2c87a207dc7425cf80f7
Parents: 0b46b08
Author: Claus Ibsen 
Authored: Fri Jul 15 17:16:40 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 17:16:40 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/7e15cf58/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e96f682..40ce8f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -480,7 +480,7 @@
 1.7R2_3
 1.7R2
 2.2.0
-2.18.3.Final
+2.19.0.Final
 1.0_3
 1.0
 1.1.7

[1/2] camel git commit: CAMEL-10133 Allow to configure the SSL configuration of the lumberjack component at the component level

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 9e574afcf -> 0b46b0820


CAMEL-10133 Allow to configure the SSL configuration of the lumberjack 
component at the component level


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

Branch: refs/heads/master
Commit: e60279cd723e9e63909c566a33fbf5c42031a1ef
Parents: 9e574af
Author: Antoine DESSAIGNE 
Authored: Fri Jul 15 16:13:56 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 17:04:27 2016 +0200

--
 .../src/main/docs/lumberjack.adoc   | 14 +++-
 .../lumberjack/LumberjackComponent.java | 15 
 .../lumberjack/LumberjackEndpoint.java  | 24 ++--
 3 files changed, 50 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e60279cd/components/camel-lumberjack/src/main/docs/lumberjack.adoc
--
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc 
b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index 7d560cb..3b0083a 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -40,14 +40,26 @@ Options
 ^^^
 
 
+
 // component options: START
-The Lumberjack component has no options.
+The Lumberjack component supports 1 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
+|===
+| Name | Java Type | Description
+| sslContextParameters | SSLContextParameters | Sets the default SSL 
configuration to use for all the endpoints. You can also configure it directly 
at the endpoint level.
+|===
+{% endraw %}
 // component options: END
 
 
 
 
 
+
 // endpoint options: START
 The Lumberjack component supports 7 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e60279cd/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
--
diff --git 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
index 096d10f..96fbb3d 100644
--- 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
+++ 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
@@ -20,6 +20,7 @@ import java.util.Map;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.util.jsse.SSLContextParameters;
 
 /**
  * The class is the Camel component for the Lumberjack server
@@ -27,6 +28,8 @@ import org.apache.camel.impl.UriEndpointComponent;
 public class LumberjackComponent extends UriEndpointComponent {
 static final int DEFAULT_PORT = 5044;
 
+private SSLContextParameters sslContextParameters;
+
 public LumberjackComponent() {
 this(LumberjackEndpoint.class);
 }
@@ -54,4 +57,16 @@ public class LumberjackComponent extends 
UriEndpointComponent {
 setProperties(answer, parameters);
 return answer;
 }
+
+public SSLContextParameters getSslContextParameters() {
+return sslContextParameters;
+}
+
+/**
+ * Sets the default SSL configuration to use for all the endpoints. You 
can also configure it directly at
+ * the endpoint level.
+ */
+public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
+this.sslContextParameters = sslContextParameters;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e60279cd/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
--
diff --git 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
index a86fe14..8c9d23d 100644
--- 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
+++ 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java
@@ -16,6 +16,8 @@
  */
 package 

[2/2] camel git commit: Add SB files. This fixes #1078

[davsclaus]

Add SB files. This fixes #1078


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

Branch: refs/heads/master
Commit: 0b46b082049738055bf46491564f66b9590dd11c
Parents: e60279c
Author: Claus Ibsen 
Authored: Fri Jul 15 17:05:47 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 17:05:47 2016 +0200

--
 .../LumberjackComponentAutoConfiguration.java   | 52 
 .../LumberjackComponentConfiguration.java   | 44 +
 .../main/resources/META-INF/spring.factories| 19 +++
 3 files changed, 115 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0b46b082/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
--
diff --git 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
new file mode 100644
index 000..56c0466
--- /dev/null
+++ 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
@@ -0,0 +1,52 @@
+/**
+ * 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.lumberjack.springboot;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.lumberjack.LumberjackComponent;
+import org.apache.camel.util.IntrospectionSupport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration
+@EnableConfigurationProperties(LumberjackComponentConfiguration.class)
+public class LumberjackComponentAutoConfiguration {
+
+@Bean
+@ConditionalOnClass(CamelContext.class)
+@ConditionalOnMissingBean(LumberjackComponent.class)
+public LumberjackComponent configureLumberjackComponent(
+CamelContext camelContext,
+LumberjackComponentConfiguration configuration) throws Exception {
+LumberjackComponent component = new LumberjackComponent();
+component.setCamelContext(camelContext);
+Map parameters = new HashMap<>();
+IntrospectionSupport.getProperties(configuration, parameters, null,
+false);
+IntrospectionSupport.setProperties(camelContext,
+camelContext.getTypeConverter(), component, parameters);
+return component;
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/0b46b082/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
--
diff --git 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
new file mode 100644
index 000..e3dc61d
--- /dev/null
+++ 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor 

camel git commit: Deprecated component

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master e1aa5afb8 -> 9e574afcf


Deprecated component


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

Branch: refs/heads/master
Commit: 9e574afcf425c4501987a8ef146bfd5d7cab9573
Parents: e1aa5af
Author: Claus Ibsen 
Authored: Fri Jul 15 15:46:28 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 15:48:39 2016 +0200

--
 components/camel-hawtdb/pom.xml| 2 +-
 components/camel-hdfs/pom.xml  | 2 +-
 components/camel-openshift/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9e574afc/components/camel-hawtdb/pom.xml
--
diff --git a/components/camel-hawtdb/pom.xml b/components/camel-hawtdb/pom.xml
index 9a0741c..859ca1b 100644
--- a/components/camel-hawtdb/pom.xml
+++ b/components/camel-hawtdb/pom.xml
@@ -26,7 +26,7 @@
 
 camel-hawtdb
 jar
-Camel :: HawtDB
+Camel :: HawtDB (deprecated)
 Camel HawtDB Support
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/9e574afc/components/camel-hdfs/pom.xml
--
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 5f572d9..7fcc471 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -28,7 +28,7 @@
 
 camel-hdfs
 jar
-Camel :: HDFS
+Camel :: HDFS (deprecated)
 Camel HDFS support
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/9e574afc/components/camel-openshift/pom.xml
--
diff --git a/components/camel-openshift/pom.xml 
b/components/camel-openshift/pom.xml
index 9b0c81b..94edbe6 100644
--- a/components/camel-openshift/pom.xml
+++ b/components/camel-openshift/pom.xml
@@ -26,7 +26,7 @@
 
   camel-openshift
   jar
-  Camel :: OpenShift
+  Camel :: OpenShift (deprecated)
   Camel OpenShift 2.x support
 
   

camel git commit: Upgrade Netty to version 4.1.3.Final

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master a80c4ba0a -> e1aa5afb8


Upgrade Netty to version 4.1.3.Final


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

Branch: refs/heads/master
Commit: e1aa5afb893e3cb0b186a13c827e0c9b72a590f5
Parents: a80c4ba
Author: Andrea Cosentino 
Authored: Fri Jul 15 15:33:36 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 15:33:49 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/e1aa5afb/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index edc8d48..e96f682 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,7 +427,7 @@
 3.4.1
 3.0.1
 3.10.6.Final
-4.1.2.Final
+4.1.3.Final
 0.5_1
 
 1.2.7

[2/2] camel git commit: CAMEL-10142: Fixed using scheduler=spring without any further configuration would not use spring as the scheduler.

[davsclaus]

CAMEL-10142: Fixed using scheduler=spring without any further configuration 
would not use spring as the scheduler.


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

Branch: refs/heads/camel-2.17.x
Commit: e6ce94feb115939fbd86480de58a739270440622
Parents: d88907a
Author: Claus Ibsen 
Authored: Fri Jul 15 12:44:47 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 15:21:30 2016 +0200

--
 .../org/apache/camel/impl/DefaultComponent.java | 22 -
 .../file/FileConsumerSpringSchedulerTest.java   | 47 
 2 files changed, 59 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6ce94fe/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
index c6492ea..055df59 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
@@ -116,17 +116,15 @@ public abstract class DefaultComponent extends 
ServiceSupport implements Compone
 return null;
 }
 
-if (!parameters.isEmpty()) {
-endpoint.configureProperties(parameters);
-if (useIntrospectionOnEndpoint()) {
-setProperties(endpoint, parameters);
-}
+endpoint.configureProperties(parameters);
+if (useIntrospectionOnEndpoint()) {
+setProperties(endpoint, parameters);
+}
 
-// if endpoint is strict (not lenient) and we have unknown 
parameters configured then
-// fail if there are parameters that could not be set, then they 
are probably misspell or not supported at all
-if (!endpoint.isLenientProperties()) {
-validateParameters(uri, parameters, null);
-}
+// if endpoint is strict (not lenient) and we have unknown parameters 
configured then
+// fail if there are parameters that could not be set, then they are 
probably misspell or not supported at all
+if (!endpoint.isLenientProperties()) {
+validateParameters(uri, parameters, null);
 }
 
 afterConfiguration(uri, path, endpoint, parameters);
@@ -174,6 +172,10 @@ public abstract class DefaultComponent extends 
ServiceSupport implements Compone
  * @throws ResolveEndpointFailedException should be thrown if the URI 
validation failed
  */
 protected void validateParameters(String uri, Map 
parameters, String optionPrefix) {
+if (parameters == null || parameters.isEmpty()) {
+return;
+}
+
 Map param = parameters;
 if (optionPrefix != null) {
 param = IntrospectionSupport.extractProperties(parameters, 
optionPrefix);

http://git-wip-us.apache.org/repos/asf/camel/blob/e6ce94fe/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
new file mode 100644
index 000..08f0b13
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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.file;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+public class FileConsumerSpringSchedulerTest extends ContextTestSupport {

[1/2] camel git commit: CAMEL-10142: Fixed using scheduler=spring without any further configuration would not use spring as the scheduler.

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x d88907a6d -> e6ce94feb
  refs/heads/master ee03cec2a -> a80c4ba0a


CAMEL-10142: Fixed using scheduler=spring without any further configuration 
would not use spring as the scheduler.


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

Branch: refs/heads/master
Commit: a80c4ba0a84d5c21bb93241a12d4c3b05b4509a2
Parents: ee03cec
Author: Claus Ibsen 
Authored: Fri Jul 15 12:44:47 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 15:20:48 2016 +0200

--
 .../org/apache/camel/impl/DefaultComponent.java | 22 -
 .../file/FileConsumerSpringSchedulerTest.java   | 47 
 2 files changed, 59 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a80c4ba0/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
index 51ce352..dca1446 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
@@ -114,17 +114,15 @@ public abstract class DefaultComponent extends 
ServiceSupport implements Compone
 return null;
 }
 
-if (!parameters.isEmpty()) {
-endpoint.configureProperties(parameters);
-if (useIntrospectionOnEndpoint()) {
-setProperties(endpoint, parameters);
-}
+endpoint.configureProperties(parameters);
+if (useIntrospectionOnEndpoint()) {
+setProperties(endpoint, parameters);
+}
 
-// if endpoint is strict (not lenient) and we have unknown 
parameters configured then
-// fail if there are parameters that could not be set, then they 
are probably misspell or not supported at all
-if (!endpoint.isLenientProperties()) {
-validateParameters(uri, parameters, null);
-}
+// if endpoint is strict (not lenient) and we have unknown parameters 
configured then
+// fail if there are parameters that could not be set, then they are 
probably misspell or not supported at all
+if (!endpoint.isLenientProperties()) {
+validateParameters(uri, parameters, null);
 }
 
 afterConfiguration(uri, path, endpoint, parameters);
@@ -172,6 +170,10 @@ public abstract class DefaultComponent extends 
ServiceSupport implements Compone
  * @throws ResolveEndpointFailedException should be thrown if the URI 
validation failed
  */
 protected void validateParameters(String uri, Map 
parameters, String optionPrefix) {
+if (parameters == null || parameters.isEmpty()) {
+return;
+}
+
 Map param = parameters;
 if (optionPrefix != null) {
 param = IntrospectionSupport.extractProperties(parameters, 
optionPrefix);

http://git-wip-us.apache.org/repos/asf/camel/blob/a80c4ba0/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
new file mode 100644
index 000..08f0b13
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSpringSchedulerTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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.file;
+
+import org.apache.camel.ContextTestSupport;

camel git commit: Added automatic generated docs for Influxdb component

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master f605d01ce -> ee03cec2a


Added automatic generated docs for Influxdb component


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

Branch: refs/heads/master
Commit: ee03cec2a92a48358bf2b503c160d46b51a036f2
Parents: f605d01
Author: Andrea Cosentino 
Authored: Fri Jul 15 13:20:04 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 13:24:07 2016 +0200

--
 components/camel-influxdb/src/main/docs/influxdb.adoc | 14 --
 .../services/org/apache/camel/component/influxdb  |  3 +--
 2 files changed, 13 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ee03cec2/components/camel-influxdb/src/main/docs/influxdb.adoc
--
diff --git a/components/camel-influxdb/src/main/docs/influxdb.adoc 
b/components/camel-influxdb/src/main/docs/influxdb.adoc
index b7ffb1c..a61f574 100644
--- a/components/camel-influxdb/src/main/docs/influxdb.adoc
+++ b/components/camel-influxdb/src/main/docs/influxdb.adoc
@@ -45,23 +45,33 @@ The producer allows sending messages to a influxdb
 configured in the registry, using the native java driver.
 
 
+
 // component options: START
-The InfluxDb component has no options.
+The InfluxDB component has no options.
 // component options: END
 
 
+
+
 // endpoint options: START
-The InfluxDb component supports 15 endpoint options which are listed below:
+The InfluxDB component supports 5 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
+| Name | Group | Default | Java Type | Description
+| connectionBean | producer |  | String | *Required* Name of 
org.influxdb.InfluxDB to use.
+| databaseName | producer |  | String | Setter for databaseName
+| retentionPolicy | producer | default | String | Setter for retentionPolicy
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 |===
 {% endraw %}
 // endpoint options: END
 
 
 
+
 [[InfluxDb-MessageHeaders]]
 Message Headers
 ^^^

http://git-wip-us.apache.org/repos/asf/camel/blob/ee03cec2/components/camel-influxdb/src/main/resources/META-INF/services/org/apache/camel/component/influxdb
--
diff --git 
a/components/camel-influxdb/src/main/resources/META-INF/services/org/apache/camel/component/influxdb
 
b/components/camel-influxdb/src/main/resources/META-INF/services/org/apache/camel/component/influxdb
index a0d9e3c..f8e9043 100644
--- 
a/components/camel-influxdb/src/main/resources/META-INF/services/org/apache/camel/component/influxdb
+++ 
b/components/camel-influxdb/src/main/resources/META-INF/services/org/apache/camel/component/influxdb
@@ -14,5 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class=org.apache.camel.component.influxdb.InfluxDbComponent
-  
+class=org.apache.camel.component.influxdb.InfluxDbComponent
\ No newline at end of file

camel git commit: Fix lumberjack doc + Fix flaky test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 7cd38e565 -> f605d01ce


Fix lumberjack doc + Fix flaky test


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

Branch: refs/heads/master
Commit: f605d01ce2bbf92d3693cc4ac49eb302db8cf053
Parents: 7cd38e5
Author: Antoine DESSAIGNE 
Authored: Fri Jul 15 11:10:39 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 11:56:29 2016 +0200

--
 components/camel-lumberjack/src/main/docs/lumberjack.adoc  | 2 +-
 .../java/org/apache/camel/component/lumberjack/LumberjackUtil.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f605d01c/components/camel-lumberjack/src/main/docs/lumberjack.adoc
--
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc 
b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index bc92bbd..7d560cb 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -6,7 +6,7 @@ Lumberjack Component
 
 The *Lumberjack* component retrieves logs sent over the network using the 
Lumberjack protocol,
 from https://www.elastic.co/fr/products/beats/filebeat[Filebeat] for instance.
-The network communication can be secured with SSL using the `lumberjacks` 
component.
+The network communication can be secured with SSL.
 
 This component only supports consumer endpoints.
 

http://git-wip-us.apache.org/repos/asf/camel/blob/f605d01c/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
--
diff --git 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
index 2dcfbbb..397f254 100644
--- 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
+++ 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
@@ -82,6 +82,7 @@ final class LumberjackUtil {
 .connect("127.0.0.1", port).sync().channel(); //
 
 // Send the 2 window frames
+TimeUnit.MILLISECONDS.sleep(100);
 channel.writeAndFlush(readSample("io/window10"));
 TimeUnit.MILLISECONDS.sleep(100);
 channel.writeAndFlush(readSample("io/window15"));

camel git commit: CAMEL-10149: Camel-Ftp: SftpOperations use sendKeepAliveMsg instead of sendIgnore method

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x e8a55ac9c -> d88907a6d


CAMEL-10149: Camel-Ftp: SftpOperations use sendKeepAliveMsg instead of 
sendIgnore method


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

Branch: refs/heads/camel-2.17.x
Commit: d88907a6d6151a39da0c19686896af0517cb14dd
Parents: e8a55ac
Author: Andrea Cosentino 
Authored: Fri Jul 15 10:54:29 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 10:55:33 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/d88907a6/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index e9982a4..7104336 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -1017,7 +1017,7 @@ public class SftpOperations implements 
RemoteFileOperations
 public synchronized boolean sendNoop() throws 
GenericFileOperationFailedException {
 if (isConnected()) {
 try {
-session.sendIgnore();
+session.sendKeepAliveMsg();
 return true;
 } catch (Exception e) {
 LOG.debug("SFTP session was closed. Ignoring this exception.", 
e);

camel git commit: CAMEL-10149: Camel-Ftp: SftpOperations use sendKeepAliveMsg instead of sendIgnore method

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 80629f001 -> af0a8ddf2


CAMEL-10149: Camel-Ftp: SftpOperations use sendKeepAliveMsg instead of 
sendIgnore method


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

Branch: refs/heads/camel-2.16.x
Commit: af0a8ddf2cdaad738f68e9904aa35853dccefc32
Parents: 80629f0
Author: Andrea Cosentino 
Authored: Fri Jul 15 10:54:29 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 10:58:11 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/af0a8ddf/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index ab7e649..9f4458a 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -997,7 +997,7 @@ public class SftpOperations implements 
RemoteFileOperations
 public synchronized boolean sendNoop() throws 
GenericFileOperationFailedException {
 if (isConnected()) {
 try {
-session.sendIgnore();
+session.sendKeepAliveMsg();
 return true;
 } catch (Exception e) {
 LOG.debug("SFTP session was closed. Ignoring this exception.", 
e);

camel git commit: Added missing Apache Header to properties file in camel-influxdb

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master b73acbccd -> 31165de63


Added missing Apache Header to properties file in camel-influxdb


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

Branch: refs/heads/master
Commit: 31165de63cc1283de0dea9f2c9b4df13d3fecd7a
Parents: b73acbc
Author: Andrea Cosentino 
Authored: Fri Jul 15 10:42:02 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 10:42:02 2016 +0200

--
 .../src/test/resources/influxdb.test.properties| 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/31165de6/components/camel-influxdb/src/test/resources/influxdb.test.properties
--
diff --git 
a/components/camel-influxdb/src/test/resources/influxdb.test.properties 
b/components/camel-influxdb/src/test/resources/influxdb.test.properties
index c7c65e1..d19b017 100644
--- a/components/camel-influxdb/src/test/resources/influxdb.test.properties
+++ b/components/camel-influxdb/src/test/resources/influxdb.test.properties
@@ -1 +1,18 @@
+## 
+## 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.
+## 
+
 influxdb.testDb=myTestTimeSeries
\ No newline at end of file

camel git commit: Polished

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 8bed232e6 -> b73acbccd


Polished


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

Branch: refs/heads/master
Commit: b73acbccdf49d5ec351e305a334b438e9376fb05
Parents: 8bed232
Author: Andrea Cosentino 
Authored: Fri Jul 15 10:32:01 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 10:32:01 2016 +0200

--
 .../apache/camel/component/influxdb/CamelInfluxDbException.java | 4 +++-
 .../org/apache/camel/component/influxdb/InfluxDbComponent.java  | 5 +
 .../org/apache/camel/component/influxdb/InfluxDbConstants.java  | 3 ---
 .../org/apache/camel/component/influxdb/InfluxDbEndpoint.java   | 1 -
 .../component/influxdb/converters/CamelInfluxDbConverters.java  | 1 -
 .../apache/camel/component/influxdb/AbstractInfluxDbTest.java   | 1 -
 .../apache/camel/component/influxdb/InfluxDbProducerTest.java   | 1 -
 .../camel/component/influxdb/MockedInfluxDbConfiguration.java   | 1 -
 8 files changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b73acbcc/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
--
diff --git 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
index aedbfb5..ea50714 100644
--- 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
+++ 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.influxdb;
 
 public class CamelInfluxDbException extends RuntimeException {
 
-public CamelInfluxDbException(String message, Throwable cause) {
+   private static final long serialVersionUID = 1L;
+
+   public CamelInfluxDbException(String message, Throwable cause) {
 super(message, cause);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b73acbcc/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbComponent.java
--
diff --git 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbComponent.java
 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbComponent.java
index 9cb5657..2a6e5a1 100644
--- 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbComponent.java
+++ 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbComponent.java
@@ -19,16 +19,13 @@ package org.apache.camel.component.influxdb;
 import java.util.Map;
 
 import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.impl.UriEndpointComponent;
 import org.apache.camel.util.CamelContextHelper;
 import org.influxdb.InfluxDB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Created by jose on 18/06/16.
- */
+
 public class InfluxDbComponent extends UriEndpointComponent {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(InfluxDbComponent.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/b73acbcc/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbConstants.java
--
diff --git 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbConstants.java
 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbConstants.java
index e98d947..06a7124 100644
--- 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbConstants.java
+++ 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbConstants.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.influxdb;
 
-/**
- * Created by jose on 18/06/16.
- */
 public final class InfluxDbConstants {
 
 public static final String MEASUREMENT_NAME = 
"camelInfluxDB.MeasurementName";

http://git-wip-us.apache.org/repos/asf/camel/blob/b73acbcc/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
--
diff --git 

svn commit: r992872 [1/2] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache camel-2180-release.html component-list.html component.html componen

[buildbot]

Author: buildbot
Date: Fri Jul 15 08:20:52 2016
New Revision: 992872

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/lumberjack.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/camel-2180-release.html
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 Jul 15 
08:20:52 2016
@@ -428,7 +428,9 @@ flink:datastream[?options]]]>
 Uses 
Jakarta Commons Logging to log the message exchange to some underlying logging 
system like log4jLucene / 
camel-lucene
 
-Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesMetrics / camel-metrics
+Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesLumberjack / camel-lumberjack
+
+Uses 
the Lumberjack protocol for retrieving logs (from Filebeat for 
instance)Metrics / camel-metrics
 
 Uses  http://metrics.codahale.com/; style="line-height: 
1.4285715;" rel="nofollow">Metrics   to collect 
application statistics directly from Camel routes.MINA / camel-mina
 
 Uses 
Jakarta Commons Logging to log the message exchange to some underlying logging 
system like log4jLucene / 
camel-lucene
 
-Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesMetrics / camel-metrics
+Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesLumberjack / camel-lumberjack
+
+Uses 
the Lumberjack protocol for retrieving logs (from Filebeat for 
instance)Metrics / camel-metrics
 
 Uses  http://metrics.codahale.com/; style="line-height: 
1.4285715;" rel="nofollow">Metrics   to collect 
application statistics directly from Camel routes.MINA / camel-mina
 Examples useful.
 
 
Tutorial on Spring 
Remoting with JMS
 
Thanks
This tutorial was kindly donated 
to Apache Camel by Martin Gilday.
Preface
This 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.

+/*]]>*/

 

svn commit: r992872 [2/2] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache camel-2180-release.html component-list.html component.html componen

[buildbot]

Modified: websites/production/camel/content/transport.html
==
--- websites/production/camel/content/transport.html (original)
+++ websites/production/camel/content/transport.html Fri Jul 15 08:20:52 2016
@@ -408,7 +408,9 @@ flink:datastream[?options]]]>
 Uses 
Jakarta Commons Logging to log the message exchange to some underlying logging 
system like log4jLucene / 
camel-lucene
 
-Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesMetrics / camel-metrics
+Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesLumberjack / camel-lumberjack
+
+Uses 
the Lumberjack protocol for retrieving logs (from Filebeat for 
instance)Metrics / camel-metrics
 
 Uses  http://metrics.codahale.com/; style="line-height: 
1.4285715;" rel="nofollow">Metrics   to collect 
application statistics directly from Camel routes.MINA / camel-mina
 
 Uses 
Jakarta Commons Logging to log the message exchange to some underlying logging 
system like log4jLucene / 
camel-lucene
 
-Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesMetrics / camel-metrics
+Uses 
Apache Lucene to perform Java-based indexing and full text based searches using 
advanced analysis/tokenization capabilitiesLumberjack / camel-lumberjack
+
+Uses 
the Lumberjack protocol for retrieving logs (from Filebeat for 
instance)Metrics / camel-metrics
 
 Uses  http://metrics.codahale.com/; style="line-height: 
1.4285715;" rel="nofollow">Metrics   to collect 
application statistics directly from Camel routes.MINA / camel-mina
 

camel git commit: Added Spring-boot Integration Test for Camel-influxdb component

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 9e4cf3952 -> 8bed232e6


Added Spring-boot Integration Test for Camel-influxdb component


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

Branch: refs/heads/master
Commit: 8bed232e658a1c8b2a41e785bca3e7f31fd1438e
Parents: 9e4cf39
Author: Andrea Cosentino 
Authored: Fri Jul 15 10:13:06 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 10:13:06 2016 +0200

--
 .../itest/springboot/CamelInfluxdbTest.java | 48 
 1 file changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8bed232e/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfluxdbTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfluxdbTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfluxdbTest.java
new file mode 100644
index 000..6687a8c
--- /dev/null
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfluxdbTest.java
@@ -0,0 +1,48 @@
+/**
+ * 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.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelInfluxdbTest extends AbstractSpringBootTestSupport {
+
+@Deployment
+public static Archive createSpringBootPackage() throws Exception {
+return ArquillianPackager.springBootPackage(createTestConfig());
+}
+
+public static ITestConfig createTestConfig() {
+return new ITestConfigBuilder()
+.module(inferModuleName(CamelInfluxdbTest.class))
+.build();
+}
+
+@Test
+public void componentTests() throws Exception {
+this.runComponentTest(config);
+this.runModuleUnitTestsIfEnabled(config);
+}
+
+
+}

camel git commit: Fixed Camel-Influxdb Karaf feature and added Karaf Integration test

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 6540a69cf -> 9e4cf3952


Fixed Camel-Influxdb Karaf feature and added Karaf Integration test


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

Branch: refs/heads/master
Commit: 9e4cf395222782989fb6dca861024c830b519d20
Parents: 6540a69
Author: Andrea Cosentino 
Authored: Fri Jul 15 09:53:46 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 09:54:10 2016 +0200

--
 .../features/src/main/resources/features.xml|  4 +--
 .../camel/itest/karaf/CamelInfluxdbTest.java| 35 
 2 files changed, 37 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9e4cf395/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index c960122..f125746 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -810,8 +810,8 @@
   
   
 The camel-influxdb feature requires Java 8
-mvn:org.influxdb/influxdb-java/${influx-java-driver-version}
-camel-core
+wrap:mvn:org.influxdb/influxdb-java/${influx-java-driver-version}
+camel-core
 mvn:org.apache.camel/camel-influxdb/${project.version}
   
   

http://git-wip-us.apache.org/repos/asf/camel/blob/9e4cf395/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfluxdbTest.java
--
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfluxdbTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfluxdbTest.java
new file mode 100644
index 000..bfb927f
--- /dev/null
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfluxdbTest.java
@@ -0,0 +1,35 @@
+/**
+ * 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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelInfluxdbTest extends BaseKarafTest {
+
+public static final String COMPONENT = "influxdb";
+
+@Test
+public void test() throws Exception {
+testComponent(COMPONENT);
+}
+
+
+}

camel git commit: CAMEL-10139: Added unit test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 5fe728189 -> e8a55ac9c


CAMEL-10139: 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/e8a55ac9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8a55ac9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8a55ac9

Branch: refs/heads/camel-2.17.x
Commit: e8a55ac9c7097d9031197a7e97273405698b2ea9
Parents: 5fe7281
Author: Claus Ibsen 
Authored: Fri Jul 15 09:28:06 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 09:29:20 2016 +0200

--
 .../component/undertow/UndertowComponent.java   |  1 -
 .../rest/RestUndertowHttpMultipleVerbsTest.java | 56 
 2 files changed, 56 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e8a55ac9/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 67f7107..65771f2 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -344,5 +344,4 @@ public class UndertowComponent extends UriEndpointComponent 
implements RestConsu
 this.sslContextParameters = sslContextParameters;
 }
 
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e8a55ac9/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
new file mode 100644
index 000..3e61380
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
@@ -0,0 +1,56 @@
+/**
+ * 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.undertow.rest;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.undertow.BaseUndertowTest;
+import org.junit.Test;
+
+public class RestUndertowHttpMultipleVerbsTest extends BaseUndertowTest {
+
+@Test
+public void testProducerGetPut() throws Exception {
+getMockEndpoint("mock:get").expectedMessageCount(1);
+getMockEndpoint("mock:put").expectedMessageCount(0);
+
template.requestBodyAndHeader("undertow:http://localhost:{{port}}/example/123;, 
null, Exchange.HTTP_METHOD, "GET");
+assertMockEndpointsSatisfied();
+
+resetMocks();
+
+getMockEndpoint("mock:get").expectedMessageCount(0);
+getMockEndpoint("mock:put").expectedMessageCount(1);
+
template.requestBodyAndHeader("undertow:http://localhost:{{port}}/example/456;, 
"Hello World", Exchange.HTTP_METHOD, "PUT");
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+// configure to use undertow on localhost with the given port
+
restConfiguration().component("undertow").host("localhost").port(getPort());
+
+rest("/example")
+.get("{pathParamHere}").to("mock:get")
+.put("{pathParamHere}").to("mock:put");
+}
+};
+}
+
+}

camel git commit: CAMEL-10139: Added unit test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 87c881328 -> 6540a69cf


CAMEL-10139: 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/6540a69c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6540a69c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6540a69c

Branch: refs/heads/master
Commit: 6540a69cf9f8b4365386f8f0d446d4a0e15f646f
Parents: 87c8813
Author: Claus Ibsen 
Authored: Fri Jul 15 09:28:06 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 09:46:54 2016 +0200

--
 .../component/undertow/UndertowComponent.java   |  1 -
 .../rest/RestUndertowHttpMultipleVerbsTest.java | 56 
 2 files changed, 56 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6540a69c/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
--
diff --git 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 1277b70..f9677f6 100644
--- 
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ 
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -344,5 +344,4 @@ public class UndertowComponent extends UriEndpointComponent 
implements RestConsu
 this.sslContextParameters = sslContextParameters;
 }
 
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/6540a69c/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
new file mode 100644
index 000..3e61380
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpMultipleVerbsTest.java
@@ -0,0 +1,56 @@
+/**
+ * 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.undertow.rest;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.undertow.BaseUndertowTest;
+import org.junit.Test;
+
+public class RestUndertowHttpMultipleVerbsTest extends BaseUndertowTest {
+
+@Test
+public void testProducerGetPut() throws Exception {
+getMockEndpoint("mock:get").expectedMessageCount(1);
+getMockEndpoint("mock:put").expectedMessageCount(0);
+
template.requestBodyAndHeader("undertow:http://localhost:{{port}}/example/123;, 
null, Exchange.HTTP_METHOD, "GET");
+assertMockEndpointsSatisfied();
+
+resetMocks();
+
+getMockEndpoint("mock:get").expectedMessageCount(0);
+getMockEndpoint("mock:put").expectedMessageCount(1);
+
template.requestBodyAndHeader("undertow:http://localhost:{{port}}/example/456;, 
"Hello World", Exchange.HTTP_METHOD, "PUT");
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+// configure to use undertow on localhost with the given port
+
restConfiguration().component("undertow").host("localhost").port(getPort());
+
+rest("/example")
+.get("{pathParamHere}").to("mock:get")
+.put("{pathParamHere}").to("mock:put");
+}
+};
+}
+
+}

[1/2] camel git commit: https://issues.apache.org/jira/browse/CAMEL-10066

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master f496aac76 -> 87c881328


https://issues.apache.org/jira/browse/CAMEL-10066


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

Branch: refs/heads/master
Commit: 87c881328058b6c2cc0f8dd7ddd60296a78c9a02
Parents: 2976e7d
Author: Joseluis Pedrosa 
Authored: Thu Jul 14 16:31:05 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 09:21:19 2016 +0200

--
 .../component/influxdb/converters/CamelInfluxDbConverters.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/87c88132/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverters.java
--
diff --git 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverters.java
 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverters.java
index e3da9cf..5d3b0b6 100644
--- 
a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverters.java
+++ 
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverters.java
@@ -37,7 +37,7 @@ public final class CamelInfluxDbConverters {
 Object measurenmentName = map.get(InfluxDbConstants.MEASUREMENT_NAME);
 
 if (measurenmentName == null) {
-String format = String.format("Unable to find the header for the 
measurement " + map.size() + " to:" + map.keySet().toString());
+String format = String.format("Unable to find the header for the 
measurement in:" + map.keySet().toString());
 throw new CamelInfluxDbException(format);
 }
 

[2/2] camel git commit: Influxdb component created

[acosentino]

Influxdb component created


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

Branch: refs/heads/master
Commit: 2976e7dd9bfbcee7dadb4658ee2666837c71a035
Parents: f496aac
Author: Jose Luis Pedrosa 
Authored: Sun Jun 19 00:17:15 2016 +0200
Committer: Andrea Cosentino 
Committed: Fri Jul 15 09:21:19 2016 +0200

--
 apache-camel/pom.xml|   4 +
 .../src/main/descriptors/common-bin.xml |   1 +
 components/camel-influxdb/pom.xml   |  69 +++
 .../camel-influxdb/src/main/docs/influxdb.adoc  | 107 ++
 .../influxdb/CamelInfluxDbException.java|  32 +++
 .../component/influxdb/InfluxDbComponent.java   |  63 ++
 .../component/influxdb/InfluxDbConstants.java   |  33 +++
 .../component/influxdb/InfluxDbEndpoint.java| 157 ++
 .../component/influxdb/InfluxDbProducer.java|  97 +
 .../converters/CamelInfluxDbConverters.java |  59 ++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/TypeConverter |  18 ++
 .../org/apache/camel/component/influxdb |  18 ++
 .../influxdb/AbstractInfluxDbTest.java  |  40 
 .../influxdb/InfluxDbProducerTest.java  | 116 +++
 .../influxdb/MockedInfluxDbConfiguration.java   |  51 +
 .../converters/CamelInfluxDbConverterTest.java  | 108 ++
 .../src/test/resources/influxdb.test.properties |   1 +
 .../src/test/resources/log4j.properties |  35 
 components/pom.xml  |   1 +
 parent/pom.xml  |   6 +
 .../features/src/main/resources/features.xml|   6 +
 23 files changed, 1236 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2976e7dd/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index e2e6001..6595f1a 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -381,6 +381,10 @@
 
 
   org.apache.camel
+  camel-influxdb
+
+
+  org.apache.camel
   camel-irc
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2976e7dd/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 5f3e9bc..1e71816 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -106,6 +106,7 @@
 org.apache.camel:camel-ibatis
 org.apache.camel:camel-ical
 org.apache.camel:camel-infinispan
+org.apache.camel:camel-influxdb
 org.apache.camel:camel-ignite
 org.apache.camel:camel-irc
 org.apache.camel:camel-ironmq

http://git-wip-us.apache.org/repos/asf/camel/blob/2976e7dd/components/camel-influxdb/pom.xml
--
diff --git a/components/camel-influxdb/pom.xml 
b/components/camel-influxdb/pom.xml
new file mode 100644
index 000..53c476a
--- /dev/null
+++ b/components/camel-influxdb/pom.xml
@@ -0,0 +1,69 @@
+
+
+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.18-SNAPSHOT
+   
+
+   camel-influxdb
+   jar
+   Camel :: InfluxDB
+   Camel InfluxDB component
+
+   
+   
org.apache.camel.component.influxdb.*
+   
org.apache.camel.spi.ComponentResolver;component=influxdb
+   
+
+   
+
+   
+   org.apache.camel
+   camel-core
+   
+
+   
+   
+   org.influxdb
+   influxdb-java
+   ${influx-java-driver-version}
+   
+
+   
+   
+   org.apache.camel
+   camel-test-spring
+   test
+   
+   
+   org.mockito
+   mockito-core
+   test
+   
+   
+   org.slf4j
+   slf4j-log4j12
+   test
+   
+  

[3/4] camel git commit: Add Lumberjack component

[davsclaus]

Add Lumberjack component


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

Branch: refs/heads/master
Commit: 3d0379d0379944187d6c780cf7567b895697c648
Parents: 920a88d
Author: Antoine DESSAIGNE 
Authored: Fri Jul 8 09:37:53 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 08:59:27 2016 +0200

--
 apache-camel/pom.xml|  12 +-
 .../src/main/descriptors/common-bin.xml |   1 +
 components/camel-lumberjack/pom.xml |  84 +++
 .../src/main/docs/lumberjack.adoc   |  93 
 .../lumberjack/LumberjackComponent.java |  60 +
 .../lumberjack/LumberjackConsumer.java  |  68 ++
 .../lumberjack/LumberjackEndpoint.java  |  54 +
 .../lumberjack/LumberjacksComponent.java|  31 +++
 .../lumberjack/LumberjacksEndpoint.java |  45 
 .../io/LumberjackChannelInitializer.java|  62 ++
 .../lumberjack/io/LumberjackConstants.java  |  46 
 .../lumberjack/io/LumberjackFrameDecoder.java   | 217 +++
 .../lumberjack/io/LumberjackMessage.java|  38 
 .../lumberjack/io/LumberjackMessageHandler.java |  67 ++
 .../io/LumberjackMessageProcessor.java  |  44 
 .../lumberjack/io/LumberjackServer.java | 111 ++
 .../lumberjack/io/LumberjackSessionHandler.java |  65 ++
 .../src/main/resources/LICENSE.txt  | 203 +
 .../org/apache/camel/component/lumberjack   |  17 ++
 .../org/apache/camel/component/lumberjacks  |  17 ++
 .../src/main/resources/NOTICE.txt   |  11 +
 .../lumberjack/LumberjackComponentTest.java |  69 ++
 .../lumberjack/LumberjackDisconnectionTest.java |  82 +++
 .../component/lumberjack/LumberjackUtil.java| 112 ++
 .../lumberjack/LumberjacksComponentTest.java| 109 ++
 .../io/LumberjackChannelInitializerTest.java|  81 +++
 .../src/test/resources/log4j.properties |  38 
 .../camel/component/lumberjack/io/window10  | Bin 0 -> 1195 bytes
 .../camel/component/lumberjack/io/window15  | Bin 0 -> 1489 bytes
 .../camel/component/lumberjack/keystore.jks | Bin 0 -> 1473 bytes
 components/pom.xml  |   1 +
 parent/pom.xml  |  15 +-
 .../features/src/main/resources/features.xml|  11 +
 .../camel/itest/karaf/CamelLumberjackTest.java  |  36 +++
 34 files changed, 1891 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3d0379d0/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8e9d4c4..e2e6001 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -528,10 +528,6 @@
 
 
   org.apache.camel
-  camel-lucene
-
-
-  org.apache.camel
   camel-ldap
 
 
@@ -548,6 +544,14 @@
 
 
   org.apache.camel
+  camel-lucene
+
+
+  org.apache.camel
+  camel-lumberjack
+
+
+  org.apache.camel
   camel-lzf
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/3d0379d0/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 af39760..5f3e9bc 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -147,6 +147,7 @@
 org.apache.camel:camel-linkedin-api
 org.apache.camel:camel-linkedin
 org.apache.camel:camel-lucene
+org.apache.camel:camel-lumberjack
 org.apache.camel:camel-lzf
 org.apache.camel:camel-metrics
 org.apache.camel:camel-mail

http://git-wip-us.apache.org/repos/asf/camel/blob/3d0379d0/components/camel-lumberjack/pom.xml
--
diff --git a/components/camel-lumberjack/pom.xml 
b/components/camel-lumberjack/pom.xml
new file mode 100644
index 000..1e69023
--- /dev/null
+++ b/components/camel-lumberjack/pom.xml
@@ -0,0 +1,84 @@
+
+
+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.18-SNAPSHOT
+
+
+camel-lumberjack
+jar
+Camel :: Lumberjack
+

[2/4] camel git commit: Add Lumberjack component

[davsclaus]

http://git-wip-us.apache.org/repos/asf/camel/blob/3d0379d0/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjacksComponentTest.java
--
diff --git 
a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjacksComponentTest.java
 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjacksComponentTest.java
new file mode 100644
index 000..29e9397
--- /dev/null
+++ 
b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjacksComponentTest.java
@@ -0,0 +1,109 @@
+/**
+ * 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.lumberjack;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.jsse.KeyManagersParameters;
+import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.apache.camel.util.jsse.SSLContextParameters;
+import org.apache.camel.util.jsse.TrustManagersParameters;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+@SuppressWarnings("unchecked")
+public class LumberjacksComponentTest extends CamelTestSupport {
+private static int port;
+
+@BeforeClass
+public static void beforeClass() {
+port = AvailablePortFinder.getNextAvailable();
+}
+
+@Override
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry registry = super.createRegistry();
+registry.bind("ssl", createServerSSLContextParameters());
+return registry;
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+public void configure() {
+// Lumberjack configured with SSL
+from("lumberjacks:0.0.0.0:" + port + 
"?sslContextParameters=#ssl").to("mock:output");
+}
+};
+}
+
+@Test
+public void shouldListenToMessagesOverSSL() throws Exception {
+// We're expecting 25 messages with Maps
+MockEndpoint mock = getMockEndpoint("mock:output");
+mock.expectedMessageCount(25);
+mock.allMessages().body().isInstanceOf(Map.class);
+
+// When sending messages
+List responses = LumberjackUtil.sendMessages(port, 
createClientSSLContextParameters());
+
+// Then we should have the messages we're expecting
+mock.assertIsSatisfied();
+
+// And we should have replied with 2 acknowledgments for each window 
frame
+assertEquals(responses, Arrays.asList(10, 15));
+}
+
+/**
+ * Creates the {@link SSLContextParameters} Camel object for the 
Lumberjack component
+ *
+ * @return The {@link SSLContextParameters} Camel object for the 
Lumberjack component
+ */
+private SSLContextParameters createServerSSLContextParameters() {
+SSLContextParameters sslContextParameters = new SSLContextParameters();
+
+KeyManagersParameters keyManagersParameters = new 
KeyManagersParameters();
+KeyStoreParameters keyStore = new KeyStoreParameters();
+keyStore.setPassword("changeit");
+
keyStore.setResource("org/apache/camel/component/lumberjack/keystore.jks");
+keyManagersParameters.setKeyPassword("changeit");
+keyManagersParameters.setKeyStore(keyStore);
+sslContextParameters.setKeyManagers(keyManagersParameters);
+
+return sslContextParameters;
+}
+
+private SSLContextParameters createClientSSLContextParameters() {
+SSLContextParameters sslContextParameters = new SSLContextParameters();
+
+TrustManagersParameters trustManagersParameters = new 
TrustManagersParameters();
+KeyStoreParameters trustStore = new KeyStoreParameters();
+trustStore.setPassword("changeit");
+
trustStore.setResource("org/apache/camel/component/lumberjack/keystore.jks");
+

[4/4] camel git commit: Fixed CS. Added test to SB. This fixes #1071

[davsclaus]

Fixed CS. Added test to SB. This fixes #1071


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

Branch: refs/heads/master
Commit: f496aac76098600313248a8a4c62c75efedf1830
Parents: 12dcc56
Author: Claus Ibsen 
Authored: Fri Jul 15 09:09:45 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 09:09:45 2016 +0200

--
 components/camel-lumberjack/pom.xml | 107 +--
 .../src/main/docs/lumberjack.adoc   |   8 +-
 .../lumberjack/LumberjackComponent.java |   2 +-
 .../lumberjack/LumberjackConsumer.java  |   4 +-
 .../lumberjack/LumberjackEndpoint.java  |  11 +-
 .../src/test/resources/log4j.properties |   6 +-
 .../itest/springboot/CamelLumberjackTest.java   |  48 +
 7 files changed, 117 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/pom.xml
--
diff --git a/components/camel-lumberjack/pom.xml 
b/components/camel-lumberjack/pom.xml
index 1e69023..38029d7 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -20,65 +20,64 @@
 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
+  4.0.0
 
-
-org.apache.camel
-components
-2.18-SNAPSHOT
-
+  
+org.apache.camel
+components
+2.18-SNAPSHOT
+  
 
-camel-lumberjack
-jar
-Camel :: Lumberjack
-Camel Lumberjack log streaming component
+  camel-lumberjack
+  jar
+  Camel :: Lumberjack
+  Camel Lumberjack log streaming component
 
-
-
org.apache.camel.component.lumberjack.*
-
-org.apache.camel.spi.ComponentResolver;component=lumberjack,
-org.apache.camel.spi.ComponentResolver;component=lumberjacks
-
-
+  
+
org.apache.camel.component.lumberjack.*
+
+  org.apache.camel.spi.ComponentResolver;component=lumberjack
+
+  
 
-
+  
 
-
-org.apache.camel
-camel-core
-
-
-io.netty
-netty-transport
-${netty-version}
-
-
-io.netty
-netty-handler
-${netty-version}
-
-
-com.google.code.gson
-gson
-${gson-version}
-
+
+  org.apache.camel
+  camel-core
+
+
+  io.netty
+  netty-transport
+  ${netty-version}
+
+
+  io.netty
+  netty-handler
+  ${netty-version}
+
+
+  com.google.code.gson
+  gson
+  ${gson-version}
+
 
-
-
-junit
-junit
-test
-
-
-org.apache.camel
-camel-test
-test
-
-
-org.slf4j
-slf4j-log4j12
-test
-
-
+
+
+  junit
+  junit
+  test
+
+
+  org.apache.camel
+  camel-test
+  test
+
+
+  org.slf4j
+  slf4j-log4j12
+  test
+
+  
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/f496aac7/components/camel-lumberjack/src/main/docs/lumberjack.adoc
--
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc 
b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index 8d87a21..bc92bbd 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -47,6 +47,7 @@ The Lumberjack component has no options.
 
 
 
+
 // endpoint options: START
 The Lumberjack component supports 7 endpoint options which are listed below:
 
@@ -54,10 +55,10 @@ The Lumberjack component supports 7 endpoint options which 
are listed below:
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
-| host | common |  | String | *Required* Network interface on which to listen 
for Lumberjack
-| port | common | 5044 | int | Network port on which to listen for Lumberjack
-| sslContextParameters | common |  | SSLContextParameters | SSL configuration
+| host | consumer |  | String | *Required* Network interface on which to 
listen for Lumberjack
+| port | consumer | 5044 | 

[1/4] camel git commit: CAMEL-10133 - Use lumberjack for SSL too, remove lumberjacks

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 920a88d2c -> f496aac76


CAMEL-10133 - Use lumberjack for SSL too, remove lumberjacks


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

Branch: refs/heads/master
Commit: 12dcc564673c26b49102876f1e075db7ac944f1c
Parents: 3d0379d
Author: Antoine DESSAIGNE 
Authored: Mon Jul 11 10:24:09 2016 +0200
Committer: Claus Ibsen 
Committed: Fri Jul 15 08:59:27 2016 +0200

--
 .../src/main/docs/lumberjack.adoc   |   6 +-
 .../lumberjack/LumberjackComponent.java |   9 +-
 .../lumberjack/LumberjackConsumer.java  |   2 +-
 .../lumberjack/LumberjackEndpoint.java  |  25 +++--
 .../lumberjack/LumberjacksComponent.java|  31 --
 .../lumberjack/LumberjacksEndpoint.java |  45 
 .../org/apache/camel/component/lumberjacks  |  17 ---
 .../lumberjack/LumberjackComponentSSLTest.java  | 109 +++
 .../lumberjack/LumberjackComponentTest.java |   2 +-
 .../lumberjack/LumberjacksComponentTest.java| 109 ---
 docs/user-manual/en/SUMMARY.md  |   1 +
 11 files changed, 137 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/12dcc564/components/camel-lumberjack/src/main/docs/lumberjack.adoc
--
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc 
b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index 51c2fca..8d87a21 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -30,7 +30,6 @@ URI format
 
 lumberjack:host
 lumberjack:host:port
-lumberjacks:host:port?sslContextParameters=#ssl
 
 
 You can append query options to the URI in the following format,
@@ -47,8 +46,9 @@ The Lumberjack component has no options.
 
 
 
+
 // endpoint options: START
-The Lumberjack component supports 6 endpoint options which are listed below:
+The Lumberjack component supports 7 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -56,6 +56,7 @@ The Lumberjack component supports 6 endpoint options which 
are listed below:
 | Name | Group | Default | Java Type | Description
 | host | common |  | String | *Required* Network interface on which to listen 
for Lumberjack
 | port | common | 5044 | int | Network port on which to listen for Lumberjack
+| sslContextParameters | common |  | SSLContextParameters | SSL configuration
 | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the 
consumer to the Camel routing Error Handler which mean any exceptions occurred 
while the consumer is trying to pickup incoming messages or the likes will now 
be processed as a message and handled by the routing Error Handler. By default 
the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions that will be logged at WARN/ERROR level and ignored.
 | exceptionHandler | consumer (advanced) |  | ExceptionHandler | To let the 
consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler 
is enabled then this options is not in use. By default the consumer will deal 
with exceptions that will be logged at WARN/ERROR level and ignored.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
@@ -66,6 +67,7 @@ The Lumberjack component supports 6 endpoint options which 
are listed below:
 
 
 
+
 [[Lumberjack-Result]]
 Result
 ^^

http://git-wip-us.apache.org/repos/asf/camel/blob/12dcc564/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
--
diff --git 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
index 1cb9dda..83e9e4e 100644
--- 
a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
+++ 
b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
@@ -24,7 +24,7 @@ import org.apache.camel.impl.UriEndpointComponent;
 /**
  * The class is the Camel component for the Lumberjack server
  */
-public class LumberjackComponent extends UriEndpointComponent {
+public final class 

camel git commit: CAMEL-10147: MesssageHistory will take very long time for large expressions

[siano]

Repository: camel
Updated Branches:
  refs/heads/master 23b13a1e1 -> 920a88d2c


CAMEL-10147: MesssageHistory will take very long time for large expressions

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

Branch: refs/heads/master
Commit: 920a88d2ce75bf5d7204d0984c9eed5136bb60d2
Parents: 23b13a1
Author: Stephan Siano 
Authored: Thu Jul 14 14:23:59 2016 +0200
Committer: Stephan Siano 
Committed: Fri Jul 15 08:51:34 2016 +0200

--
 .../java/org/apache/camel/util/MessageHelper.java |  5 -
 .../main/java/org/apache/camel/util/StringHelper.java | 14 ++
 2 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/920a88d2/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 2eeac61..524d246 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -570,7 +570,10 @@ public final class MessageHelper {
 routeId = history.getRouteId() != null ? history.getRouteId() : "";
 id = history.getNode().getId();
 // we need to avoid leak the sensible information here
-label =  URISupport.sanitizeUri(history.getNode().getLabel());
+// the sanitizeUri takes a very long time for very long string and 
the format cuts this to
+// 78 characters, anyway. Cut this to 100 characters. This will 
give enough space for removing
+// characters in the sanitizeUri method and will be reasonably fast
+label =  
URISupport.sanitizeUri(StringHelper.limitLenght(history.getNode().getLabel(), 
100));
 elapsed = history.getElapsed();
 
 sb.append(String.format(MESSAGE_HISTORY_OUTPUT, routeId, id, 
label, elapsed));

http://git-wip-us.apache.org/repos/asf/camel/blob/920a88d2/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
index c8f1000..1fa6852 100644
--- a/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
@@ -68,6 +68,20 @@ public final class StringHelper {
 return matches;
 }
 
+/**
+ * Limits the length of a string
+ * 
+ * @param s the string
+ * @param maxLength the maximum length of the returned string
+ * @return s if the length of s is less than maxLength or the first 
maxLength characters of s
+ */
+public static String limitLenght(String s, int maxLength) {
+if (ObjectHelper.isEmpty(s)) {
+return s;
+}
+return s.length() <= maxLength ? s : s.substring(0, maxLength);
+}
+
 public static String removeQuotes(String s) {
 if (ObjectHelper.isEmpty(s)) {
 return s;