buildbot success in on camel-site-production

2017-03-06 Thread buildbot 
The Buildbot has detected a restored build on builder camel-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/14793

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on camel-site-production

2017-03-06 Thread buildbot 
The Buildbot has detected a new failure on builder camel-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/camel-site-production/builds/14792

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

camel git commit: CAMEL-10954 Can't find dependency org.apache.ca...

2017-03-06 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master a3ce7b6a5 -> f4907e1bd


CAMEL-10954 Can't find dependency org.apache.ca...

...mel:camel-box2

Removes `camel-box2-starter` as the component `camel-box` no longer
exists.


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

Branch: refs/heads/master
Commit: f4907e1bd8ef57573c58b582ca5d0f1a4cb496ef
Parents: a3ce7b6
Author: Zoran Regvart 
Authored: Mon Mar 6 23:36:14 2017 +0100
Committer: Zoran Regvart 
Committed: Mon Mar 6 23:36:14 2017 +0100

--
 .../camel-box2-starter/pom.xml  |  59 
 .../Box2ComponentAutoConfiguration.java | 110 ---
 .../springboot/Box2ComponentConfiguration.java  | 300 ---
 .../src/main/resources/META-INF/LICENSE.txt | 203 -
 .../src/main/resources/META-INF/NOTICE.txt  |  11 -
 ...dditional-spring-configuration-metadata.json |  10 -
 .../main/resources/META-INF/spring.factories|  19 --
 .../src/main/resources/META-INF/spring.provides |  18 --
 .../spring-boot/components-starter/pom.xml  |   1 -
 9 files changed, 731 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f4907e1b/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml
--
diff --git 
a/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml
deleted file mode 100644
index 2d49fef..000
--- a/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-  4.0.0
-  
-org.apache.camel
-components-starter
-2.19.0-SNAPSHOT
-  
-  camel-box2-starter
-  jar
-  Spring-Boot Starter :: Camel Box2 Component
-  Spring-Boot Starter for Camel Component for Box2
-  
-
-  org.springframework.boot
-  spring-boot-starter
-  ${spring-boot-version}
-
-
-  org.apache.camel
-  camel-box2
-  ${project.version}
-  
-  
-
-  commons-logging
-  commons-logging
-
-  
-  
-
-
-
-  org.apache.camel
-  camel-core-starter
-
-
-  org.apache.camel
-  camel-spring-boot-starter
-
-
-  
-

http://git-wip-us.apache.org/repos/asf/camel/blob/f4907e1b/platforms/spring-boot/components-starter/camel-box2-starter/src/main/java/org/apache/camel/component/box2/springboot/Box2ComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-box2-starter/src/main/java/org/apache/camel/component/box2/springboot/Box2ComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-box2-starter/src/main/java/org/apache/camel/component/box2/springboot/Box2ComponentAutoConfiguration.java
deleted file mode 100644
index 7818f49..000
--- 
a/platforms/spring-boot/components-starter/camel-box2-starter/src/main/java/org/apache/camel/component/box2/springboot/Box2ComponentAutoConfiguration.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * 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.box2.springboot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.box2.Box2Component;
-import org.apache.camel.util.IntrospectionSupport;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionMessage;
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import

[3/4] camel git commit: Component docs - polished

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-cxf/src/main/docs/cxf-component.adoc
--
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc 
b/components/camel-cxf/src/main/docs/cxf-component.adoc
index cf1bc65..eb874f4 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -130,10 +130,12 @@ The CXF component supports 3 options which are listed 
below.
 
 
 // endpoint options: START
-The CXF component is configured using the URI syntax with the following path 
and query parameters:
+The CXF endpoint is configured using URI syntax:
 
 cxf:beanId:address
 
+  with the following path and query parameters:
+
  Path Parameters (2 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-cxf/src/main/docs/cxfrs-component.adoc
--
diff --git a/components/camel-cxf/src/main/docs/cxfrs-component.adoc 
b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
index 38b771a..0e5cc6d 100644
--- a/components/camel-cxf/src/main/docs/cxfrs-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
@@ -70,10 +70,12 @@ The CXF-RS component supports 2 options which are listed 
below.
 
 
 // endpoint options: START
-The CXF-RS component is configured using the URI syntax with the following 
path and query parameters:
+The CXF-RS endpoint is configured using URI syntax:
 
 cxfrs:beanId:address
 
+  with the following path and query parameters:
+
  Path Parameters (2 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-disruptor/src/main/docs/disruptor-component.adoc
--
diff --git a/components/camel-disruptor/src/main/docs/disruptor-component.adoc 
b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
index 154faf5..1838cd8 100644
--- a/components/camel-disruptor/src/main/docs/disruptor-component.adoc
+++ b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
@@ -116,10 +116,12 @@ The Disruptor component supports 8 options which are 
listed below.
 
 
 // endpoint options: START
-The Disruptor component is configured using the URI syntax with the following 
path and query parameters:
+The Disruptor endpoint is configured using URI syntax:
 
 disruptor:name
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-dns/src/main/docs/dns-component.adoc
--
diff --git a/components/camel-dns/src/main/docs/dns-component.adoc 
b/components/camel-dns/src/main/docs/dns-component.adoc
index be75ed7..e2b85af 100644
--- a/components/camel-dns/src/main/docs/dns-component.adoc
+++ b/components/camel-dns/src/main/docs/dns-component.adoc
@@ -52,10 +52,12 @@ The DNS component has no options.
 
 
 // endpoint options: START
-The DNS component is configured using the URI syntax with the following path 
and query parameters:
+The DNS endpoint is configured using URI syntax:
 
 dns:dnsType
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-docker/src/main/docs/docker-component.adoc
--
diff --git a/components/camel-docker/src/main/docs/docker-component.adoc 
b/components/camel-docker/src/main/docs/docker-component.adoc
index 3cedfe46..3c7502f 100644
--- a/components/camel-docker/src/main/docs/docker-component.adoc
+++ b/components/camel-docker/src/main/docs/docker-component.adoc
@@ -36,10 +36,12 @@ The Docker component supports 2 options which are listed 
below.
 
 
 // endpoint options: START
-The Docker component is configured using the URI syntax with the following 
path and query parameters:
+The Docker endpoint is configured using URI syntax:
 
 docker:operation
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-dozer/src/main/docs/dozer-component.adoc
--
diff --git a/components/camel-dozer/src/main/docs/dozer-component.adoc 
b/components/camel-dozer/src/main/docs/dozer-component.adoc
index ac39ab5..56dfb08 100644
--- a/components/camel-dozer/src/main/docs/dozer-component.adoc
+++

[1/4] camel git commit: Component docs - polished

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master dfa2456cc -> 71d4ae2a7


Component docs - polished


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

Branch: refs/heads/master
Commit: 6cc72245d5873e52d8e68ab1c705beee5645f88f
Parents: dfa2456
Author: Claus Ibsen 
Authored: Mon Mar 6 17:50:38 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 17:50:38 2017 +0100

--
 .../src/main/resources/endpoint-options.mvel | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6cc72245/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index 4d43044..e0c95df 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -1,7 +1,9 @@
-The @{title} component is configured using the URI syntax with the following 
path and query parameters:
+The @{title} endpoint is configured using URI syntax:
 
 @{syntax}
 
+  with the following path and query parameters:
+
  Path Parameters (@{endpointPathOptions.size()} parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

[4/4] camel git commit: Component docs - polished

2017-03-06 Thread davsclaus 
Component docs - polished


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

Branch: refs/heads/master
Commit: 71d4ae2a73b97de638948aa73c8f13d190423e02
Parents: 6cc7224
Author: Claus Ibsen 
Authored: Mon Mar 6 18:35:09 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 18:35:09 2017 +0100

--
 camel-core/src/main/docs/bean-component.adoc | 8 +---
 camel-core/src/main/docs/binding-component.adoc  | 8 +---
 camel-core/src/main/docs/browse-component.adoc   | 8 +---
 camel-core/src/main/docs/class-component.adoc| 8 +---
 camel-core/src/main/docs/controlbus-component.adoc   | 8 +---
 camel-core/src/main/docs/dataformat-component.adoc   | 8 +---
 camel-core/src/main/docs/dataset-component.adoc  | 8 +---
 camel-core/src/main/docs/direct-component.adoc   | 8 +---
 camel-core/src/main/docs/direct-vm-component.adoc| 8 +---
 camel-core/src/main/docs/file-component.adoc | 8 +---
 camel-core/src/main/docs/language-component.adoc | 8 +---
 camel-core/src/main/docs/log-component.adoc  | 8 +---
 camel-core/src/main/docs/mock-component.adoc | 8 +---
 camel-core/src/main/docs/properties-component.adoc   | 8 +---
 camel-core/src/main/docs/ref-component.adoc  | 8 +---
 camel-core/src/main/docs/rest-api-component.adoc | 8 +---
 camel-core/src/main/docs/rest-component.adoc | 8 +---
 camel-core/src/main/docs/scheduler-component.adoc| 8 +---
 camel-core/src/main/docs/seda-component.adoc | 8 +---
 camel-core/src/main/docs/stub-component.adoc | 8 +---
 camel-core/src/main/docs/test-component.adoc | 8 +---
 camel-core/src/main/docs/timer-component.adoc| 8 +---
 camel-core/src/main/docs/validator-component.adoc| 8 +---
 camel-core/src/main/docs/vm-component.adoc   | 8 +---
 camel-core/src/main/docs/xslt-component.adoc | 8 +---
 components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc  | 4 +++-
 components/camel-ahc/src/main/docs/ahc-component.adoc| 4 +++-
 components/camel-amqp/src/main/docs/amqp-component.adoc  | 4 +++-
 components/camel-apns/src/main/docs/apns-component.adoc  | 4 +++-
 .../camel-asterisk/src/main/docs/asterisk-component.adoc | 4 +++-
 components/camel-atmos/src/main/docs/atmos-component.adoc| 4 +++-
 .../src/main/docs/atmosphere-websocket-component.adoc| 4 +++-
 components/camel-atom/src/main/docs/atom-component.adoc  | 4 +++-
 components/camel-avro/src/main/docs/avro-component.adoc  | 4 +++-
 components/camel-aws/src/main/docs/aws-cw-component.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-ddb-component.adoc| 4 +++-
 .../camel-aws/src/main/docs/aws-ddbstream-component.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-ec2-component.adoc| 4 +++-
 .../camel-aws/src/main/docs/aws-kinesis-component.adoc   | 4 +++-
 components/camel-aws/src/main/docs/aws-s3-component.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-sdb-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-ses-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-sns-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-sqs-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-swf-component.adoc| 4 +++-
 .../camel-azure/src/main/docs/azure-blob-component.adoc  | 4 +++-
 .../camel-azure/src/main/docs/azure-queue-component.adoc | 4 +++-
 .../src/main/docs/bean-validator-component.adoc  | 4 +++-
 .../camel-beanstalk/src/main/docs/beanstalk-component.adoc   | 4 +++-
 components/camel-bonita/src/main/docs/bonita-component.adoc  | 4 +++-
 .../camel-box-component/src/main/docs/box-component.adoc | 4 +++-
 .../camel-braintree/src/main/docs/braintree-component.adoc   | 4 +++-
 components/camel-cache/src/main/docs/cache-component.adoc| 4 +++-
 .../camel-cassandraql/src/main/docs/cql-component.adoc   | 4 +++-
 .../src/main/docs/chronicle-engine-component.adoc| 4 +++-
 components/camel-chunk/src/main/docs/chunk-component.adoc| 4 +++-
 components/camel-cm-sms/src/main/docs/cm-sms-component.adoc  | 4 +++-
 components/camel-cmis/src/main/docs/cmis-component.adoc  | 4 +++-
 components/camel-coap/src/main/docs/coap-component.adoc  | 4 +++-
 components/camel-cometd/src/main/docs/cometd-component.adoc  | 4 +++-

[2/4] camel git commit: Component docs - polished

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
--
diff --git 
a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
index b85233c..d901e38 100644
--- a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
@@ -39,10 +39,12 @@ The OpenStack Nova component has no options.
 // component options: END
 
 // endpoint options: START
-The OpenStack Nova component is configured using the URI syntax with the 
following path and query parameters:
+The OpenStack Nova endpoint is configured using URI syntax:
 
 openstack-nova:host
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
--
diff --git 
a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
index 2e26e39..8eda305 100644
--- a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
@@ -39,10 +39,12 @@ The OpenStack Swift component has no options.
 // component options: END
 
 // endpoint options: START
-The OpenStack Swift component is configured using the URI syntax with the 
following path and query parameters:
+The OpenStack Swift endpoint is configured using URI syntax:
 
 openstack-swift:host
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
--
diff --git 
a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc 
b/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
index ab395af..f8522af 100644
--- a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
+++ b/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
@@ -45,10 +45,12 @@ The OptaPlanner component has no options.
 
 
 // endpoint options: START
-The OptaPlanner component is configured using the URI syntax with the 
following path and query parameters:
+The OptaPlanner endpoint is configured using URI syntax:
 
 optaplanner:configFile
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-paho/src/main/docs/paho-component.adoc
--
diff --git a/components/camel-paho/src/main/docs/paho-component.adoc 
b/components/camel-paho/src/main/docs/paho-component.adoc
index 42daaa1..fd5991c 100644
--- a/components/camel-paho/src/main/docs/paho-component.adoc
+++ b/components/camel-paho/src/main/docs/paho-component.adoc
@@ -135,10 +135,12 @@ The Paho component supports 4 options which are listed 
below.
 
 
 // endpoint options: START
-The Paho component is configured using the URI syntax with the following path 
and query parameters:
+The Paho endpoint is configured using URI syntax:
 
 paho:topic
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

http://git-wip-us.apache.org/repos/asf/camel/blob/71d4ae2a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
--
diff --git 
a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc 
b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
index 0d5dbe2..9c5857c 100644
--- a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
+++ b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
@@ -53,10 +53,12 @@ The OSGi PAX Logging component supports 2 options which are 
listed below.
 
 
 // endpoint options: START
-The OSGi PAX Logging component is configured using the URI syntax with the 
following path and query parameters:
+The OSGi PAX Logging endpoint is configured using URI syntax:
 
 paxlogging:appender
 
+  with the following path and query parameters:
+
  Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]

[2/2] camel git commit: CAMEL-10916: Add option to turn on body on HTTP delete in http4 component

2017-03-06 Thread davsclaus 
CAMEL-10916: Add option to turn on body on HTTP delete in http4 component


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

Branch: refs/heads/master
Commit: dfa2456ccf5a6ee36e9c5a9a43e67d0db85f5023
Parents: 7657d77
Author: Claus Ibsen 
Authored: Mon Mar 6 16:26:19 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 16:26:19 2017 +0100

--
 .../jetty/Http4DeleteWithBodyTest.java  | 58 
 components/camel-netty-http/pom.xml |  5 ++
 .../netty/http/Http4DeleteWithBodyTest.java | 58 
 3 files changed, 121 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dfa2456c/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
new file mode 100644
index 000..08d8d34
--- /dev/null
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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.jetty;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class Http4DeleteWithBodyTest extends BaseJettyTest {
+
+@Test
+public void testHttp4DeleteWithBodyFalseTest() throws Exception {
+byte[] data = "World".getBytes();
+String out = 
template.requestBodyAndHeader("http4://localhost:{{port}}/test", data, 
Exchange.HTTP_METHOD, "DELETE", String.class);
+assertEquals("Bye ", out);
+}
+
+@Test
+public void testHttp4DeleteWithBodyTrueTest() throws Exception {
+byte[] data = "World".getBytes();
+String out = 
template.requestBodyAndHeader("http4://localhost:{{port}}/test?deleteWithBody=true",
 data, Exchange.HTTP_METHOD, "DELETE", String.class);
+assertEquals("Bye World", out);
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("jetty://http://localhost:{{port}}/test;)
+.process(new Processor() {
+@Override
+public void process(Exchange exchange) throws 
Exception {
+String method = 
exchange.getIn().getHeader(Exchange.HTTP_METHOD, String.class);
+assertEquals("DELETE", method);
+}
+})
+.transform(simple("Bye ${body}"));
+}
+};
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/dfa2456c/components/camel-netty-http/pom.xml
--
diff --git a/components/camel-netty-http/pom.xml 
b/components/camel-netty-http/pom.xml
index e0b9ab1..cab9354 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -53,6 +53,11 @@
test


+   org.apache.camel
+   camel-http4
+   test
+   
+   
junit
junit
test

http://git-wip-us.apache.org/repos/asf/camel/blob/dfa2456c/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/Http4DeleteWithBodyTest.java

[1/2] camel git commit: CAMEL-10916: Add option to turn on body on HTTP delete in http4 component

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 9bd6d31bb -> dfa2456cc


CAMEL-10916: Add option to turn on body on HTTP delete in http4 component


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

Branch: refs/heads/master
Commit: 7657d7718b328c1f676e2574f8678b8dd99379e0
Parents: 9bd6d31
Author: Claus Ibsen 
Authored: Mon Mar 6 16:05:02 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 16:05:02 2017 +0100

--
 .../src/main/docs/http4-component.adoc  |  3 +-
 .../http4/HttpDeleteWithBodyMethod.java | 36 
 .../camel/component/http4/HttpEndpoint.java | 16 +
 .../camel/component/http4/HttpProducer.java |  5 +++
 .../camel/component/http4/HttpMethodsTest.java  | 19 ++-
 5 files changed, 77 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7657d771/components/camel-http4/src/main/docs/http4-component.adoc
--
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc 
b/components/camel-http4/src/main/docs/http4-component.adoc
index cda92ee..e23d7f7 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -97,7 +97,7 @@ The HTTP4 component is configured using the URI syntax with 
the following path a
 | httpUri |  | URI | *Required* The url of the HTTP endpoint to call.
 |===
 
- Query Parameters (47 parameters):
+ Query Parameters (48 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
@@ -112,6 +112,7 @@ The HTTP4 component is configured using the URI syntax with 
the following path a
 | connectionClose | producer | false | boolean | Specifies whether a 
Connection Close header must be added to HTTP Request. By default 
connectionClose is false.
 | cookieStore | producer |  | CookieStore | To use a custom 
org.apache.http.client.CookieStore. By default the 
org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only 
cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to 
be a noop cookie store as cookie shouldn't be stored as we are just bridging 
(eg acting as a proxy). If a cookieHandler is set then the cookie store is also 
forced to be a noop cookie store as cookie handling is then performed by the 
cookieHandler.
 | copyHeaders | producer | true | boolean | If this option is true then IN 
exchange headers will be copied to OUT exchange headers according to copy 
strategy. Setting this to false allows to only include the headers from the 
HTTP response (not propagating IN headers).
+| deleteWithBody | producer | false | boolean | Whether the HTTP DELETE should 
include the message body or not. By default HTTP DELETE do not include any HTTP 
message. However in some rare cases users may need to be able to include the 
message body.
 | httpMethod | producer |  | HttpMethods | Configure the HTTP method to use. 
The HttpMethod header cannot override this option if set.
 | ignoreResponseBody | producer | false | boolean | If this option is true The 
http producer won't read response body and cache the input stream
 | preserveHostHeader | producer | false | boolean | If the option is true 
HttpProducer will set the Host header to the value contained in the current 
exchange Host header useful in reverse proxy applications where you want the 
Host header received by the downstream server to reflect the URL called by the 
upstream client this allows applications which use the Host header to generate 
accurate URL's for a proxied service

http://git-wip-us.apache.org/repos/asf/camel/blob/7657d771/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java
--
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java
new file mode 100644
index 000..1fee560
--- /dev/null
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java
@@ -0,0 +1,36 @@
+/**
+ * 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

[5/7] camel git commit: Polished

2017-03-06 Thread davsclaus 
Polished


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

Branch: refs/heads/master
Commit: 91693613badca39e40a26d7df1428a64a66479d1
Parents: 0c0c748
Author: Claus Ibsen 
Authored: Mon Mar 6 14:10:45 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 15:53:12 2017 +0100

--
 .../src/main/resources/endpoint-options.mvel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/91693613/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index 9b8bb27..4d43044 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -2,7 +2,7 @@ The @{title} component is configured using the URI syntax with 
the following pat
 
 @{syntax}
 
- @{endpointPathOptions.size()} path parameters:
+ Path Parameters (@{endpointPathOptions.size()} parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -10,7 +10,7 @@ The @{title} component is configured using the URI syntax 
with the following pat
 @foreach{row : endpointPathOptions}| @{row.name} | @{row.defaultValue} | 
@{row.shortJavaType} | @{row.description}
 @end{}|===
 
- @{endpointOptions.size()} query parameters:
+ Query Parameters (@{endpointOptions.size()} parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

[2/7] camel git commit: Generated docs - Polished

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-flink/src/main/docs/flink-component.adoc
--
diff --git a/components/camel-flink/src/main/docs/flink-component.adoc 
b/components/camel-flink/src/main/docs/flink-component.adoc
index 901e11a..ccb2355 100644
--- a/components/camel-flink/src/main/docs/flink-component.adoc
+++ b/components/camel-flink/src/main/docs/flink-component.adoc
@@ -43,7 +43,7 @@ The Apache Flink component is configured using the URI syntax 
with the following
 
 flink:endpointType
 
- 1 path parameters:
+ Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -51,7 +51,7 @@ The Apache Flink component is configured using the URI syntax 
with the following
 | endpointType |  | EndpointType | *Required* Type of the endpoint (dataset 
datastream).
 |===
 
- 6 query parameters:
+ Query Parameters (6 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-fop/src/main/docs/fop-component.adoc
--
diff --git a/components/camel-fop/src/main/docs/fop-component.adoc 
b/components/camel-fop/src/main/docs/fop-component.adoc
index 387d342..06f9d45 100644
--- a/components/camel-fop/src/main/docs/fop-component.adoc
+++ b/components/camel-fop/src/main/docs/fop-component.adoc
@@ -72,7 +72,7 @@ The FOP component is configured using the URI syntax with the 
following path and
 
 fop:outputType
 
- 1 path parameters:
+ Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -80,7 +80,7 @@ The FOP component is configured using the URI syntax with the 
following path and
 | outputType |  | FopOutputType | *Required* The primary output format is PDF 
but other output formats are also supported.
 |===
 
- 3 query parameters:
+ Query Parameters (3 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-freemarker/src/main/docs/freemarker-component.adoc
--
diff --git 
a/components/camel-freemarker/src/main/docs/freemarker-component.adoc 
b/components/camel-freemarker/src/main/docs/freemarker-component.adoc
index 78639b5..bf9f791 100644
--- a/components/camel-freemarker/src/main/docs/freemarker-component.adoc
+++ b/components/camel-freemarker/src/main/docs/freemarker-component.adoc
@@ -60,7 +60,7 @@ The Freemarker component is configured using the URI syntax 
with the following p
 
 freemarker:resourceUri
 
- 1 path parameters:
+ Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -68,7 +68,7 @@ The Freemarker component is configured using the URI syntax 
with the following p
 | resourceUri |  | String | *Required* Path to the resource. You can prefix 
with: classpath file http ref or bean. classpath file and http loads the 
resource using these protocols (classpath is default). ref will lookup the 
resource in the registry. bean will call a method on a bean to be used as the 
resource. For bean you can specify the method name after dot eg 
bean:myBean.myMethod.
 |===
 
- 5 query parameters:
+ Query Parameters (5 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-ftp/src/main/docs/ftp-component.adoc
--
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc 
b/components/camel-ftp/src/main/docs/ftp-component.adoc
index 54df72d..ea843a7 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -83,7 +83,7 @@ The FTP component is configured using the URI syntax with the 
following path and
 
 ftp:host:port/directoryName
 
- 3 path parameters:
+ Path Parameters (3 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -93,7 +93,7 @@ The FTP component is configured using the URI syntax with the

[4/7] camel git commit: Generated docs - Lets show how many are deprecated

2017-03-06 Thread davsclaus 
Generated docs - Lets show how many are deprecated


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

Branch: refs/heads/master
Commit: a3b37d2da7852309640a30eb29771cdf8a08a7d2
Parents: 98f8ce3
Author: Claus Ibsen 
Authored: Mon Mar 6 14:29:08 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 15:53:12 2017 +0100

--
 examples/README.adoc|  2 +-
 .../maven/packaging/PrepareExampleMojo.java | 10 +++-
 .../maven/packaging/PrepareReadmeMojo.java  | 50 
 .../src/main/resources/readme-components.mvel   |  2 +-
 .../src/main/resources/readme-dataformats.mvel  |  2 +-
 .../src/main/resources/readme-eips.mvel |  2 +-
 .../src/main/resources/readme-examples.mvel |  2 +-
 .../src/main/resources/readme-languages.mvel|  2 +-
 .../src/main/resources/readme-others.mvel   |  2 +-
 9 files changed, 55 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a3b37d2d/examples/README.adoc
--
diff --git a/examples/README.adoc b/examples/README.adoc
index 2a47d40..de1e672 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
 ### Examples
 
 // examples: START
-Number of Examples: 86
+Number of Examples: 86 (7 deprecated)
 
 [width="100%",cols="4,2,4",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a3b37d2d/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java
index 9423d56..a60fea0 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java
@@ -140,12 +140,17 @@ public class PrepareExampleMojo extends AbstractMojo {
 // sort the models
 Collections.sort(models, new ExampleComparator());
 
+// how many deprecated
+long deprecated = models.stream()
+.filter(m -> "true".equals(m.getDeprecated()))
+.count();
+
 // update the big readme file in the examples dir
 File file = new File(".", "README.adoc");
 
 // update regular components
 boolean exists = file.exists();
-String changed = templateExamples(models);
+String changed = templateExamples(models, deprecated);
 boolean updated = updateExamples(file, changed);
 
 if (updated) {
@@ -161,11 +166,12 @@ public class PrepareExampleMojo extends AbstractMojo {
 }
 }
 
-private String templateExamples(List models) throws 
MojoExecutionException {
+private String templateExamples(List models, long 
deprecated) throws MojoExecutionException {
 try {
 String template = 
loadText(UpdateReadmeMojo.class.getClassLoader().getResourceAsStream("readme-examples.mvel"));
 Map map = new HashMap<>();
 map.put("examples", models);
+map.put("numberOfDeprecated", deprecated);
 String out = (String) TemplateRuntime.eval(template, map);
 return out;
 } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/camel/blob/a3b37d2d/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index 68baee8..326653b 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -165,12 +165,17 @@ public class PrepareReadmeMojo extends AbstractMojo {
 // sort the models

[7/7] camel git commit: Generated docs - Polished

2017-03-06 Thread davsclaus 
Generated docs - Polished


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

Branch: refs/heads/master
Commit: 9bd6d31bb88a761153279d016889617729e0c196
Parents: a67cc44
Author: Claus Ibsen 
Authored: Mon Mar 6 15:54:24 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 15:54:24 2017 +0100

--
 camel-core/readme-eip.adoc | 2 +-
 camel-core/readme.adoc | 6 +++---
 components/readme.adoc | 8 
 3 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9bd6d31b/camel-core/readme-eip.adoc
--
diff --git a/camel-core/readme-eip.adoc b/camel-core/readme-eip.adoc
index 87c98c5..5764276 100644
--- a/camel-core/readme-eip.adoc
+++ b/camel-core/readme-eip.adoc
@@ -4,7 +4,7 @@ Enterprise Integration Patterns
 Camel supports most of the link:http://www.eaipatterns.com/toc.html[Enterprise 
Integration Patterns] from the excellent book by 
link:http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8=ss=books=Gregor%20Hohpe[Gregor
 Hohpe] and 
link:http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8=ss=books=Bobby%20Woolf[Bobby
 Woolf].
 
 // eips: START
-Number of EIPs: 61
+Number of EIPs: 61 (2 deprecated)
 
 [width="100%",cols="4,6",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/9bd6d31b/camel-core/readme.adoc
--
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 3ab06fe..f400b7f 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -6,7 +6,7 @@ Components
 
 
 // components: START
-Number of Components: 25 in 1 JAR artifacts
+Number of Components: 25 in 1 JAR artifacts (1 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -103,7 +103,7 @@ Data Formats
 
 
 // dataformats: START
-Number of Data Formats: 4 in 36 JAR artifacts
+Number of Data Formats: 4 in 36 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -133,7 +133,7 @@ Expression Languages
 
 
 // languages: START
-Number of Languages: 10 in 1 JAR artifacts
+Number of Languages: 10 in 1 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/9bd6d31b/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index a58cec5..0a91f0e 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^
 
 // components: START
-Number of Components: 219 in 174 JAR artifacts
+Number of Components: 219 in 174 JAR artifacts (13 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -673,7 +673,7 @@ Data Formats
 
 
 // dataformats: START
-Number of Data Formats: 45 in 36 JAR artifacts
+Number of Data Formats: 45 in 36 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -776,7 +776,7 @@ Expression Languages
 
 
 // languages: START
-Number of Languages: 24 in 12 JAR artifacts
+Number of Languages: 24 in 12 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -837,7 +837,7 @@ Miscellaneous Components
 
 
 // others: START
-Number of Miscellaneous Components: 37 in 37 JAR artifacts
+Number of Miscellaneous Components: 37 in 37 JAR artifacts (12 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===

[1/7] camel git commit: Generated docs - Polished

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 0c0c74876 -> 9bd6d31bb


http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
--
diff --git 
a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc 
b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index b5cc577..886df4f 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -106,7 +106,7 @@ The Netty4 HTTP component is configured using the URI 
syntax with the following
 
 netty4-http:protocol:host:port/path
 
- 4 path parameters:
+ Path Parameters (4 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -117,7 +117,7 @@ The Netty4 HTTP component is configured using the URI 
syntax with the following
 | path |  | String | Resource path
 |===
 
- 79 query parameters:
+ Query Parameters (79 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-netty4/src/main/docs/netty4-component.adoc
--
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc 
b/components/camel-netty4/src/main/docs/netty4-component.adoc
index d7482b2..820c564 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -82,7 +82,7 @@ The Netty4 component is configured using the URI syntax with 
the following path
 
 netty4:protocol:host:port
 
- 3 path parameters:
+ Path Parameters (3 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -92,7 +92,7 @@ The Netty4 component is configured using the URI syntax with 
the following path
 | port |  | int | *Required* The host port number
 |===
 
- 71 query parameters:
+ Query Parameters (71 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
--
diff --git 
a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
 
b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index 500336f..6d0e89b 100644
--- 
a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ 
b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -65,7 +65,7 @@ The Olingo2 component is configured using the URI syntax with 
the following path
 
 olingo2:apiName/methodName
 
- 2 path parameters:
+ Path Parameters (2 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -74,7 +74,7 @@ The Olingo2 component is configured using the URI syntax with 
the following path
 | methodName |  | String | *Required* What sub operation to use for the 
selected operation
 |===
 
- 14 query parameters:
+ Query Parameters (14 parameters):
 
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===

http://git-wip-us.apache.org/repos/asf/camel/blob/a67cc44f/components/camel-openshift/src/main/docs/openshift-component.adoc
--
diff --git a/components/camel-openshift/src/main/docs/openshift-component.adoc 
b/components/camel-openshift/src/main/docs/openshift-component.adoc
index d293121..5f054ac 100644
--- a/components/camel-openshift/src/main/docs/openshift-component.adoc
+++ b/components/camel-openshift/src/main/docs/openshift-component.adoc
@@ -56,7 +56,7 @@ The OpenShift component is configured using the URI syntax 
with the following pa
 
 openshift:clientId
 
- 1 path parameters:
+ Path Parameters (1 parameters):
 
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
@@ -64,7 +64,7 @@ The OpenShift component is configured using the URI syntax 
with the following pa
 | clientId |  | String | *Required* The client id

[6/7] camel git commit: Polished

2017-03-06 Thread davsclaus 
Polished


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

Branch: refs/heads/master
Commit: 98f8ce310f6778e58e8dcda345bb509acdd2ba89
Parents: 9169361
Author: Claus Ibsen 
Authored: Mon Mar 6 14:20:07 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 15:53:12 2017 +0100

--
 examples/README.adoc   | 4 ++--
 examples/camel-example-opentracing/pom.xml | 5 +
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/98f8ce31/examples/README.adoc
--
diff --git a/examples/README.adoc b/examples/README.adoc
index e7b44f2..2a47d40 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -17,8 +17,6 @@ Number of Examples: 86
 |===
 | Example | Category | Description
 
-| link:camel-example-opentracing/README.md[Opentracing] 
(camel-example-opentracing) |  | An example showing how to trace incoming and 
outgoing messages from Camel with OpenTracing
-
 | link:camel-example-cdi/README.md[CDI] (camel-example-cdi) | Beginner | An 
example showing how to work with Camel and CDI for dependency injection
 
 | link:camel-example-cdi-properties/README.md[CDI Properties] 
(camel-example-cdi-properties) | Beginner | DeltaSpike configuration properties 
CDI example
@@ -105,6 +103,8 @@ Number of Examples: 86
 
 | link:camel-example-management/README.md[Management] 
(camel-example-management) | Management and Monitoring | An example for showing 
Camel JMX management
 
+| link:camel-example-opentracing/README.md[OpenTracing] 
(camel-example-opentracing) | Management and Monitoring | An example showing 
how to trace incoming and outgoing messages from Camel with OpenTracing
+
 | link:camel-example-splunk/README.md[Splunk] (camel-example-splunk) | 
Management and Monitoring | An example using Splunk
 
 | link:camel-example-spring-boot-metrics/README.md[Spring Boot Metrics] 
(camel-example-spring-boot-metrics) | Management and Monitoring | An example 
showing how to work with Camel and Spring Boot and report metrics to Graphite

http://git-wip-us.apache.org/repos/asf/camel/blob/98f8ce31/examples/camel-example-opentracing/pom.xml
--
diff --git a/examples/camel-example-opentracing/pom.xml 
b/examples/camel-example-opentracing/pom.xml
index c2a08a9..f1dfb47 100644
--- a/examples/camel-example-opentracing/pom.xml
+++ b/examples/camel-example-opentracing/pom.xml
@@ -31,6 +31,11 @@
   Camel :: Example :: OpenTracing
   An example showing how to trace incoming and outgoing messages 
from Camel with OpenTracing
 
+  
+Management and Monitoring
+OpenTracing
+  
+
   
 client
 service1

[3/7] camel git commit: Generated docs - Polished

2017-03-06 Thread davsclaus 
Generated docs - Polished


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

Branch: refs/heads/master
Commit: a67cc44fab997b451b5ba524b7a31f352f4c4a49
Parents: a3b37d2
Author: Claus Ibsen 
Authored: Mon Mar 6 15:53:05 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 15:53:12 2017 +0100

--
 components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc  | 4 ++--
 components/camel-ahc/src/main/docs/ahc-component.adoc| 4 ++--
 components/camel-amqp/src/main/docs/amqp-component.adoc  | 4 ++--
 components/camel-apns/src/main/docs/apns-component.adoc  | 4 ++--
 components/camel-asterisk/src/main/docs/asterisk-component.adoc  | 4 ++--
 components/camel-atmos/src/main/docs/atmos-component.adoc| 4 ++--
 .../src/main/docs/atmosphere-websocket-component.adoc| 4 ++--
 components/camel-atom/src/main/docs/atom-component.adoc  | 4 ++--
 components/camel-avro/src/main/docs/avro-component.adoc  | 4 ++--
 components/camel-aws/src/main/docs/aws-cw-component.adoc | 4 ++--
 components/camel-aws/src/main/docs/aws-ddb-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-ddbstream-component.adoc  | 4 ++--
 components/camel-aws/src/main/docs/aws-ec2-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-kinesis-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-s3-component.adoc | 4 ++--
 components/camel-aws/src/main/docs/aws-sdb-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-ses-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-sns-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-sqs-component.adoc| 4 ++--
 components/camel-aws/src/main/docs/aws-swf-component.adoc| 4 ++--
 components/camel-azure/src/main/docs/azure-blob-component.adoc   | 4 ++--
 components/camel-azure/src/main/docs/azure-queue-component.adoc  | 4 ++--
 .../src/main/docs/bean-validator-component.adoc  | 4 ++--
 .../camel-beanstalk/src/main/docs/beanstalk-component.adoc   | 4 ++--
 components/camel-bonita/src/main/docs/bonita-component.adoc  | 4 ++--
 .../camel-box-component/src/main/docs/box-component.adoc | 4 ++--
 .../camel-braintree/src/main/docs/braintree-component.adoc   | 4 ++--
 components/camel-cache/src/main/docs/cache-component.adoc| 4 ++--
 components/camel-cassandraql/src/main/docs/cql-component.adoc| 4 ++--
 .../src/main/docs/chronicle-engine-component.adoc| 4 ++--
 components/camel-chunk/src/main/docs/chunk-component.adoc| 4 ++--
 components/camel-cm-sms/src/main/docs/cm-sms-component.adoc  | 4 ++--
 components/camel-cmis/src/main/docs/cmis-component.adoc  | 4 ++--
 components/camel-coap/src/main/docs/coap-component.adoc  | 4 ++--
 components/camel-cometd/src/main/docs/cometd-component.adoc  | 4 ++--
 components/camel-consul/src/main/docs/consul-component.adoc  | 4 ++--
 components/camel-context/src/main/docs/context-component.adoc| 4 ++--
 .../camel-couchbase/src/main/docs/couchbase-component.adoc   | 4 ++--
 components/camel-couchdb/src/main/docs/couchdb-component.adoc| 4 ++--
 components/camel-crypto/src/main/docs/crypto-component.adoc  | 4 ++--
 components/camel-cxf/src/main/docs/cxf-component.adoc| 4 ++--
 components/camel-cxf/src/main/docs/cxfrs-component.adoc  | 4 ++--
 .../camel-disruptor/src/main/docs/disruptor-component.adoc   | 4 ++--
 components/camel-dns/src/main/docs/dns-component.adoc| 4 ++--
 components/camel-docker/src/main/docs/docker-component.adoc  | 4 ++--
 components/camel-dozer/src/main/docs/dozer-component.adoc| 4 ++--
 components/camel-drill/src/main/docs/drill-component.adoc| 4 ++--
 components/camel-dropbox/src/main/docs/dropbox-component.adoc| 4 ++--
 components/camel-ehcache/src/main/docs/ehcache-component.adoc| 4 ++--
 components/camel-ejb/src/main/docs/ejb-component.adoc| 4 ++--
 .../src/main/docs/elasticsearch-component.adoc   | 4 ++--
 .../src/main/docs/elasticsearch5-component.adoc  | 4 ++--
 components/camel-elsql/src/main/docs/elsql-component.adoc| 4 ++--
 components/camel-etcd/src/main/docs/etcd-component.adoc  | 4 ++--
 .../camel-eventadmin/src/main/docs/eventadmin-component.adoc | 4 ++--
 components/camel-exec/src/main/docs/exec-component.adoc  | 4 ++--
 components/camel-facebook/src/main/docs/facebook-component.adoc  | 4 ++--
 components/camel-flatpack/src/main/docs/flatpack-component.adoc  | 4 ++--

camel git commit: remove test options

2017-03-06 Thread janstey 
Repository: camel
Updated Branches:
  refs/heads/master bd1274ce4 -> 0c0c74876


remove test options


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

Branch: refs/heads/master
Commit: 0c0c74876fd0c1e9c31636d90ba25ceb8e81ad76
Parents: bd1274c
Author: Jonathan Anstey 
Authored: Mon Mar 6 10:47:20 2017 -0330
Committer: Jonathan Anstey 
Committed: Mon Mar 6 10:47:20 2017 -0330

--
 .../tmp/test-options.properties | 67 
 1 file changed, 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0c0c7487/components/camel-box/camel-box-component/tmp/test-options.properties
--
diff --git 
a/components/camel-box/camel-box-component/tmp/test-options.properties 
b/components/camel-box/camel-box-component/tmp/test-options.properties
deleted file mode 100644
index 9cee863..000
--- a/components/camel-box/camel-box-component/tmp/test-options.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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.
-#
-
-###
-## Authentication properties for Box Component
-###
-
-#
-## Authentication properties for Box Component using STANDARD_AUTHENTICATION
-#
-authenticationType=STANDARD_AUTHENTICATION
-## User name and password
-## Create a free developer account on http://developers.box.com/ and provide 
user name password
-userName=punkhor...@gmail.com
-userPassword=RedHat12!@
-## Application client id and secret
-## Create a test Box.com application and provide its clientId and clientSecret
-clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-
-###
-## Authentication properties for Box Component using 
APP_ENTERPRISE_AUTHENTICATION
-###
-#authenticationType=APP_ENTERPRISE_AUTHENTICATION
-#enterpriseId=8962085
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-#publicKeyId=b22nf9qt
-#privateKeyFile=/Volumes/Development/Dev/box-java-sdk/private_key.pem
-#privateKeyPassword=RedHat12!@
-#encryptionAlgorithm=RSA_SHA_256
-#maxCacheEntries=100
-### Application client id and secret
-### Create a test Box.com application and provide its clientId and clientSecret
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-
-###
-## Authentication properties for Box Component using APP_USER_AUTHENTICATION
-###
-#authenticationType=APP_USER_AUTHENTICATION
-#userId=punkhor...@gmail.com
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-#publicKeyId=b22nf9qt
-#privateKeyFile=/Volumes/Development/Dev/box-java-sdk/private_key.pem
-#privateKeyPassword=RedHat12!@
-#encryptionAlgorithm=RSA_SHA_256
-#maxCacheEntries=100
-### Application client id and secret
-### Create a test Box.com application and provide its clientId and clientSecret
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr

[3/8] camel git commit: CAMEL-10941: Remove raw marker in component docs

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
--
diff --git 
a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc 
b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
index 4ecde62..50b18b8 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
@@ -49,17 +49,14 @@ The Kubernetes component is configured using the URI syntax 
with the following p
 
  1 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | masterUrl |  | String | *Required* Kubernetes Master url
 |===
-{% endraw %}
 
  27 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -91,7 +88,6 @@ The Kubernetes component is configured using the URI syntax 
with the following p
 | trustCerts | security |  | Boolean | Define if the certs we used are trusted 
anyway or not
 | username | security |  | String | Username to connect to Kubernetes
 |===
-{% endraw %}
 // endpoint options: END
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-ldap/src/main/docs/ldap-component.adoc
--
diff --git a/components/camel-ldap/src/main/docs/ldap-component.adoc 
b/components/camel-ldap/src/main/docs/ldap-component.adoc
index 4ee8391..1638d89 100644
--- a/components/camel-ldap/src/main/docs/ldap-component.adoc
+++ b/components/camel-ldap/src/main/docs/ldap-component.adoc
@@ -53,17 +53,14 @@ The LDAP component is configured using the URI syntax with 
the following path an
 
  1 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | dirContextName |  | String | *Required* Name of 
javax.naming.directory.DirContext bean to lookup in the registry.
 |===
-{% endraw %}
 
  5 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -73,7 +70,6 @@ The LDAP component is configured using the URI syntax with 
the following path an
 | scope | producer | subtree | String | Specifies how deeply to search the 
tree of entries starting at the base DN.
 | 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
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
--
diff --git 
a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
 
b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
index b1c3c3b..ebe51b4 100644
--- 
a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
+++ 
b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
@@ -56,14 +56,12 @@ The Linkedin component supports 2 options which are listed 
below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
 | configuration | common |  | LinkedInConfiguration | To use the shared 
configuration
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 
@@ -77,18 +75,15 @@ The Linkedin component is configured using the URI syntax 
with the following pat
 
  2 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | apiName |  | LinkedInApiName |

[8/8] camel git commit: CAMEL-10941: Remove raw marker in component docs

2017-03-06 Thread davsclaus 
CAMEL-10941: Remove raw marker in component docs


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

Branch: refs/heads/master
Commit: 2424eb8dbabd626a6b4530820c0492014636cfa3
Parents: 50a9e4f
Author: Claus Ibsen 
Authored: Mon Mar 6 13:16:01 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 14:04:23 2017 +0100

--
 .../src/main/resources/component-options.mvel| 2 --
 .../src/main/resources/dataformat-options.mvel   | 2 --
 .../src/main/resources/eip-options.mvel  | 4 ++--
 .../src/main/resources/endpoint-options.mvel | 4 
 .../src/main/resources/language-options.mvel | 2 --
 5 files changed, 2 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2424eb8d/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
index 020b125..6831302 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
@@ -5,11 +5,9 @@ The @{title} component supports @{componentOptions.size()} 
options which are lis
 @end{}
 
 @if{!componentOptions.isEmpty()}
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
 @foreach{row : componentOptions}| @{row.name} | @{row.group} | 
@{row.defaultValue} | @{row.shortJavaType} | @{row.description}
 @end{}|===
-{% endraw %}
 @end{}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/2424eb8d/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
index c729393..043ef05 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
@@ -5,11 +5,9 @@ The @{title} dataformat supports @{dataFormatOptions.size()} 
options which are l
 @end{}
 
 @if{!dataFormatOptions.isEmpty()}
-{% raw %}
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 @foreach{row : dataFormatOptions}| @{row.name} | @{row.defaultValue} | 
@{row.shortJavaType} | @{row.description}
 @end{}|===
-{% endraw %}
 @end{}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/2424eb8d/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
index 9932ebc..59fdd82 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
@@ -1,9 +1,9 @@
 The @{title} EIP supports @{eipOptions.size()} options which are listed below:
 
-{% raw %}
+@if{!eipOptions.isEmpty()}
 [width="100%",cols="3,1m,6",options="header"]
 |===
 | Name | Java Type | Description
 @foreach{row : eipOptions}| @{row.name} | @{row.shortJavaType} | 
@{row.description}
 @end{}|===
-{% endraw %}
+@end{}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/2424eb8d/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel

[1/8] camel git commit: CAMEL-10941: Remove raw marker in component docs

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 50a9e4f16 -> bd1274ce4


http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-sql/src/main/docs/sql-stored-component.adoc
--
diff --git a/components/camel-sql/src/main/docs/sql-stored-component.adoc 
b/components/camel-sql/src/main/docs/sql-stored-component.adoc
index adca432..d1e5dfd 100644
--- a/components/camel-sql/src/main/docs/sql-stored-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-stored-component.adoc
@@ -67,14 +67,12 @@ The SQL StoredProcedure component supports 2 options which 
are listed below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
 | dataSource | producer |  | DataSource | Sets the DataSource to use to 
communicate with the database.
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 
@@ -87,17 +85,14 @@ The SQL StoredProcedure component is configured using the 
URI syntax with the fo
 
  1 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | template |  | String | *Required* Sets the StoredProcedure template to 
perform
 |===
-{% endraw %}
 
  6 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -108,7 +103,6 @@ The SQL StoredProcedure component is configured using the 
URI syntax with the fo
 | useMessageBodyForTemplate | producer | false | boolean | Whether to use the 
message body as the template and then headers for parameters. If this option is 
enabled then the template in the uri is not used.
 | 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
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-ssh/src/main/docs/ssh-component.adoc
--
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc 
b/components/camel-ssh/src/main/docs/ssh-component.adoc
index d188a9e..070b68f 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -34,7 +34,6 @@ The SSH component supports 12 options which are listed below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -51,7 +50,6 @@ The SSH component supports 12 options which are listed below.
 | certResource | security |  | String | Sets the resource path of the 
certificate to use for Authentication. Will use ResourceHelperKeyPairProvider 
to resolve file based certificate and depends on keyType setting.
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 
@@ -64,18 +62,15 @@ The SSH component is configured using the URI syntax with 
the following path and
 
  2 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | host |  | String | *Required* Sets the hostname of the remote SSH server.
 | port | 22 | int | Sets the port number for the remote SSH server.
 |===
-{% endraw %}
 
  26 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -106,7 +101,6 @@ The SSH component is configured using the URI syntax with 
the following path and
 | password | security |  | String | Sets the password to use in connecting to 
remote SSH server. Requires keyPairProvider to be set to null.
 |

[5/8] camel git commit: CAMEL-10941: Remove raw marker in component docs

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-crypto/src/main/docs/crypto-component.adoc
--
diff --git a/components/camel-crypto/src/main/docs/crypto-component.adoc 
b/components/camel-crypto/src/main/docs/crypto-component.adoc
index 4c5f7ae..b8631ac 100644
--- a/components/camel-crypto/src/main/docs/crypto-component.adoc
+++ b/components/camel-crypto/src/main/docs/crypto-component.adoc
@@ -84,14 +84,12 @@ The Crypto (JCE) component supports 2 options which are 
listed below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
 | configuration | advanced |  | DigitalSignatureConfiguration | To use the 
shared DigitalSignatureConfiguration as configuration
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 // endpoint options: START
@@ -101,18 +99,15 @@ The Crypto (JCE) component is configured using the URI 
syntax with the following
 
  2 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | cryptoOperation |  | CryptoOperation | *Required* Set the Crypto operation 
from that supplied after the crypto scheme in the endpoint uri e.g. crypto:sign 
sets sign as the operation.
 | name |  | String | *Required* The logical name of this operation.
 |===
-{% endraw %}
 
  19 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -136,7 +131,6 @@ The Crypto (JCE) component is configured using the URI 
syntax with the following
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 | password | security |  | String | Sets the password used to access an 
aliased PrivateKey in the KeyStore.
 |===
-{% endraw %}
 // endpoint options: END
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
--
diff --git a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc 
b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
index ac791bb..9abbbd1 100644
--- a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
+++ b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
@@ -17,7 +17,6 @@ The Crypto (Java Cryptographic Extension) dataformat supports 
10 options which a
 
 
 
-{% raw %}
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
@@ -32,7 +31,6 @@ The Crypto (Java Cryptographic Extension) dataformat supports 
10 options which a
 | inline | false | Boolean | Flag indicating that the configured IV should be 
inlined into the encrypted data stream. Is by default false.
 | contentTypeHeader | false | Boolean | Whether the data format should set the 
Content-Type header with the type from the data format if the data format is 
capable of doing so. For example application/xml for data formats marshalling 
to XML or application/json for data formats marshalling to JSon etc.
 |===
-{% endraw %}
 // dataformat options: END
 
 
@@ -280,4 +278,4 @@ need to add the following dependency to your pom.
 
 * link:data-format.html[Data Format]
 * link:crypto-digital-signatures.html[Crypto (Digital Signatures)]
-* http://www.bouncycastle.org/java.html[http://www.bouncycastle.org/java.html]
\ No newline at end of file
+* http://www.bouncycastle.org/java.html[http://www.bouncycastle.org/java.html]

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
--
diff --git a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc 
b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
index 0c89217..70614ab 100644
--- a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
+++ b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
@@ -17,7 +17,6 @@ The PGP dataformat supports 15 options

[4/8] camel git commit: CAMEL-10941: Remove raw marker in component docs

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-hazelcast/src/main/docs/hazelcast-component.adoc
--
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-component.adoc 
b/components/camel-hazelcast/src/main/docs/hazelcast-component.adoc
index 98e9c8c..ef6757f 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-component.adoc
@@ -50,14 +50,12 @@ The Hazelcast component supports 2 options which are listed 
below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
 | hazelcastInstance | advanced |  | HazelcastInstance | The hazelcast instance 
reference which can be used for hazelcast endpoint. If you don't specify the 
instance reference camel use the default hazelcast instance from the 
camel-hazelcast instance.
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 
@@ -72,18 +70,15 @@ The Hazelcast component is configured using the URI syntax 
with the following pa
 
  2 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | command |  | HazelcastCommand | *Required* What operation to perform.
 | cacheName |  | String | *Required* The name of the cache
 |===
-{% endraw %}
 
  11 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -99,7 +94,6 @@ The Hazelcast component is configured using the URI syntax 
with the following pa
 | transacted | seda | false | boolean | If set to true then the consumer runs 
in transaction mode where the messages in the seda queue will only be removed 
if the transaction commits which happens when the processing is complete.
 | transferExchange | seda | false | boolean | If set to true the whole 
Exchange will be transfered. If header or body contains not serializable 
objects they will be skipped.
 |===
-{% endraw %}
 // endpoint options: END
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-hbase/src/main/docs/hbase-component.adoc
--
diff --git a/components/camel-hbase/src/main/docs/hbase-component.adoc 
b/components/camel-hbase/src/main/docs/hbase-component.adoc
index ba031e6..75bccc0 100644
--- a/components/camel-hbase/src/main/docs/hbase-component.adoc
+++ b/components/camel-hbase/src/main/docs/hbase-component.adoc
@@ -105,7 +105,6 @@ The HBase component supports 3 options which are listed 
below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -113,7 +112,6 @@ The HBase component supports 3 options which are listed 
below.
 | poolMaxSize | common | 10 | int | Maximum number of references to keep for 
each table in the HTable pool. The default value is 10.
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 
@@ -128,17 +126,14 @@ The HBase component is configured using the URI syntax 
with the following path a
 
  1 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | tableName |  | String | *Required* The name of the table
 |===
-{% endraw %}
 
  16 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -159,7 +154,6 @@ The HBase component is configured using the URI syntax with 
the following path a
 | maxResults | producer | 100 | int | The maximum number of rows to scan.
 | synchronous | advanced | false | boolean | Sets

[2/8] camel git commit: CAMEL-10941: Remove raw marker in component docs

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-printer/src/main/docs/lpr-component.adoc
--
diff --git a/components/camel-printer/src/main/docs/lpr-component.adoc 
b/components/camel-printer/src/main/docs/lpr-component.adoc
index ac98574..933ac9e 100644
--- a/components/camel-printer/src/main/docs/lpr-component.adoc
+++ b/components/camel-printer/src/main/docs/lpr-component.adoc
@@ -58,7 +58,6 @@ The Printer component is configured using the URI syntax with 
the following path
 
  3 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
@@ -66,11 +65,9 @@ The Printer component is configured using the URI syntax 
with the following path
 | port |  | int | Port number of the printer
 | printername |  | String | Name of the printer
 |===
-{% endraw %}
 
  11 query parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -86,7 +83,6 @@ The Printer component is configured using the URI syntax with 
the following path
 | sides | producer | one-sided | String | Sets one sided or two sided printing 
based on the javax.print.attribute.standard.Sides API
 | 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
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
--
diff --git a/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc 
b/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
index 29539b2..b35cfc3 100644
--- a/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
+++ b/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
@@ -28,14 +28,12 @@ The Protobuf dataformat supports 2 options which are listed 
below.
 
 
 
-{% raw %}
 [width="100%",cols="2s,1m,1m,6",options="header"]
 |===
 | Name | Default | Java Type | Description
 | instanceClass |  | String | Name of class to use when unarmshalling
 | contentTypeHeader | false | Boolean | Whether the data format should set the 
Content-Type header with the type from the data format if the data format is 
capable of doing so. For example application/xml for data formats marshalling 
to XML or application/json for data formats marshalling to JSon etc.
 |===
-{% endraw %}
 // dataformat options: END
 
 ### Protobuf overview
@@ -163,4 +161,4 @@ link:download.html[the download page for the latest 
versions]).
   camel-protobuf
   2.2.0
 
--
\ No newline at end of file
+-

http://git-wip-us.apache.org/repos/asf/camel/blob/bd1274ce/components/camel-quartz/src/main/docs/quartz-component.adoc
--
diff --git a/components/camel-quartz/src/main/docs/quartz-component.adoc 
b/components/camel-quartz/src/main/docs/quartz-component.adoc
index 9bc4066..47fa318 100644
--- a/components/camel-quartz/src/main/docs/quartz-component.adoc
+++ b/components/camel-quartz/src/main/docs/quartz-component.adoc
@@ -50,7 +50,6 @@ The Quartz component supports 8 options which are listed 
below.
 
 
 
-{% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -63,7 +62,6 @@ The Quartz component supports 8 options which are listed 
below.
 | enableJmx | consumer | true | boolean | Whether to enable Quartz JMX which 
allows to manage the Quartz scheduler from JMX. This options is default true
 | resolvePropertyPlaceholders | advanced | true | boolean | Whether the 
component should resolve property placeholders on itself when starting. Only 
properties which are of String type can use property placeholders.
 |===
-{% endraw %}
 // component options: END
 
 
@@ -76,18 +74,15 @@ The Quartz component is configured using the URI syntax 
with the following path
 
  2 path parameters:
 
-{% raw %}
 [width="100%",cols="2,1,1m,6",options="header"]
 |===
 | Name | Default | Java Type |

camel git commit: Fixed CS

2017-03-06 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 5aa518ef6 -> bd9f9077e


Fixed CS


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

Branch: refs/heads/camel-2.17.x
Commit: bd9f9077ef9bf7eb98bd793e9521ae5ba0d93ce1
Parents: 5aa518e
Author: Andrea Cosentino 
Authored: Mon Mar 6 13:27:50 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:32:49 2017 +0100

--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd9f9077/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
index 8bb17b8..3d5d8d4 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
@@ -35,14 +35,14 @@ import org.apache.hadoop.fs.PathFilter;
 
 public final class HdfsConsumer extends ScheduledPollConsumer {
 
+public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
+
 private final HdfsConfiguration config;
 private final StringBuilder hdfsPath;
 private final Processor processor;
 private final ReadWriteLock rwlock = new ReentrantReadWriteLock();
 private volatile HdfsInputStream istream;
 
-public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
-
 public HdfsConsumer(HdfsEndpoint endpoint, Processor processor, 
HdfsConfiguration config) {
 super(endpoint, processor);
 this.config = config;

camel git commit: Fixed CS

2017-03-06 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x c17cb6785 -> e12179ca2


Fixed CS


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

Branch: refs/heads/camel-2.18.x
Commit: e12179ca2fc7f8b3f09cb31219fda18017f633ad
Parents: c17cb67
Author: Andrea Cosentino 
Authored: Mon Mar 6 13:27:50 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:29:14 2017 +0100

--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e12179ca/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
index 8bb17b8..3d5d8d4 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
@@ -35,14 +35,14 @@ import org.apache.hadoop.fs.PathFilter;
 
 public final class HdfsConsumer extends ScheduledPollConsumer {
 
+public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
+
 private final HdfsConfiguration config;
 private final StringBuilder hdfsPath;
 private final Processor processor;
 private final ReadWriteLock rwlock = new ReentrantReadWriteLock();
 private volatile HdfsInputStream istream;
 
-public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
-
 public HdfsConsumer(HdfsEndpoint endpoint, Processor processor, 
HdfsConfiguration config) {
 super(endpoint, processor);
 this.config = config;

camel git commit: CAMEL-10948: Camel-hdfs2: initialDelay option is overwritten with default value

2017-03-06 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 9d4789c57 -> 5aa518ef6


CAMEL-10948: Camel-hdfs2: initialDelay option is overwritten with default value


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

Branch: refs/heads/camel-2.17.x
Commit: 5aa518ef6872e4768e96b12cd1155e666489e461
Parents: 9d4789c
Author: Andrea Cosentino 
Authored: Mon Mar 6 12:59:10 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:22:15 2017 +0100

--
 .../java/org/apache/camel/component/hdfs2/HdfsConfiguration.java | 4 ++--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 2 ++
 .../main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5aa518ef/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
index 01b5680..d785f34 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
@@ -70,8 +70,8 @@ public class HdfsConfiguration {
 private String openedSuffix = HdfsConstants.DEFAULT_OPENED_SUFFIX;
 @UriParam(defaultValue = HdfsConstants.DEFAULT_READ_SUFFIX)
 private String readSuffix = HdfsConstants.DEFAULT_READ_SUFFIX;
-@UriParam(label = "consumer")
-private long initialDelay;
+@UriParam(label = "consumer", defaultValue = "" + 
HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY)
+private long initialDelay = HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY;
 @UriParam(label = "consumer", defaultValue = "" + 
HdfsConstants.DEFAULT_DELAY)
 private long delay = HdfsConstants.DEFAULT_DELAY;
 @UriParam(label = "consumer", defaultValue = HdfsConstants.DEFAULT_PATTERN)

http://git-wip-us.apache.org/repos/asf/camel/blob/5aa518ef/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
index 395f00b..8bb17b8 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
@@ -40,6 +40,8 @@ public final class HdfsConsumer extends ScheduledPollConsumer 
{
 private final Processor processor;
 private final ReadWriteLock rwlock = new ReentrantReadWriteLock();
 private volatile HdfsInputStream istream;
+
+public static final long DEFAULT_CONSUMER_INITIAL_DELAY = 10 * 1000L;
 
 public HdfsConsumer(HdfsEndpoint endpoint, Processor processor, 
HdfsConfiguration config) {
 super(endpoint, processor);

http://git-wip-us.apache.org/repos/asf/camel/blob/5aa518ef/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
index baecdcc..3e9d81d 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java
@@ -41,6 +41,7 @@ public class HdfsEndpoint extends ScheduledPollEndpoint {
 super(endpointUri, context);
 this.config = new HdfsConfiguration();
 this.config.parseURI(new URI(endpointUri));
+setInitialDelay(HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY);
 }
 
 @Override

camel git commit: CAMEL-10948: Camel-hdfs2: initialDelay option is overwritten with default value

2017-03-06 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 127e68c19 -> c17cb6785


CAMEL-10948: Camel-hdfs2: initialDelay option is overwritten with default value


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

Branch: refs/heads/camel-2.18.x
Commit: c17cb67850c379420ad369ab554243f9befbc6bc
Parents: 127e68c
Author: Andrea Cosentino 
Authored: Mon Mar 6 12:59:10 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:20:05 2017 +0100

--
 components/camel-hdfs2/src/main/docs/hdfs2-component.adoc| 2 +-
 .../java/org/apache/camel/component/hdfs2/HdfsConfiguration.java | 4 ++--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 2 ++
 .../main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c17cb678/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
--
diff --git a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc 
b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
index f8a3e8c..4db8de9 100644
--- a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
+++ b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
@@ -95,7 +95,7 @@ The HDFS2 component supports 41 endpoint options which are 
listed below:
 | valueType | common | BYTES | WritableType | The type for the key in case of 
sequence or map files
 | 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.
 | delay | consumer | 1000 | long | The interval (milliseconds) between the 
directory scans.
-| initialDelay | consumer |  | long | For the consumer how much to wait 
(milliseconds) before to start scanning the directory.
+| initialDelay | consumer | 1 | long | For the consumer how much to wait 
(milliseconds) before to start scanning the directory.
 | pattern | consumer | * | String | The pattern used for scanning the directory
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
 | 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.

http://git-wip-us.apache.org/repos/asf/camel/blob/c17cb678/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
index c1f5d50..90020e3 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
@@ -70,8 +70,8 @@ public class HdfsConfiguration {
 private String openedSuffix = HdfsConstants.DEFAULT_OPENED_SUFFIX;
 @UriParam(label = "advanced", defaultValue = 
HdfsConstants.DEFAULT_READ_SUFFIX)
 private String readSuffix = HdfsConstants.DEFAULT_READ_SUFFIX;
-@UriParam(label = "consumer")
-private long initialDelay;
+@UriParam(label = "consumer", defaultValue = "" + 
HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY)
+private long initialDelay = HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY;
 @UriParam(label = "consumer", defaultValue = "" + 
HdfsConstants.DEFAULT_DELAY)
 private long delay = HdfsConstants.DEFAULT_DELAY;
 @UriParam(label = "consumer", defaultValue = HdfsConstants.DEFAULT_PATTERN)

http://git-wip-us.apache.org/repos/asf/camel/blob/c17cb678/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java

camel git commit: CAMEL-10948: Camel-hdfs2: initialDelay option is overwritten with default value

2017-03-06 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master de068808b -> cf303d761


CAMEL-10948: Camel-hdfs2: initialDelay option is overwritten with default value


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

Branch: refs/heads/master
Commit: cf303d7617bd37a835ae39f90d0c2d8731901d2c
Parents: de06880
Author: Andrea Cosentino 
Authored: Mon Mar 6 12:59:10 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 13:13:52 2017 +0100

--
 components/camel-hdfs2/src/main/docs/hdfs2-component.adoc| 2 +-
 .../java/org/apache/camel/component/hdfs2/HdfsConfiguration.java | 4 ++--
 .../main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java | 2 ++
 .../main/java/org/apache/camel/component/hdfs2/HdfsEndpoint.java | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cf303d76/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
--
diff --git a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc 
b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
index 4e5614e..4001899 100644
--- a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
+++ b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
@@ -103,7 +103,7 @@ The HDFS2 component is configured using the URI syntax with 
the following path a
 | valueType | common | BYTES | WritableType | The type for the key in case of 
sequence or map files
 | 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 or ERROR level and ignored.
 | delay | consumer | 1000 | long | The interval (milliseconds) between the 
directory scans.
-| initialDelay | consumer |  | long | For the consumer how much to wait 
(milliseconds) before to start scanning the directory.
+| initialDelay | consumer | 1 | long | For the consumer how much to wait 
(milliseconds) before to start scanning the directory.
 | pattern | consumer | * | String | The pattern used for scanning the directory
 | sendEmptyMessageWhenIdle | consumer | false | boolean | If the polling 
consumer did not poll any files you can enable this option to send an empty 
message (no body) instead.
 | 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 or ERROR level and ignored.

http://git-wip-us.apache.org/repos/asf/camel/blob/cf303d76/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
index c1f5d50..90020e3 100644
--- 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
+++ 
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConfiguration.java
@@ -70,8 +70,8 @@ public class HdfsConfiguration {
 private String openedSuffix = HdfsConstants.DEFAULT_OPENED_SUFFIX;
 @UriParam(label = "advanced", defaultValue = 
HdfsConstants.DEFAULT_READ_SUFFIX)
 private String readSuffix = HdfsConstants.DEFAULT_READ_SUFFIX;
-@UriParam(label = "consumer")
-private long initialDelay;
+@UriParam(label = "consumer", defaultValue = "" + 
HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY)
+private long initialDelay = HdfsConsumer.DEFAULT_CONSUMER_INITIAL_DELAY;
 @UriParam(label = "consumer", defaultValue = "" + 
HdfsConstants.DEFAULT_DELAY)
 private long delay = HdfsConstants.DEFAULT_DELAY;
 @UriParam(label = "consumer", defaultValue = HdfsConstants.DEFAULT_PATTERN)

http://git-wip-us.apache.org/repos/asf/camel/blob/cf303d76/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
--
diff --git 
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java

camel git commit: CAMEL-10933: deprecate camel-guice

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master cb1c757ff -> de068808b


CAMEL-10933: deprecate camel-guice


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

Branch: refs/heads/master
Commit: de068808be677c36f61538f042fc84f0a6e12ad0
Parents: cb1c757
Author: Claus Ibsen 
Authored: Mon Mar 6 12:22:53 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 12:22:53 2017 +0100

--
 components/camel-guice/pom.xml   | 2 +-
 components/readme.adoc   | 2 +-
 tooling/maven/guice-maven-plugin/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/de068808/components/camel-guice/pom.xml
--
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index 6ee3271..948c51f 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -26,7 +26,7 @@
 
   camel-guice
   jar
-  Camel :: Guice
+  Camel :: Guice (deprecated)
   Using Camel with Guice
 
   

http://git-wip-us.apache.org/repos/asf/camel/blob/de068808/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index 4a6a823..a58cec5 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -857,7 +857,7 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts
 
 | link:camel-groovy-dsl/src/main/docs/groovy-dsl.adoc[Groovy DSL] 
(camel-groovy-dsl) | 2.19 | *deprecated* Camel Groovy DSL support
 
-| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | 1.5 | Using 
Camel with Guice
+| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | 1.5 | 
*deprecated* Using Camel with Guice
 
 | link:camel-hawtdb/src/main/docs/hawtdb.adoc[HawtDB] (camel-hawtdb) | 2.3 | 
*deprecated* Using HawtDB as persistent EIP store
 

http://git-wip-us.apache.org/repos/asf/camel/blob/de068808/tooling/maven/guice-maven-plugin/pom.xml
--
diff --git a/tooling/maven/guice-maven-plugin/pom.xml 
b/tooling/maven/guice-maven-plugin/pom.xml
index 0ca3289..c216adf 100644
--- a/tooling/maven/guice-maven-plugin/pom.xml
+++ b/tooling/maven/guice-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
 
   guice-maven-plugin
   maven-plugin
-  Camel :: Maven Plugins :: Camel Maven Guice
+  Camel :: Maven Plugins :: Camel Maven Guice (deprecated)
   Maven plugin to run Camel with Guice

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

2017-03-06 Thread buildbot 
Author: buildbot
Date: Mon Mar  6 11:19:01 2017
New Revision: 1007817

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-219-release.html
==
--- websites/production/camel/content/camel-219-release.html (original)
+++ websites/production/camel/content/camel-219-release.html Mon Mar  6 
11:19:01 2017
@@ -85,7 +85,7 @@

 
 
-Camel 2.19.0 
Release (currently in progress)http://camel.apache.org/images/camel-box-small.png; 
data-image-src="http://camel.apache.org/images/camel-box-small.png;>New and NoteworthyWelcome to the 
2.19.0 release which approx XXX issues resolved (new features, improvements and 
bug fixes such as...)Introduced https://github.com/apache/camel/blob/master/connectors/camel-connector/src/main/docs/connector-component.adoc#connector-component;
 rel="nofollow">Camel Connector's which is a simplified version of a Camel 
component that has been pr
 e-configured for a specific use-case.Upgraded to Spring Boot 
1.5.x.The Camel Maven 
Plugin now provides the camel:validate goal to parse your Java 
and XML source code for any Camel routes and report invalid Camel endpoint uri 
and simple expression errors. You can run this at code time (not 
runtime).CamelMain andSpring Boot andCamel Maven Plugin can now auto terminate 
the JVM after Camel has been running for maximum duration of seconds, processed 
messages or been idle for a period.Camel source code can build with 
Java 9 in preparation for official support for Java 9 later this 
yearDeprecated more components and camel-core APIs that will be 
dropped in Camel 3.0 or sometime in the 
futureIntroducedReloadStrategyas SPI
  which allows custom providers to implement logic for triggering live reloads 
of Camel routes.TheCamel Maven Pluginnow allows to live 
reload route changes from XML files when running Camel. This can also be 
enabled from the Main class.Introduced a 
newcamel-catalog-restartifact which is a tiny 
standalone REST API of the CamelCatalog using JAX-RS and Swagger 
Annotations.Addedcamel-catalog-rest-appas a 
standalone application which used Apache CXF with Jetty to host the Catalog 
REST API with embedded Swagger 
UIReturningnullfromBean should work similar to 
howsetBodyandtransformworks 
when they set anullbody.The Camel Spring Boot 
starter components now have their auto configu
 ration depends 
onorg.apache.camel.springboot.CamelAutoConfiguration which 
makes it easier writing unit tests where you can 
excludeorg.apache.camel.springboot.CamelAutoConfiguration to 
turn off Camel Spring Boot auto configuration completely.Camel now 
supports OWASP dependency check maven pluginNATScomponent now supports TLS andexplicit 
flushing (with timeout) of the connectionhttps://cwiki.apache.org/confluence/display/BOOKKEEPER/Metrics;>Metricscomponent
 now supports Gauge typeFileconsumer now supports idempotent-changed and 
idempotent-rename read lock strategies for clustering.Camel 
Catalog now supports custom runtime providers that only includes the supported 
Camel components, languages and data formats running in that container. For 
example for Karaf or Spring Boot in 
 the camel-catalog-provider-karaf and 
camel-catalog-provider-springboot.Thehttps://cwiki.apache.org/confluence/display/WW/bean;>bean component 
will when calling a method that returned an instance of 
Callablenow call that callable to obtain the chained result. 
This allows to call Groovy functions/closures etc.FailoverLoad Balancer with 
inheritErrorHandler=false, now allows Camel'sError Handler to react after the load balancer is 
exhausted.Salesforce 
component now supports limits, recent items, approvals and composite 
APIDumping Camel routes as XML now includes custom namespaces which 
are at xpath expressions etc. Likewise updating Camel routes from XML can now 
include namespaces which will be associated on xpath 
expressions.AddedRoute
 IdFactory which can auto assign route ids based on the consumer 
endpoints to use more sensitible names, instead of route1, route2, 
etc.Addskip function toSimple languageUpgraded to Jetty 9.3 (Jetty 9.2 
still supported for Karaf 4.0.x users)RouteBuilder 
auto-configuration can now be disabled in Camel 
CDIAsynchronous support for CXF JAX-RS producers has been 
addedTheJSonPath language now supports Map and List types and 
POJOs as well. For POJOs you need to have Jackson on the 
classpath.Data Format which marshal to JSon or XML now set 
the content-type header to application/json or application/xml 
appropriately.The
 Kafka component can now store 
offset state offline

[05/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-component/src/test/resources/test-options.properties
--
diff --git 
a/components/camel-box2/camel-box2-component/src/test/resources/test-options.properties
 
b/components/camel-box2/camel-box2-component/src/test/resources/test-options.properties
deleted file mode 100644
index c5a5481..000
--- 
a/components/camel-box2/camel-box2-component/src/test/resources/test-options.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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.
-#
-
-###
-## Authentication properties for Box2 Component
-###
-
-#
-## Authentication properties for Box2 Component using STANDARD_AUTHENTICATION
-#
-authenticationType=STANDARD_AUTHENTICATION
-## User name and password
-## Create a free developer account on http://developers.box.com/ and provide 
user name password
-userName=
-userPassword=
-## Application client id and secret
-## Create a test Box.com application and provide its clientId and clientSecret
-clientId=
-clientSecret=

http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-component/tmp/test-options.properties
--
diff --git 
a/components/camel-box2/camel-box2-component/tmp/test-options.properties 
b/components/camel-box2/camel-box2-component/tmp/test-options.properties
deleted file mode 100644
index 30a032c..000
--- a/components/camel-box2/camel-box2-component/tmp/test-options.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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.
-#
-
-###
-## Authentication properties for Box2 Component
-###
-
-#
-## Authentication properties for Box2 Component using STANDARD_AUTHENTICATION
-#
-authenticationType=STANDARD_AUTHENTICATION
-## User name and password
-## Create a free developer account on http://developers.box.com/ and provide 
user name password
-userName=punkhor...@gmail.com
-userPassword=RedHat12!@
-## Application client id and secret
-## Create a test Box.com application and provide its clientId and clientSecret
-clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-
-###
-## Authentication properties for Box2 Component using 
APP_ENTERPRISE_AUTHENTICATION
-###
-#authenticationType=APP_ENTERPRISE_AUTHENTICATION
-#enterpriseId=8962085
-#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
-#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
-#publicKeyId=b22nf9qt
-#privateKeyFile=/Volumes/Development/Dev/box-java-sdk/private_key.pem
-#privateKeyPassword=RedHat12!@
-#encryptionAlgorithm=RSA_SHA_256
-#maxCacheEntries=100
-### Application client id and secret
-### Create a test Box.com application and provide its clientId and clientSecret

[01/15] camel git commit: CAMEL-9047: Delete old camel-box

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master cfe30492d -> cb1c757ff


http://git-wip-us.apache.org/repos/asf/camel/blob/b51280c8/components/camel-box/src/test/java/org/apache/camel/component/box/LongPollingEventsManagerIntegrationTest.java
--
diff --git 
a/components/camel-box/src/test/java/org/apache/camel/component/box/LongPollingEventsManagerIntegrationTest.java
 
b/components/camel-box/src/test/java/org/apache/camel/component/box/LongPollingEventsManagerIntegrationTest.java
deleted file mode 100644
index ecef86a..000
--- 
a/components/camel-box/src/test/java/org/apache/camel/component/box/LongPollingEventsManagerIntegrationTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * 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.
- */
-
-/*
- * Camel Api Route test generated by camel-component-util-maven-plugin
- * Generated on: Tue Jun 24 22:42:08 PDT 2014
- */
-package org.apache.camel.component.box;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import com.box.boxjavalibv2.dao.BoxEvent;
-import com.box.boxjavalibv2.dao.BoxFile;
-import com.box.boxjavalibv2.requests.requestobjects.BoxItemCopyRequestObject;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.box.internal.BoxApiName;
-import org.apache.camel.component.box.internal.BoxConstants;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Test class for 
org.apache.camel.component.box.internal.LongPollingEventsManager APIs.
- */
-public class LongPollingEventsManagerIntegrationTest extends 
AbstractBoxTestSupport {
-
-private static final Logger LOG = 
LoggerFactory.getLogger(LongPollingEventsManagerIntegrationTest.class);
-
-@Test
-public void testPoll() throws Exception {
-
-// generate file copy event
-final Map headers = new HashMap();
-headers.put("CamelBox.fileId", testFileId);
-final BoxItemCopyRequestObject requestObject = 
BoxItemCopyRequestObject.copyItemRequestObject("0");
-requestObject.setName(CAMEL_TEST_FILE);
-headers.put("CamelBox.itemCopyRequest", requestObject);
-
-BoxFile result = requestBodyAndHeaders("direct://COPYFILE", null, 
headers);
-
-assertNotNull("copyFile result", result);
-LOG.debug("copyFile: " + result);
-
-// generate file delete event
-headers.clear();
-headers.put("CamelBox.fileId", result.getId());
-headers.put("CamelBox.defaultRequest", null);
-requestBodyAndHeaders("direct://DELETEFILE", null, headers);
-
-MockEndpoint mockEndpoint = getMockEndpoint("mock:boxEvents");
-mockEndpoint.expectedMinimumMessageCount(2);
-mockEndpoint.setResultWaitTime(TimeUnit.MILLISECONDS.convert(30, 
TimeUnit.SECONDS));
-mockEndpoint.assertIsSatisfied();
-
-final List exchanges = mockEndpoint.getExchanges();
-assertNotNull("poll result", exchanges);
-assertFalse("poll result", exchanges.isEmpty());
-LOG.debug("poll result: " + exchanges);
-
-for (Exchange exchange : exchanges) {
-
-assertNotNull("poll result " + BoxConstants.CHUNK_SIZE_PROPERTY,
-
exchange.getIn().getHeader(BoxConstants.CHUNK_SIZE_PROPERTY));
-assertNotNull("poll result " + 
BoxConstants.NEXT_STREAM_POSITION_PROPERTY,
-
exchange.getIn().getHeader(BoxConstants.NEXT_STREAM_POSITION_PROPERTY));
-
-final Object body = exchange.getIn().getBody();
-assertNotNull("poll result body", body);
-assertEquals("poll result body type", BoxEvent.class, 
body.getClass());
-
-final String eventType = ((BoxEvent) body).getEventType();
-assertTrue("poll result type",
-BoxEvent.EVENT_TYPE_ITEM_COPY.equals(eventType) || 
BoxEvent.EVENT_TYPE_ITEM_TRASH.equals(eventType));
-}
-}
-
-@Override
-protected RouteBuilder

[06/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventLogsManagerIntegrationTest.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventLogsManagerIntegrationTest.java
 
b/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventLogsManagerIntegrationTest.java
deleted file mode 100644
index deb502e..000
--- 
a/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventLogsManagerIntegrationTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.box2;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.box2.internal.Box2ApiCollection;
-import org.apache.camel.component.box2.internal.Box2EventLogsManagerApiMethod;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Test class for
- * {@link org.apache.camel.component.box2.api.Box2EventLogsManager} APIs.
- */
-public class Box2EventLogsManagerIntegrationTest extends 
AbstractBox2TestSupport {
-
-private static final Logger LOG = 
LoggerFactory.getLogger(Box2EventLogsManagerIntegrationTest.class);
-private static final String PATH_PREFIX = Box2ApiCollection.getCollection()
-.getApiName(Box2EventLogsManagerApiMethod.class).getName();
-private static final long ONE_MINUTE_OF_MILLISECONDS = 1000 * 60;
-
-@Ignore // Requires enterprise admin account to test
-@Test
-public void testGetEnterpriseEvents() throws Exception {
-Date before = new Date();
-Date after = new Date();
-after.setTime(before.getTime() - ONE_MINUTE_OF_MILLISECONDS);
-
-final Map headers = new HashMap();
-// parameter type is String
-headers.put("CamelBox2.position", null);
-// parameter type is java.util.Date
-headers.put("CamelBox2.after", after);
-// parameter type is java.util.Date
-headers.put("CamelBox2.before", before);
-// parameter type is com.box.sdk.BoxEvent.Type[]
-headers.put("CamelBox2.types", null);
-
-@SuppressWarnings("rawtypes")
-final java.util.List result = 
requestBodyAndHeaders("direct://GETENTERPRISEEVENTS", null, headers);
-
-assertNotNull("getEnterpriseEvents result", result);
-LOG.debug("getEnterpriseEvents: " + result);
-}
-
-@Override
-protected RouteBuilder createRouteBuilder() throws Exception {
-return new RouteBuilder() {
-public void configure() {
-// test route for getEnterpriseEvents
-from("direct://GETENTERPRISEEVENTS").to("box2://" + 
PATH_PREFIX + "/getEnterpriseEvents");
-
-}
-};
-}
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventsManagerIntegrationTest.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventsManagerIntegrationTest.java
 
b/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventsManagerIntegrationTest.java
deleted file mode 100644
index 3af1b68..000
--- 
a/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2EventsManagerIntegrationTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * 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

[08/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
--
diff --git 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
deleted file mode 100644
index 0e2faa8..000
--- 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * 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.box2.api;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import com.box.sdk.BoxAPIConnection;
-import com.box.sdk.BoxAPIException;
-import com.box.sdk.BoxGroup;
-import com.box.sdk.BoxGroupMembership;
-import com.box.sdk.BoxUser;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Box2 Groups Manager
- * 
- * 
- * Provides operations to manage Box groups.
- * 
- * 
- *
- */
-public class Box2GroupsManager {
-
-private static final Logger LOG = 
LoggerFactory.getLogger(Box2GroupsManager.class);
-
-/**
- * Box connection to authenticated user account.
- */
-private BoxAPIConnection boxConnection;
-
-/**
- * Create groups manager to manage the users of Box connection's
- * authenticated user.
- * 
- * @param boxConnection
- *- Box connection to authenticated user account.
- */
-public Box2GroupsManager(BoxAPIConnection boxConnection) {
-this.boxConnection = boxConnection;
-}
-
-/**
- * Get all the groups in the enterprise.
- * 
- * @return Collection containing all the enterprise's groups.
- */
-public Collection getAllGroups() {
-try {
-LOG.debug("Getting all groups");
-
-Collection groups = new ArrayList();
-for (BoxGroup.Info groupInfo : 
BoxGroup.getAllGroups(boxConnection)) {
-groups.add(groupInfo.getResource());
-}
-return groups;
-} catch (BoxAPIException e) {
-throw new RuntimeException(
-String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
-}
-}
-
-/**
- * Create a new group with a specified name.
- * 
- * @param name
- *- the name of the new group.
- * @return The newly created group.
- */
-public BoxGroup createGroup(String name) {
-try {
-LOG.debug("Creating group name=" + name);
-if (name == null) {
-throw new IllegalArgumentException("Parameter 'name' can not 
be null");
-}
-
-return BoxGroup.createGroup(boxConnection, name).getResource();
-} catch (BoxAPIException e) {
-throw new RuntimeException(
-String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
-}
-}
-
-/**
- * Delete group.
- * 
- * @param groupId
- *- the id of group to delete.
- */
-public void deleteGroup(String groupId) {
-try {
-LOG.debug("Deleting group(" + groupId + ")");
-if (groupId == null) {
-throw new IllegalArgumentException("Parameter 'groupId' can 
not be null");
-}
-
-BoxGroup group = new BoxGroup(boxConnection, groupId);
-group.delete();
-} catch (BoxAPIException e) {
-throw new RuntimeException(
-String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
-}
-}
-
-/**
- * Get group information.
- * 
- * @param groupId
- *- the id of group.
- * @return The group information.
- */
-public BoxGroup.Info getGroupInfo(String groupId) {
-try {
-LOG.debug("Getting info for group(id=" + groupId + ")");
-if

[13/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
CAMEL-9047: Rename box2 to box


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

Branch: refs/heads/master
Commit: db0ca73478cfa464be874aa66297ef754caa1c56
Parents: b51280c
Author: Claus Ibsen 
Authored: Mon Mar 6 11:58:44 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 11:58:44 2017 +0100

--
 apache-camel/pom.xml|   4 +
 .../src/main/descriptors/common-bin.xml |   1 +
 components/camel-box/camel-box-api/pom.xml  |  95 +++
 .../box/api/BoxCollaborationsManager.java   | 238 ++
 .../component/box/api/BoxCommentsManager.java   | 205 +
 .../component/box/api/BoxEventLogsManager.java  | 110 +++
 .../component/box/api/BoxEventsManager.java |  99 +++
 .../component/box/api/BoxFilesManager.java  | 798 +++
 .../component/box/api/BoxFoldersManager.java| 407 ++
 .../component/box/api/BoxGroupsManager.java | 274 +++
 .../component/box/api/BoxSearchManager.java |  93 +++
 .../component/box/api/BoxTasksManager.java  | 324 
 .../component/box/api/BoxUsersManager.java  | 333 
 .../camel-box/camel-box-component/pom.xml   | 627 +++
 .../src/main/docs/box2-component.adoc   | 744 +
 .../camel/component/box/BoxComponent.java   | 115 +++
 .../camel/component/box/BoxConfiguration.java   | 475 +++
 .../apache/camel/component/box/BoxConsumer.java | 111 +++
 .../apache/camel/component/box/BoxEndpoint.java | 214 +
 .../apache/camel/component/box/BoxProducer.java |  35 +
 .../box/internal/BoxConnectionHelper.java   | 286 +++
 .../component/box/internal/BoxConstants.java|  32 +
 .../box/internal/BoxPropertiesHelper.java   |  42 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/box |  18 +
 .../component/box/AbstractBoxTestSupport.java   |  82 ++
 ...BoxCollaborationsManagerIntegrationTest.java | 232 ++
 .../box/BoxCommentsManagerIntegrationTest.java  | 202 +
 .../box/BoxEventLogsManagerIntegrationTest.java |  77 ++
 .../box/BoxEventsManagerIntegrationTest.java| 106 +++
 .../box/BoxFilesManagerIntegrationTest.java | 576 +
 .../box/BoxFoldersManagerIntegrationTest.java   | 323 
 .../box/BoxGroupsManagerIntegrationTest.java| 269 +++
 .../box/BoxSearchManagerIntegrationTest.java| 107 +++
 .../box/BoxTasksManagerIntegrationTest.java | 285 +++
 .../box/BoxUsersManagerIntegrationTest.java | 324 
 .../src/test/resources/CamelTestFile.txt|   1 +
 .../src/test/resources/log4j.properties |  14 +
 .../src/test/resources/test-options.properties  |  33 +
 .../tmp/test-options.properties |  67 ++
 components/camel-box/pom.xml|  48 ++
 components/camel-box2/camel-box2-api/pom.xml|  95 ---
 .../box2/api/Box2CollaborationsManager.java | 238 --
 .../component/box2/api/Box2CommentsManager.java | 205 -
 .../box2/api/Box2EventLogsManager.java  | 110 ---
 .../component/box2/api/Box2EventsManager.java   |  99 ---
 .../component/box2/api/Box2FilesManager.java| 798 ---
 .../component/box2/api/Box2FoldersManager.java  | 407 --
 .../component/box2/api/Box2GroupsManager.java   | 274 ---
 .../component/box2/api/Box2SearchManager.java   |  93 ---
 .../component/box2/api/Box2TasksManager.java| 324 
 .../component/box2/api/Box2UsersManager.java| 333 
 .../camel-box2/camel-box2-component/pom.xml | 628 ---
 .../src/main/docs/box2-component.adoc   | 744 -
 .../camel/component/box2/Box2Component.java | 115 ---
 .../camel/component/box2/Box2Configuration.java | 475 ---
 .../camel/component/box2/Box2Consumer.java  | 111 ---
 .../camel/component/box2/Box2Endpoint.java  | 214 -
 .../camel/component/box2/Box2Producer.java  |  35 -
 .../box2/internal/Box2ConnectionHelper.java | 286 ---
 .../component/box2/internal/Box2Constants.java  |  32 -
 .../box2/internal/Box2PropertiesHelper.java |  42 -
 .../src/main/resources/META-INF/LICENSE.txt | 203 -
 .../src/main/resources/META-INF/NOTICE.txt  |  11 -
 .../services/org/apache/camel/component/box2|  18 -
 .../component/box2/AbstractBox2TestSupport.java |  82 --
 ...ox2CollaborationsManagerIntegrationTest.java | 231 --
 .../Box2CommentsManagerIntegrationTest.java | 201 -
 .../Box2EventLogsManagerIntegrationTest.java|  76 --
 .../box2/Box2EventsManagerIntegrationTest.java  | 105 ---

[09/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box/camel-box-component/src/test/resources/test-options.properties
--
diff --git 
a/components/camel-box/camel-box-component/src/test/resources/test-options.properties
 
b/components/camel-box/camel-box-component/src/test/resources/test-options.properties
new file mode 100644
index 000..bd87fa3
--- /dev/null
+++ 
b/components/camel-box/camel-box-component/src/test/resources/test-options.properties
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+
+###
+## Authentication properties for Box Component
+###
+
+#
+## Authentication properties for Box Component using STANDARD_AUTHENTICATION
+#
+authenticationType=STANDARD_AUTHENTICATION
+## User name and password
+## Create a free developer account on http://developers.box.com/ and provide 
user name password
+userName=
+userPassword=
+## Application client id and secret
+## Create a test Box.com application and provide its clientId and clientSecret
+clientId=
+clientSecret=

http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box/camel-box-component/tmp/test-options.properties
--
diff --git 
a/components/camel-box/camel-box-component/tmp/test-options.properties 
b/components/camel-box/camel-box-component/tmp/test-options.properties
new file mode 100644
index 000..9cee863
--- /dev/null
+++ b/components/camel-box/camel-box-component/tmp/test-options.properties
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+
+###
+## Authentication properties for Box Component
+###
+
+#
+## Authentication properties for Box Component using STANDARD_AUTHENTICATION
+#
+authenticationType=STANDARD_AUTHENTICATION
+## User name and password
+## Create a free developer account on http://developers.box.com/ and provide 
user name password
+userName=punkhor...@gmail.com
+userPassword=RedHat12!@
+## Application client id and secret
+## Create a test Box.com application and provide its clientId and clientSecret
+clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
+clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
+
+###
+## Authentication properties for Box Component using 
APP_ENTERPRISE_AUTHENTICATION
+###
+#authenticationType=APP_ENTERPRISE_AUTHENTICATION
+#enterpriseId=8962085
+#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3
+#clientSecret=rh0qN6EWyMek61fELV8N82XblkK2EJMr
+#publicKeyId=b22nf9qt
+#privateKeyFile=/Volumes/Development/Dev/box-java-sdk/private_key.pem
+#privateKeyPassword=RedHat12!@
+#encryptionAlgorithm=RSA_SHA_256
+#maxCacheEntries=100
+### Application client id and secret
+### Create a test Box.com application and provide its clientId and clientSecret
+#clientId=4vvr1njh5d0u3o8lpowbgnameqic9mz3

[15/15] camel git commit: CAMEL-9047: Polished

2017-03-06 Thread davsclaus 
CAMEL-9047: Polished


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

Branch: refs/heads/master
Commit: cb1c757ff8d7a2a8027665a32e128c49aeeacc03
Parents: 217a925
Author: Claus Ibsen 
Authored: Mon Mar 6 12:10:24 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 12:10:24 2017 +0100

--
 .../box/api/BoxCollaborationsManager.java   |   7 -
 .../camel-box/camel-box-component/pom.xml   |   6 +-
 .../src/main/docs/box-component.adoc| 807 +++
 .../src/main/docs/box2-component.adoc   | 744 -
 .../camel/component/box/BoxComponent.java   |  11 +-
 .../camel/component/box/BoxConfiguration.java   |   3 -
 .../apache/camel/component/box/BoxConsumer.java |   3 -
 .../apache/camel/component/box/BoxEndpoint.java |  52 +-
 .../apache/camel/component/box/BoxProducer.java |   3 -
 .../box/internal/BoxConnectionHelper.java   |   3 -
 .../component/box/internal/BoxConstants.java|   3 -
 .../box/internal/BoxPropertiesHelper.java   |   3 -
 .../springboot/BoxComponentConfiguration.java   |   3 +-
 13 files changed, 816 insertions(+), 832 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cb1c757f/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
--
diff --git 
a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
 
b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
index e1b4f31..ec90561 100644
--- 
a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
+++ 
b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxCollaborationsManager.java
@@ -29,11 +29,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Box Collaborations Manager
- * 
  * 
  * Provides operations to manage Box collaborations.
- * 
- * 
  *
  */
 public class BoxCollaborationsManager {
@@ -201,8 +198,6 @@ public class BoxCollaborationsManager {
  * 
  * @param collaborationId
  *- the id of comment to change.
- * @param message
- *- the new message for the comment.
  * @return The comment with changed message.
  */
 public void deleteCollaboration(String collaborationId) {
@@ -226,9 +221,7 @@ public class BoxCollaborationsManager {
  */
 public Collection getPendingCollaborations() {
 try {
-
 return BoxCollaboration.getPendingCollaborations(boxConnection);
-
 } catch (BoxAPIException e) {
 throw new RuntimeException(
 String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);

http://git-wip-us.apache.org/repos/asf/camel/blob/cb1c757f/components/camel-box/camel-box-component/pom.xml
--
diff --git a/components/camel-box/camel-box-component/pom.xml 
b/components/camel-box/camel-box-component/pom.xml
index 3f9f39d..669e01e 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -53,13 +53,13 @@

com.box
box-java-sdk
-   2.1.1
+   ${box-java-sdk-version}

 

net.sourceforge.htmlunit
htmlunit
-   2.24
+   ${htmlunit.version}

 

@@ -82,7 +82,7 @@

com.box
box-java-sdk
-   2.1.1
+  ${box-java-sdk-version}
javadoc
provided


http://git-wip-us.apache.org/repos/asf/camel/blob/cb1c757f/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
--
diff --git 
a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc 
b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
new file mode 100644
index 000..53cfcfc
--- /dev/null
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -0,0 +1,807 @@
+## Box Component
+
+*Available as of Camel version *
+
+The Box component provides access to all of the Box.com

[07/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
 
b/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
deleted file mode 100644
index 2e8aade..000
--- 
a/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * 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.box2;
-
-import com.box.sdk.BoxAPIConnection;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.box2.internal.Box2ApiCollection;
-import org.apache.camel.component.box2.internal.Box2ApiName;
-import org.apache.camel.component.box2.internal.Box2ConnectionHelper;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.util.component.AbstractApiComponent;
-
-/**
- * Represents the component that manages {@link Box2Endpoint}.
- * 
- * 
- * 
- */
-// @UriEndpoint(scheme = "box2", consumerClass = Box2Consumer.class,
-// consumerPrefix = "consumer", syntax = "", title = "Box2 Component")
-public class Box2Component extends AbstractApiComponent {
-
-@Metadata(label = "advanced")
-BoxAPIConnection boxConnection;
-
-public Box2Component() {
-super(Box2Endpoint.class, Box2ApiName.class, 
Box2ApiCollection.getCollection());
-}
-
-public Box2Component(CamelContext context) {
-super(context, Box2Endpoint.class, Box2ApiName.class, 
Box2ApiCollection.getCollection());
-}
-
-@Override
-protected Box2ApiName getApiName(String apiNameStr) throws 
IllegalArgumentException {
-return Box2ApiName.fromValue(apiNameStr);
-}
-
-/**
- * To use the shared configuration
- */
-@Override
-public void setConfiguration(Box2Configuration configuration) {
-super.setConfiguration(configuration);
-}
-
-/**
- * To use the shared configuration
- */
-@Override
-public Box2Configuration getConfiguration() {
-return super.getConfiguration();
-}
-
-/**
- * To use a shared connection
- * 
- * @return the shared connection
- */
-public BoxAPIConnection getBoxConnection() {
-return boxConnection;
-}
-
-@Override
-protected Endpoint createEndpoint(String uri, String methodName, 
Box2ApiName apiName,
-Box2Configuration endpointConfiguration) {
-endpointConfiguration.setApiName(apiName);
-endpointConfiguration.setMethodName(methodName);
-return new Box2Endpoint(uri, this, apiName, methodName, 
endpointConfiguration);
-}
-
-@Override
-protected void doStart() throws Exception {
-super.doStart();
-
-if (boxConnection == null) {
-if (configuration != null) {
-boxConnection = 
Box2ConnectionHelper.createConnection(configuration);
-} else {
-throw new IllegalArgumentException("Unable to connect, Box2 
component configuration is missing");
-}
-}
-}
-
-@Override
-protected void doStop() throws Exception {
-if (boxConnection != null) {
-boxConnection = null;
-}
-}
-
-@Override
-public void doShutdown() throws Exception {
-if (boxConnection != null) {
-boxConnection = null;
-}
-super.doShutdown();
-}
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Configuration.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Configuration.java

[12/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
--
diff --git 
a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
 
b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
new file mode 100644
index 000..b8c914f
--- /dev/null
+++ 
b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxGroupsManager.java
@@ -0,0 +1,274 @@
+/**
+ * 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.box.api;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import com.box.sdk.BoxAPIConnection;
+import com.box.sdk.BoxAPIException;
+import com.box.sdk.BoxGroup;
+import com.box.sdk.BoxGroupMembership;
+import com.box.sdk.BoxUser;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Box Groups Manager
+ * 
+ * 
+ * Provides operations to manage Box groups.
+ * 
+ * 
+ *
+ */
+public class BoxGroupsManager {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(BoxGroupsManager.class);
+
+/**
+ * Box connection to authenticated user account.
+ */
+private BoxAPIConnection boxConnection;
+
+/**
+ * Create groups manager to manage the users of Box connection's
+ * authenticated user.
+ * 
+ * @param boxConnection
+ *- Box connection to authenticated user account.
+ */
+public BoxGroupsManager(BoxAPIConnection boxConnection) {
+this.boxConnection = boxConnection;
+}
+
+/**
+ * Get all the groups in the enterprise.
+ * 
+ * @return Collection containing all the enterprise's groups.
+ */
+public Collection getAllGroups() {
+try {
+LOG.debug("Getting all groups");
+
+Collection groups = new ArrayList();
+for (BoxGroup.Info groupInfo : 
BoxGroup.getAllGroups(boxConnection)) {
+groups.add(groupInfo.getResource());
+}
+return groups;
+} catch (BoxAPIException e) {
+throw new RuntimeException(
+String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
+}
+}
+
+/**
+ * Create a new group with a specified name.
+ * 
+ * @param name
+ *- the name of the new group.
+ * @return The newly created group.
+ */
+public BoxGroup createGroup(String name) {
+try {
+LOG.debug("Creating group name=" + name);
+if (name == null) {
+throw new IllegalArgumentException("Parameter 'name' can not 
be null");
+}
+
+return BoxGroup.createGroup(boxConnection, name).getResource();
+} catch (BoxAPIException e) {
+throw new RuntimeException(
+String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
+}
+}
+
+/**
+ * Delete group.
+ * 
+ * @param groupId
+ *- the id of group to delete.
+ */
+public void deleteGroup(String groupId) {
+try {
+LOG.debug("Deleting group(" + groupId + ")");
+if (groupId == null) {
+throw new IllegalArgumentException("Parameter 'groupId' can 
not be null");
+}
+
+BoxGroup group = new BoxGroup(boxConnection, groupId);
+group.delete();
+} catch (BoxAPIException e) {
+throw new RuntimeException(
+String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
+}
+}
+
+/**
+ * Get group information.
+ * 
+ * @param groupId
+ *- the id of group.
+ * @return The group information.
+ */
+public BoxGroup.Info getGroupInfo(String groupId) {
+try {
+LOG.debug("Getting info for group(id=" + groupId + ")");
+if (groupId == null) {
+

[04/15] camel git commit: CAMEL-9047: Delete old camel-box

2017-03-06 Thread davsclaus 
CAMEL-9047: Delete old camel-box


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

Branch: refs/heads/master
Commit: b51280c89210549bb3d101c9d60761126b560672
Parents: cfe3049
Author: Claus Ibsen 
Authored: Mon Mar 6 11:22:36 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 11:22:36 2017 +0100

--
 components/camel-box/pom.xml| 525 -
 .../camel-box/src/main/docs/box-component.adoc  | 753 ---
 .../camel/component/box/BoxComponent.java   | 106 ---
 .../camel/component/box/BoxConfiguration.java   | 272 ---
 .../apache/camel/component/box/BoxConsumer.java | 125 ---
 .../camel/component/box/BoxConverter.java   |  99 ---
 .../apache/camel/component/box/BoxEndpoint.java | 257 ---
 .../apache/camel/component/box/BoxProducer.java |  31 -
 .../component/box/internal/BoxClientHelper.java | 274 ---
 .../component/box/internal/BoxConstants.java|  31 -
 .../box/internal/BoxPropertiesHelper.java   |  39 -
 .../component/box/internal/CachedBoxClient.java |  72 --
 .../box/internal/CachingSecureStorage.java  |  50 --
 .../component/box/internal/EventCallback.java   |  29 -
 .../box/internal/LoginAuthFlowListener.java |  67 --
 .../component/box/internal/LoginAuthFlowUI.java | 225 --
 .../box/internal/LongPollingEventsManager.java  | 301 
 .../box/internal/OAuthHelperListener.java   |  57 --
 .../src/main/resources/META-INF/LICENSE.txt | 203 -
 .../src/main/resources/META-INF/NOTICE.txt  |  11 -
 .../services/org/apache/camel/TypeConverter |  17 -
 .../services/org/apache/camel/component/box |  18 -
 .../signatures/long-polling-events-manager.txt  |   1 -
 .../component/box/AbstractBoxTestSupport.java   | 179 -
 ...BoxCollaborationsManagerIntegrationTest.java | 153 
 .../box/IBoxCommentsManagerIntegrationTest.java | 143 
 .../box/IBoxEventsManagerIntegrationTest.java   |  77 --
 .../box/IBoxFilesManagerIntegrationTest.java| 447 ---
 .../box/IBoxFoldersManagerIntegrationTest.java  | 236 --
 .../box/IBoxGroupsManagerIntegrationTest.java   | 326 
 .../box/IBoxSearchManagerIntegrationTest.java   |  66 --
 .../IBoxSharedItemsManagerIntegrationTest.java  |  55 --
 .../box/IBoxUsersManagerIntegrationTest.java| 280 ---
 .../box/InvalidClientIdIntegrationTest.java |  83 --
 ...LongPollingEventsManagerIntegrationTest.java | 125 ---
 .../src/test/resources/log4j2.properties|  28 -
 .../src/test/resources/test-options.properties  |  45 --
 37 files changed, 5806 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b51280c8/components/camel-box/pom.xml
--
diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml
deleted file mode 100644
index 329326e..000
--- a/components/camel-box/pom.xml
+++ /dev/null
@@ -1,525 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-
-  4.0.0
-
-  
-org.apache.camel
-components
-2.19.0-SNAPSHOT
-  
-
-  camel-box
-  jar
-  Camel :: Box.com
-  Camel Component for Box.com
-
-  
-box
-Box
-org.apache.camel.component.box
-org.apache.camel.component.box.internal
-
-${componentPackage}
-${outPackage}
-
org.apache.camel.spi.ComponentResolver;component=box
-  
-
-  
-
-  org.apache.camel
-  camel-core
-
-
-  org.apache.httpcomponents
-  httpclient
-
-
-  net.box
-  boxjavalibv2
-  ${boxjavalibv2.version}
-  
-
-  org.apache.httpcomponents
-  httpclient
-
-
-  org.apache.httpcomponents
-  httpclient-cache
-
-
-  com.fasterxml.jackson.core
-  jackson-annotations
-
-
-  com.fasterxml.jackson.core
-  jackson-core
-
-
-  com.fasterxml.jackson.core
-  jackson-databind
-
-
-  junit
-  junit
-
-
-  org.easymock
-  easymock
-
-
-  commons-io
-  commons-io
-
-
-  commons-lang
-  commons-lang
-
-  
-
-
-  net.sourceforge.htmlunit
-  htmlunit
-  ${htmlunit.version}
-
-
-  com.fasterxml.jackson.core
-  jackson-databind
-
-
-
-  org.apache.httpcomponents
-  httpcore
-
-
-

[14/15] camel git commit: Regen

2017-03-06 Thread davsclaus 
Regen


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

Branch: refs/heads/master
Commit: 217a925a3c7de56ba531d0d8bedd56dbf7d996d2
Parents: db0ca73
Author: Claus Ibsen 
Authored: Mon Mar 6 12:00:10 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 12:00:10 2017 +0100

--
 components/readme.adoc | 7 ++-
 docs/user-manual/en/SUMMARY.md | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/217a925a/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index 8270761..4a6a823 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^
 
 // components: START
-Number of Components: 220 in 175 JAR artifacts
+Number of Components: 219 in 174 JAR artifacts
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -95,9 +95,6 @@ Number of Components: 220 in 175 JAR artifacts
 | link:camel-bonita/src/main/docs/bonita-component.adoc[Bonita] (camel-bonita) 
+
 `bonita:operation` | 2.19 | Camel Bonita support
 
-| link:camel-box/src/main/docs/box-component.adoc[Box] (camel-box) +
-`box:apiName/methodName` | 2.14 | For uploading downloading and managing files 
folders groups collaborations etc on box DOT com.
-
 | link:camel-braintree/src/main/docs/braintree-component.adoc[Braintree] 
(camel-braintree) +
 `braintree:apiName/methodName` | 2.17 | The braintree component is used for 
integrating with the Braintree Payment System.
 
@@ -850,7 +847,7 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts
 
 | link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] 
(camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
 
-| link:camel-box2-parent/src/main/docs/box2-parent.adoc[Box2 Parent] 
(camel-box2-parent) |  | Parent project for Camel {Box2} Component
+| link:camel-box-parent/src/main/docs/box-parent.adoc[Box Parent] 
(camel-box-parent) |  | Camel Box parent
 
 | link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel 
with CDI
 

http://git-wip-us.apache.org/repos/asf/camel/blob/217a925a/docs/user-manual/en/SUMMARY.md
--
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index b5bb5a3..c575605 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -151,7 +151,6 @@
* [Bean Validator](bean-validator-component.adoc)
* [Beanstalk](beanstalk-component.adoc)
* [Bonita](bonita-component.adoc)
-   * [Box](box-component.adoc)
* [Braintree](braintree-component.adoc)
* [Camel Context](context-component.adoc)
* [Cassandra CQL](cql-component.adoc)
@@ -328,7 +327,7 @@
 * Miscellaneous Components
* [BAM](bam.adoc)
* [Blueprint](blueprint.adoc)
-   * [Box2 Parent](box2-parent.adoc)
+   * [Box Parent](box-parent.adoc)
* [CDI](cdi.adoc)
* [CXF Transport](cxf-transport.adoc)
* [Eclipse](eclipse.adoc)

[03/15] camel git commit: CAMEL-9047: Delete old camel-box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/b51280c8/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
--
diff --git 
a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
 
b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
deleted file mode 100644
index 95aaae5..000
--- 
a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxProducer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 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.box;
-
-import org.apache.camel.component.box.internal.BoxApiName;
-import org.apache.camel.component.box.internal.BoxPropertiesHelper;
-import org.apache.camel.util.component.AbstractApiProducer;
-
-/**
- * The Box producer.
- */
-public class BoxProducer extends AbstractApiProducer {
-
-public BoxProducer(BoxEndpoint endpoint) {
-super(endpoint, BoxPropertiesHelper.getHelper());
-}
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/b51280c8/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java
--
diff --git 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java
 
b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java
deleted file mode 100644
index b526fa7..000
--- 
a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * 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.box.internal;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.Socket;
-import java.security.GeneralSecurityException;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import javax.net.ssl.SSLContext;
-
-import com.box.boxjavalibv2.BoxClient;
-import com.box.boxjavalibv2.BoxConnectionManagerBuilder;
-import com.box.boxjavalibv2.BoxRESTClient;
-import com.box.boxjavalibv2.authorization.IAuthFlowUI;
-import com.box.boxjavalibv2.authorization.IAuthSecureStorage;
-import com.box.restclientv2.IBoxRESTClient;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.box.BoxConfiguration;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.jsse.SSLContextParameters;
-import org.apache.http.HttpHost;
-import org.apache.http.client.HttpClient;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Helper class to work with {@link BoxClient}.
- */
-public final class BoxClientHelper {
-
-private static final Logger LOG = 
LoggerFactory.getLogger(BoxClientHelper.class);
-
-private BoxClientHelper() {
-}
-
-// create BoxClient using provided configuration
-@SuppressWarnings("deprecation")
-public static

[11/15] camel git commit: CAMEL-9047: Rename box2 to box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
--
diff --git 
a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
 
b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
new file mode 100644
index 000..70d3344
--- /dev/null
+++ 
b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxComponent.java
@@ -0,0 +1,115 @@
+/**
+ * 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.box;
+
+import com.box.sdk.BoxAPIConnection;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.box.internal.BoxConnectionHelper;
+import org.apache.camel.component.box.internal.BoxApiCollection;
+import org.apache.camel.component.box.internal.BoxApiName;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.component.AbstractApiComponent;
+
+/**
+ * Represents the component that manages {@link BoxEndpoint}.
+ * 
+ * 
+ * 
+ */
+// @UriEndpoint(scheme = "box", consumerClass = BoxConsumer.class,
+// consumerPrefix = "consumer", syntax = "", title = "Box Component")
+public class BoxComponent extends AbstractApiComponent {
+
+@Metadata(label = "advanced")
+BoxAPIConnection boxConnection;
+
+public BoxComponent() {
+super(BoxEndpoint.class, BoxApiName.class, 
BoxApiCollection.getCollection());
+}
+
+public BoxComponent(CamelContext context) {
+super(context, BoxEndpoint.class, BoxApiName.class, 
BoxApiCollection.getCollection());
+}
+
+@Override
+protected BoxApiName getApiName(String apiNameStr) throws 
IllegalArgumentException {
+return BoxApiName.fromValue(apiNameStr);
+}
+
+/**
+ * To use the shared configuration
+ */
+@Override
+public void setConfiguration(BoxConfiguration configuration) {
+super.setConfiguration(configuration);
+}
+
+/**
+ * To use the shared configuration
+ */
+@Override
+public BoxConfiguration getConfiguration() {
+return super.getConfiguration();
+}
+
+/**
+ * To use a shared connection
+ * 
+ * @return the shared connection
+ */
+public BoxAPIConnection getBoxConnection() {
+return boxConnection;
+}
+
+@Override
+protected Endpoint createEndpoint(String uri, String methodName, 
BoxApiName apiName,
+BoxConfiguration endpointConfiguration) {
+endpointConfiguration.setApiName(apiName);
+endpointConfiguration.setMethodName(methodName);
+return new BoxEndpoint(uri, this, apiName, methodName, 
endpointConfiguration);
+}
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+
+if (boxConnection == null) {
+if (configuration != null) {
+boxConnection = 
BoxConnectionHelper.createConnection(configuration);
+} else {
+throw new IllegalArgumentException("Unable to connect, Box 
component configuration is missing");
+}
+}
+}
+
+@Override
+protected void doStop() throws Exception {
+if (boxConnection != null) {
+boxConnection = null;
+}
+}
+
+@Override
+public void doShutdown() throws Exception {
+if (boxConnection != null) {
+boxConnection = null;
+}
+super.doShutdown();
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/db0ca734/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
--
diff --git 
a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
 
b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxConfiguration.java
new file mode 100644
index

[02/15] camel git commit: CAMEL-9047: Delete old camel-box

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/b51280c8/components/camel-box/src/test/java/org/apache/camel/component/box/IBoxCollaborationsManagerIntegrationTest.java
--
diff --git 
a/components/camel-box/src/test/java/org/apache/camel/component/box/IBoxCollaborationsManagerIntegrationTest.java
 
b/components/camel-box/src/test/java/org/apache/camel/component/box/IBoxCollaborationsManagerIntegrationTest.java
deleted file mode 100644
index 2bcb34e..000
--- 
a/components/camel-box/src/test/java/org/apache/camel/component/box/IBoxCollaborationsManagerIntegrationTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * 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.
- */
-
-/*
- * Camel Api Route test generated by camel-component-util-maven-plugin
- * Generated on: Tue Jun 24 22:42:08 PDT 2014
- */
-package org.apache.camel.component.box;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.box.boxjavalibv2.dao.BoxCollaboration;
-import com.box.boxjavalibv2.dao.BoxCollaborationRole;
-import com.box.boxjavalibv2.requests.requestobjects.BoxCollabRequestObject;
-import 
com.box.boxjavalibv2.requests.requestobjects.BoxGetAllCollabsRequestObject;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.box.internal.BoxApiCollection;
-import 
org.apache.camel.component.box.internal.IBoxCollaborationsManagerApiMethod;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Test class for 
com.box.boxjavalibv2.resourcemanagers.IBoxCollaborationsManager APIs.
- */
-public class IBoxCollaborationsManagerIntegrationTest extends 
AbstractBoxTestSupport {
-
-private static final Logger LOG = 
LoggerFactory.getLogger(IBoxCollaborationsManagerIntegrationTest.class);
-private static final String PATH_PREFIX = 
BoxApiCollection.getCollection().getApiName(IBoxCollaborationsManagerApiMethod.class).getName();
-
-private BoxCollaboration createCollaboration() throws InterruptedException 
{
-final Map headers = new HashMap();
-// parameter type is String
-headers.put("CamelBox.folderId", testFolderId);
-// parameter type is 
com.box.boxjavalibv2.requests.requestobjects.BoxCollabRequestObject
-final BoxCollabRequestObject collabObject = 
BoxCollabRequestObject.createCollabObject(testFolderId, null,
-"camel.t...@localhost.com", BoxCollaborationRole.VIEWER);
-headers.put("CamelBox.collabRequest", collabObject);
-
-BoxCollaboration result = 
requestBodyAndHeaders("direct://CREATECOLLABORATION",
-null, headers);
-assertNotNull("createCollaboration result", result);
-// wait a moment for collaboration to register
-Thread.sleep(2000);
-return result;
-}
-
-private void deleteCollaboration(String collabId) throws Exception {
-
-final Map headers = new HashMap();
-// parameter type is String
-headers.put("CamelBox.collabId", collabId);
-// parameter type is 
com.box.restclientv2.requestsbase.BoxDefaultRequestObject
-//headers.put("CamelBox.defaultRequest", null);
-requestBodyAndHeaders("direct://DELETECOLLABORATION", null, headers);
-}
-
-@Test
-public void testGetAllCollaborations() throws Exception {
-// using 
com.box.boxjavalibv2.requests.requestobjects.BoxGetAllCollabsRequestObject 
message body for single parameter "getAllCollabsRequest"
-final BoxGetAllCollabsRequestObject collabRequest =
-
BoxGetAllCollabsRequestObject.getAllCollaborationsRequestObject(BoxCollaboration.STATUS_PENDING);
-
-List result = requestBody("direct://GETALLCOLLABORATIONS", 
collabRequest);
-assertNotNull("getAllCollaborations: ", result);
-LOG.debug("getAllCollaborations: " + result);
-}
-
-@Test
-public void testGetCollaboration() throws Exception {
-final BoxCollaboration collaboration = createCollaboration();
-
-try {
-final Map headers = new HashMap();
-

camel git commit: Upgrade Ehcache to version 3.3.0

2017-03-06 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 03e148c12 -> cfe30492d


Upgrade Ehcache to version 3.3.0


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

Branch: refs/heads/master
Commit: cfe30492d56f5a7ec2f9865f71830351e67076ea
Parents: 03e148c
Author: Andrea Cosentino 
Authored: Mon Mar 6 10:23:17 2017 +0100
Committer: Andrea Cosentino 
Committed: Mon Mar 6 10:23:33 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/cfe30492/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0874266..6b4bc32 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,7 +172,7 @@
 2.1.5
 2.1.5_1
 2.10.1
-3.2.0
+3.3.0
 4.6.2
 2.4.3_1
 18.0

camel git commit: CAMEL-10945: camel-ssh - Unit test fails

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 0cd6dfbb9 -> 03e148c12


CAMEL-10945: camel-ssh - Unit test fails


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

Branch: refs/heads/master
Commit: 03e148c1236aafa45c5d34d156bd67ebb062d948
Parents: 0cd6dfb
Author: Claus Ibsen 
Authored: Mon Mar 6 10:12:29 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 10:12:29 2017 +0100

--
 .../org/apache/camel/component/ssh/SshComponent.java | 15 ---
 .../apache/camel/component/ssh/SshConfiguration.java |  6 --
 2 files changed, 8 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/03e148c1/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
--
diff --git 
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
 
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
index 3193f32..51a55a8 100644
--- 
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
+++ 
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
@@ -29,7 +29,7 @@ import org.apache.sshd.common.KeyPairProvider;
  */
 public class SshComponent extends UriEndpointComponent {
 @Metadata(label = "advanced")
-private SshConfiguration configuration;
+private SshConfiguration configuration = new SshConfiguration();
 
 public SshComponent() {
 super(SshEndpoint.class);
@@ -37,13 +37,9 @@ public class SshComponent extends UriEndpointComponent {
 
 @Override
 protected Endpoint createEndpoint(String uri, String remaining, 
Map parameters) throws Exception {
-SshConfiguration newConfig;
-
-if (configuration == null) {
-newConfig = new SshConfiguration(new URI(uri));
-} else {
-newConfig = configuration.copy();
-}
+URI u = new URI(uri);
+SshConfiguration newConfig = configuration.copy();
+newConfig.configure(u);
 
 SshEndpoint endpoint = new SshEndpoint(uri, this, newConfig);
 setProperties(endpoint.getConfiguration(), parameters);
@@ -51,9 +47,6 @@ public class SshComponent extends UriEndpointComponent {
 }
 
 public SshConfiguration getConfiguration() {
-if (configuration == null) {
-configuration = new SshConfiguration();
-}
 return configuration;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/03e148c1/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
--
diff --git 
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
 
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
index c9a155e..54c6d84 100644
--- 
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
+++ 
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
@@ -72,11 +72,13 @@ public class SshConfiguration implements Cloneable {
 setPassword(pw);
 }
 
-setHost(uri.getHost());
+if (getHost() == null && uri.getHost() != null) {
+setHost(uri.getHost());
+}
 
 // URI.getPort returns -1 if port not defined, else use default port
 int uriPort = uri.getPort();
-if (uriPort != -1) {
+if (getPort() == DEFAULT_SSH_PORT && uriPort != -1) {
 setPort(uriPort);
 }
 }

[4/4] camel git commit: CAMEL-8351 - simple implementation for breadcrumbId to be set as camel exhange's header

2017-03-06 Thread davsclaus 
CAMEL-8351 - simple implementation for breadcrumbId to be set as camel 
exhange's header


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

Branch: refs/heads/master
Commit: 54d932a007078b6c55fd9bf733d4956520b1f3b2
Parents: d16d265
Author: onders86 
Authored: Wed Mar 1 22:17:28 2017 +0300
Committer: Claus Ibsen 
Committed: Mon Mar 6 09:50:14 2017 +0100

--
 .../AddBreadcrumbHttpHeaderTestInterceptor.java | 57 
 .../spring/ws/ConsumerBreadcrumbIdTest.java | 98 
 .../ws/ConsumerBreadcrumbIdTest-context.xml | 41 
 3 files changed, 196 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/54d932a0/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
--
diff --git 
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
new file mode 100644
index 000..16cac6a
--- /dev/null
+++ 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
@@ -0,0 +1,57 @@
+/**
+ * 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.spring.ws;
+
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.springframework.ws.client.WebServiceClientException;
+import org.springframework.ws.client.support.interceptor.ClientInterceptor;
+import org.springframework.ws.context.MessageContext;
+import org.springframework.ws.transport.context.TransportContext;
+import org.springframework.ws.transport.context.TransportContextHolder;
+import org.springframework.ws.transport.http.CommonsHttpConnection;
+
+public class AddBreadcrumbHttpHeaderTestInterceptor implements 
ClientInterceptor {
+
+@Override
+public boolean handleRequest(MessageContext messageContext) throws 
WebServiceClientException {
+// no extra op
+TransportContext context = 
TransportContextHolder.getTransportContext();
+CommonsHttpConnection connection = (CommonsHttpConnection) 
context.getConnection();
+PostMethod postMethod = connection.getPostMethod();
+postMethod.addRequestHeader("breadcrumbId", 
"ID-Ralfs-MacBook-Pro-local-50523-1423553069254-0-5");
+return true;
+}
+
+@Override
+public boolean handleResponse(MessageContext messageContext) throws 
WebServiceClientException {
+// no extra op
+return true;
+}
+
+@Override
+public boolean handleFault(MessageContext messageContext) throws 
WebServiceClientException {
+// no extra op
+return true;
+}
+
+@Override
+public void afterCompletion(MessageContext messageContext, Exception ex) 
throws WebServiceClientException {
+ // noop
+
+}
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/54d932a0/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
--
diff --git 
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
new file mode 100644
index 000..3b3ba2e
--- /dev/null
+++ 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional

[3/4] camel git commit: CAMEL-8351 - remove empty lines and fix typo

2017-03-06 Thread davsclaus 
CAMEL-8351 - remove empty lines and fix typo


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

Branch: refs/heads/master
Commit: adff4e01007917fea7ef02488eab4b4db3f33cff
Parents: a5b5deb
Author: onders86 
Authored: Mon Mar 6 11:00:04 2017 +0300
Committer: Claus Ibsen 
Committed: Mon Mar 6 09:50:14 2017 +0100

--
 .../camel/component/spring/ws/SpringWebserviceConsumer.java | 8 
 .../camel/component/spring/ws/ConsumerBreadcrumbIdTest.java | 9 +
 2 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/adff4e01/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
--
diff --git 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
index e66ab63..19f40fc 100644
--- 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
+++ 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
@@ -83,11 +83,11 @@ public class SpringWebserviceConsumer extends 
DefaultConsumer implements Message
 
 private void 
populateExchangeWithBreadcrumbFromMessageContext(MessageContext messageContext, 
Exchange exchange) {
 SaajSoapMessage saajSoap = (SaajSoapMessage) 
messageContext.getRequest();
-SOAPMessage soapMesssageRequest = null;
+SOAPMessage soapMessageRequest = null;
 if (saajSoap != null) {
-soapMesssageRequest = saajSoap.getSaajMessage();
-if (soapMesssageRequest != null) {
-MimeHeaders mimeHeaders = soapMesssageRequest.getMimeHeaders();
+soapMessageRequest = saajSoap.getSaajMessage();
+if (soapMessageRequest != null) {
+MimeHeaders mimeHeaders = soapMessageRequest.getMimeHeaders();
 if (mimeHeaders != null) {
 String[] breadcrumbIdHeaderValues = 
mimeHeaders.getHeader(Exchange.BREADCRUMB_ID);
 // expected to get one token

http://git-wip-us.apache.org/repos/asf/camel/blob/adff4e01/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
--
diff --git 
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
index 3b3ba2e..4e2ff67 100644
--- 
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
+++ 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerBreadcrumbIdTest.java
@@ -59,9 +59,7 @@ public class ConsumerBreadcrumbIdTest extends 
CamelTestSupport {
 public void consumeWebServiceWithPojoRequestWhichIsWithBreadcrumb() throws 
Exception {
 QuoteRequest request = new QuoteRequest();
 request.setSymbol("GOOG");
-
 Object result = template.request("direct:webservice-marshall-asin", 
new Processor() {
-
 @Override
 public void process(Exchange exchange) throws Exception {
 assertNotNull(exchange.getIn().getHeader("breadcrumbId"));
@@ -74,23 +72,18 @@ public class ConsumerBreadcrumbIdTest extends 
CamelTestSupport {
 @Override
 protected RouteBuilder createRouteBuilder() throws Exception {
 return new RouteBuilder() {
-
 @Override
 public void configure() throws Exception {
 JaxbDataFormat jaxb = new JaxbDataFormat(false);
 
jaxb.setContextPath("org.apache.camel.component.spring.ws.jaxb");
-  
 // request webservice
 from("direct:webservice-marshall-asin")
 .marshal(jaxb)
 
.to("spring-ws:http://localhost/?soapAction=http://www.stockquotes.edu/GetQuoteAsIn=#webServiceTemplate;)
 .convertBodyTo(String.class);
-
 // provide web service
 
from("spring-ws:soapaction:http://www.stockquotes.edu/GetQuoteAsIn?endpointMapping=#endpointMapping;).setHeader("setin",
 constant("true"))
-

[2/4] camel git commit: CAMEL-8351 - simple implementation for breadcrumbId to be set as camel exhange's header

2017-03-06 Thread davsclaus 
CAMEL-8351 - simple implementation for breadcrumbId to be set as camel 
exhange's header


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

Branch: refs/heads/master
Commit: a5b5deb1643dfc640ea8dd99fd9232927cb9516a
Parents: 54d932a
Author: onders86 
Authored: Wed Mar 1 22:22:23 2017 +0300
Committer: Claus Ibsen 
Committed: Mon Mar 6 09:50:14 2017 +0100

--
 .../spring/ws/SpringWebserviceConsumer.java | 29 +++-
 1 file changed, 28 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a5b5deb1/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
--
diff --git 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
index 3398216..e66ab63 100644
--- 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
+++ 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.spring.ws;
 import java.util.Iterator;
 import java.util.Map;
 import javax.xml.namespace.QName;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 
 import org.apache.camel.Endpoint;
@@ -36,6 +38,7 @@ import org.springframework.ws.server.endpoint.MessageEndpoint;
 import org.springframework.ws.soap.SoapHeader;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapMessage;
+import org.springframework.ws.soap.saaj.SaajSoapMessage;
 
 public class SpringWebserviceConsumer extends DefaultConsumer implements 
MessageEndpoint {
 
@@ -54,7 +57,10 @@ public class SpringWebserviceConsumer extends 
DefaultConsumer implements Message
 public void invoke(MessageContext messageContext) throws Exception {
 Exchange exchange = 
getEndpoint().createExchange(ExchangePattern.InOptionalOut);
 populateExchangeFromMessageContext(messageContext, exchange);
-
+
+// populate camel exchange with breadcrumb from transport header   
 
+populateExchangeWithBreadcrumbFromMessageContext(messageContext, 
exchange);
+
 // start message processing
 getProcessor().process(exchange);
 
@@ -74,6 +80,27 @@ public class SpringWebserviceConsumer extends 
DefaultConsumer implements Message
 }
 
 }
+
+private void 
populateExchangeWithBreadcrumbFromMessageContext(MessageContext messageContext, 
Exchange exchange) {
+SaajSoapMessage saajSoap = (SaajSoapMessage) 
messageContext.getRequest();
+SOAPMessage soapMesssageRequest = null;
+if (saajSoap != null) {
+soapMesssageRequest = saajSoap.getSaajMessage();
+if (soapMesssageRequest != null) {
+MimeHeaders mimeHeaders = soapMesssageRequest.getMimeHeaders();
+if (mimeHeaders != null) {
+String[] breadcrumbIdHeaderValues = 
mimeHeaders.getHeader(Exchange.BREADCRUMB_ID);
+// expected to get one token
+// if more than one token expected, 
+// presumably breadcrumb generation strategy 
+// may be required to implement
+if (breadcrumbIdHeaderValues != null && 
breadcrumbIdHeaderValues.length >= 1) {
+exchange.getIn().setHeader(Exchange.BREADCRUMB_ID, 
breadcrumbIdHeaderValues[0]);
+}
+}
+}
+}
+}
 
 private void populateExchangeFromMessageContext(MessageContext 
messageContext, Exchange exchange) {
 populateExchangeWithPropertiesFromMessageContext(messageContext, 
exchange);

[1/4] camel git commit: Regen

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master d16d265cf -> 0cd6dfbb9


Regen


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

Branch: refs/heads/master
Commit: 0cd6dfbb9d2c193355511305bb0d60b8210aa772
Parents: adff4e0
Author: Claus Ibsen 
Authored: Mon Mar 6 09:50:01 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 09:50:14 2017 +0100

--
 examples/README.adoc | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0cd6dfbb/examples/README.adoc
--
diff --git a/examples/README.adoc b/examples/README.adoc
index 08e5ff5..e7b44f2 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
 ### Examples
 
 // examples: START
-Number of Examples: 84
+Number of Examples: 86
 
 [width="100%",cols="4,2,4",options="header"]
 |===
@@ -29,7 +29,7 @@ Number of Examples: 84
 
 | link:camel-example-ftp/README.md[FTP] (camel-example-ftp) | Beginner | An 
example for showing Camel FTP integration
 
-| link:camel-example-java8/readme.md[Java8] (camel-example-java8) | Beginner | 
An example for showing Camel DSL for Java 8
+| link:camel-example-java8/readme.adoc[Java8] (camel-example-java8) | Beginner 
| An example for showing Camel DSL for Java 8
 
 | link:camel-example-pojo-messaging/README.md[POJO Routing] 
(camel-example-pojo-messaging) | Beginner | An example showing how to produce 
and consume messages from Camel endpoints using annotated POJOs
   
@@ -95,7 +95,7 @@ Number of Examples: 84
 
 | link:camel-example-transformer-demo/README.md[Transformer and Validator 
Spring XML] (camel-example-transformer-demo) | Input/Output Type Contract | An 
example demonstrating declarative transformation and validation along data type 
declaration using Spring DSL
 
-| link:camel-example-validator-spring-boot/README.md[Validator Spring Boot] 
(camel-example-validator-spring-boot) | Input/Output Type Contract | An example 
demonstrating declarative validation along data type declaration using Spring 
Boot
+| link:camel-example-validator-spring-boot/readme.adoc[Validator Spring Boot] 
(camel-example-validator-spring-boot) | Input/Output Type Contract | An example 
showing how to work with declarative validation and Spring Boot
 
 | link:camel-example-bam/README.md[BAM (deprecated)] (camel-example-bam) | 
Management and Monitoring | *deprecated* An example showing how to use Camel as 
a Business Activity Monitoring tool
 
@@ -154,9 +154,9 @@ Number of Examples: 84
 
 | link:camel-example-scala/ReadMe.md[Scala] (camel-example-scala) | Other 
Languages | A Camel route using Scala
 
-| link:camel-example-java8-rx/readme.md[Java8 RX] (camel-example-java8-rx) | 
Reactive | An example for showing Camel RX for Java 8
+| link:camel-example-java8-rx/readme.adoc[Java8 RX] (camel-example-java8-rx) | 
Reactive | An example for showing Camel RX for Java 8
 
-| link:camel-example-reactive-streams/readme.md[Reactive Streams] 
(camel-example-reactive-streams) | Reactive | An example that shows how Camel 
can exchange data using reactive streams with Spring Boot reactor
+| link:camel-example-reactive-streams/readme.adoc[Reactive Streams] 
(camel-example-reactive-streams) | Reactive | An example that shows how Camel 
can exchange data using reactive streams with Spring Boot reactor
 
 | link:camel-example-cdi-rest-servlet/README.md[CDI Rest] 
(camel-example-cdi-rest-servlet) | Rest | REST DSL / Servlet with CDI example
 
@@ -164,6 +164,8 @@ Number of Examples: 84
 
 | link:camel-example-spark-rest/README.md[Spark REST] 
(camel-example-spark-rest) | Rest | An example using Spark REST
 
+| link:camel-example-spring-boot-rest-swagger/README.adoc[Spring Boot Rest 
Swagger] (camel-example-spring-boot-rest-swagger) | Rest | An example showing 
Camel REST DSL and Swagger with Spring Boot
+
 | link:camel-example-swagger-cdi/README.md[Swagger CDI] 
(camel-example-swagger-cdi) | Rest | An example using REST DSL and Swagger Java 
with CDI
 
 | link:camel-example-swagger-xml/README.md[Swagger XML] 
(camel-example-swagger-xml) | Rest | An example using REST DSL in XML and 
Swagger with Swagger UI (web console)

[2/8] camel git commit: Removed @author tags from source code.

2017-03-06 Thread davsclaus 
Removed @author tags from source code.

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

Branch: refs/heads/master
Commit: f6250e3b85af3b99c4b3d416f2805afa523e12c3
Parents: 45335d1
Author: William Collins 
Authored: Fri Mar 3 16:01:53 2017 -0500
Committer: Claus Ibsen 
Committed: Mon Mar 6 08:48:05 2017 +0100

--
 .../apache/camel/component/box2/api/Box2CollaborationsManager.java | 2 +-
 .../org/apache/camel/component/box2/api/Box2CommentsManager.java   | 2 +-
 .../org/apache/camel/component/box2/api/Box2EventLogsManager.java  | 2 +-
 .../org/apache/camel/component/box2/api/Box2EventsManager.java | 2 +-
 .../java/org/apache/camel/component/box2/api/Box2FilesManager.java | 2 +-
 .../org/apache/camel/component/box2/api/Box2FoldersManager.java| 2 +-
 .../org/apache/camel/component/box2/api/Box2GroupsManager.java | 2 +-
 .../org/apache/camel/component/box2/api/Box2SearchManager.java | 2 +-
 .../java/org/apache/camel/component/box2/api/Box2TasksManager.java | 2 +-
 .../java/org/apache/camel/component/box2/api/Box2UsersManager.java | 2 +-
 .../main/java/org/apache/camel/component/box2/Box2Component.java   | 2 +-
 .../java/org/apache/camel/component/box2/Box2Configuration.java| 2 +-
 .../main/java/org/apache/camel/component/box2/Box2Consumer.java| 2 +-
 .../main/java/org/apache/camel/component/box2/Box2Endpoint.java| 2 +-
 .../main/java/org/apache/camel/component/box2/Box2Producer.java| 2 +-
 .../apache/camel/component/box2/internal/Box2ConnectionHelper.java | 2 +-
 .../org/apache/camel/component/box2/internal/Box2Constants.java| 2 +-
 .../apache/camel/component/box2/internal/Box2PropertiesHelper.java | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f6250e3b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CollaborationsManager.java
--
diff --git 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CollaborationsManager.java
 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CollaborationsManager.java
index 5cbd7fb..6905036 100644
--- 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CollaborationsManager.java
+++ 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CollaborationsManager.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  * 
  * Provides operations to manage Box collaborations.
  * 
- * @author mailto:punkhor...@gmail.com;>William Collins
+ * 
  *
  */
 public class Box2CollaborationsManager {

http://git-wip-us.apache.org/repos/asf/camel/blob/f6250e3b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CommentsManager.java
--
diff --git 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CommentsManager.java
 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CommentsManager.java
index 946f292..b20c7bc 100644
--- 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CommentsManager.java
+++ 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2CommentsManager.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * 
  * Provides operations to manage Box comments.
  * 
- * @author mailto:punkhor...@gmail.com;>William Collins
+ * 
  *
  */
 public class Box2CommentsManager {

http://git-wip-us.apache.org/repos/asf/camel/blob/f6250e3b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2EventLogsManager.java
--
diff --git 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2EventLogsManager.java
 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2EventLogsManager.java
index a54c305..b7be4f7 100644
--- 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2EventLogsManager.java
+++ 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2EventLogsManager.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * 
  * Provides operations to read Box enterprise (admin) event logs.
  * 
- * @author

[5/8] camel git commit: CAMEL-9047: Replace deprecated boxjavalibv2 with box-java-sdk

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/45335d1e/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
 
b/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
new file mode 100644
index 000..1b5fa50
--- /dev/null
+++ 
b/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Component.java
@@ -0,0 +1,115 @@
+/**
+ * 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.box2;
+
+import com.box.sdk.BoxAPIConnection;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.box2.internal.Box2ApiCollection;
+import org.apache.camel.component.box2.internal.Box2ApiName;
+import org.apache.camel.component.box2.internal.Box2ConnectionHelper;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.component.AbstractApiComponent;
+
+/**
+ * Represents the component that manages {@link Box2Endpoint}.
+ * 
+ * @author mailto:punkhor...@gmail.com;>William Collins
+ * 
+ */
+// @UriEndpoint(scheme = "box2", consumerClass = Box2Consumer.class,
+// consumerPrefix = "consumer", syntax = "", title = "Box2 Component")
+public class Box2Component extends AbstractApiComponent {
+
+@Metadata(label = "advanced")
+BoxAPIConnection boxConnection;
+
+public Box2Component() {
+super(Box2Endpoint.class, Box2ApiName.class, 
Box2ApiCollection.getCollection());
+}
+
+public Box2Component(CamelContext context) {
+super(context, Box2Endpoint.class, Box2ApiName.class, 
Box2ApiCollection.getCollection());
+}
+
+@Override
+protected Box2ApiName getApiName(String apiNameStr) throws 
IllegalArgumentException {
+return Box2ApiName.fromValue(apiNameStr);
+}
+
+/**
+ * To use the shared configuration
+ */
+@Override
+public void setConfiguration(Box2Configuration configuration) {
+super.setConfiguration(configuration);
+}
+
+/**
+ * To use the shared configuration
+ */
+@Override
+public Box2Configuration getConfiguration() {
+return super.getConfiguration();
+}
+
+/**
+ * To use a shared connection
+ * 
+ * @return the shared connection
+ */
+public BoxAPIConnection getBoxConnection() {
+return boxConnection;
+}
+
+@Override
+protected Endpoint createEndpoint(String uri, String methodName, 
Box2ApiName apiName,
+Box2Configuration endpointConfiguration) {
+endpointConfiguration.setApiName(apiName);
+endpointConfiguration.setMethodName(methodName);
+return new Box2Endpoint(uri, this, apiName, methodName, 
endpointConfiguration);
+}
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+
+if (boxConnection == null) {
+if (configuration != null) {
+boxConnection = 
Box2ConnectionHelper.createConnection(configuration);
+} else {
+throw new IllegalArgumentException("Unable to connect, Box2 
component configuration is missing");
+}
+}
+}
+
+@Override
+protected void doStop() throws Exception {
+if (boxConnection != null) {
+boxConnection = null;
+}
+}
+
+@Override
+public void doShutdown() throws Exception {
+if (boxConnection != null) {
+boxConnection = null;
+}
+super.doShutdown();
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/45335d1e/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Configuration.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/main/java/org/apache/camel/component/box2/Box2Configuration.java

[1/8] camel git commit: ASF license header added to pom files

2017-03-06 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master b259c00cf -> d16d265cf


ASF license header added to pom files

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

Branch: refs/heads/master
Commit: bc7a741603ee62001c472ce79b00c9d36055a9a9
Parents: f6250e3
Author: William Collins 
Authored: Sat Mar 4 22:10:41 2017 -0500
Committer: Claus Ibsen 
Committed: Mon Mar 6 08:48:05 2017 +0100

--
 components/camel-box2/camel-box2-api/pom.xml   | 16 
 components/camel-box2/camel-box2-component/pom.xml | 16 
 components/camel-box2/pom.xml  | 16 
 3 files changed, 48 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bc7a7416/components/camel-box2/camel-box2-api/pom.xml
--
diff --git a/components/camel-box2/camel-box2-api/pom.xml 
b/components/camel-box2/camel-box2-api/pom.xml
index a347278..8b23615 100644
--- a/components/camel-box2/camel-box2-api/pom.xml
+++ b/components/camel-box2/camel-box2-api/pom.xml
@@ -1,4 +1,20 @@
 
+
 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

http://git-wip-us.apache.org/repos/asf/camel/blob/bc7a7416/components/camel-box2/camel-box2-component/pom.xml
--
diff --git a/components/camel-box2/camel-box2-component/pom.xml 
b/components/camel-box2/camel-box2-component/pom.xml
index d5aebfb..dc7b012 100644
--- a/components/camel-box2/camel-box2-component/pom.xml
+++ b/components/camel-box2/camel-box2-component/pom.xml
@@ -1,4 +1,20 @@
 
+
 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;>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bc7a7416/components/camel-box2/pom.xml
--
diff --git a/components/camel-box2/pom.xml b/components/camel-box2/pom.xml
index b25a287..1b6efac 100644
--- a/components/camel-box2/pom.xml
+++ b/components/camel-box2/pom.xml
@@ -1,4 +1,20 @@
 
+
 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

[7/8] camel git commit: CAMEL-9047: Replace deprecated boxjavalibv2 with box-java-sdk

2017-03-06 Thread davsclaus 
CAMEL-9047: Replace deprecated boxjavalibv2 with box-java-sdk

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

Branch: refs/heads/master
Commit: 45335d1ea29ecbf65e8bb983b623eccc86c58411
Parents: b259c00
Author: William Collins 
Authored: Fri Mar 3 12:30:29 2017 -0500
Committer: Claus Ibsen 
Committed: Mon Mar 6 08:48:05 2017 +0100

--
 components/camel-box2/camel-box2-api/pom.xml|  79 ++
 .../box2/api/Box2CollaborationsManager.java | 238 ++
 .../component/box2/api/Box2CommentsManager.java | 205 +
 .../box2/api/Box2EventLogsManager.java  | 110 +++
 .../component/box2/api/Box2EventsManager.java   |  99 +++
 .../component/box2/api/Box2FilesManager.java| 798 +++
 .../component/box2/api/Box2FoldersManager.java  | 407 ++
 .../component/box2/api/Box2GroupsManager.java   | 274 +++
 .../component/box2/api/Box2SearchManager.java   |  93 +++
 .../component/box2/api/Box2TasksManager.java| 324 
 .../component/box2/api/Box2UsersManager.java| 333 
 .../camel-box2/camel-box2-component/pom.xml | 612 ++
 .../src/main/docs/box2-component.adoc   | 744 +
 .../camel/component/box2/Box2Component.java | 115 +++
 .../camel/component/box2/Box2Configuration.java | 475 +++
 .../camel/component/box2/Box2Consumer.java  | 111 +++
 .../camel/component/box2/Box2Endpoint.java  | 214 +
 .../camel/component/box2/Box2Producer.java  |  35 +
 .../box2/internal/Box2ConnectionHelper.java | 286 +++
 .../component/box2/internal/Box2Constants.java  |  32 +
 .../box2/internal/Box2PropertiesHelper.java |  42 +
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/component/box2|  18 +
 .../component/box2/AbstractBox2TestSupport.java |  82 ++
 ...ox2CollaborationsManagerIntegrationTest.java | 231 ++
 .../Box2CommentsManagerIntegrationTest.java | 201 +
 .../Box2EventLogsManagerIntegrationTest.java|  76 ++
 .../box2/Box2EventsManagerIntegrationTest.java  | 105 +++
 .../box2/Box2FilesManagerIntegrationTest.java   | 575 +
 .../box2/Box2FoldersManagerIntegrationTest.java | 322 
 .../box2/Box2GroupsManagerIntegrationTest.java  | 268 +++
 .../box2/Box2SearchManagerIntegrationTest.java  | 106 +++
 .../box2/Box2TasksManagerIntegrationTest.java   | 284 +++
 .../box2/Box2UsersManagerIntegrationTest.java   | 323 
 .../src/test/resources/CamelTestFile.txt|   1 +
 .../src/test/resources/log4j.properties |  14 +
 .../src/test/resources/test-options.properties  |  33 +
 .../tmp/test-options.properties |  67 ++
 components/camel-box2/pom.xml   |  32 +
 components/readme.adoc  |   3 +
 docs/user-manual/en/SUMMARY.md  |   1 +
 parent/pom.xml  |   1 +
 .../spring-boot/components-starter/pom.xml  |   1 +
 .../camel-spring-boot-dependencies/pom.xml  |   5 +
 45 files changed, 8589 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/45335d1e/components/camel-box2/camel-box2-api/pom.xml
--
diff --git a/components/camel-box2/camel-box2-api/pom.xml 
b/components/camel-box2/camel-box2-api/pom.xml
new file mode 100644
index 000..a347278
--- /dev/null
+++ b/components/camel-box2/camel-box2-api/pom.xml
@@ -0,0 +1,79 @@
+
+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
+camel-box2-parent
+2.19.0-SNAPSHOT
+  
+
+  camel-box2-api
+  Camel Box2 Component API
+  API for Camel Box2 Component
+
+  
+UTF-8
+UTF-8
+  
+
+  
+install
+
+
+  
+  
+  
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+  
+add-javadoc
+
+  jar
+
+
+  true
+  1.7
+  true
+  false
+  1.7
+  UTF-8
+
+  
+
+  
+
+
+  
+
+  
+  
+
+  doclint-java8-disable
+  
+[1.8,
+  
+  
+
+  
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+  -Xdoclint:none
+
+  
+
+  
+
+  
+
+  
+

[3/8] camel git commit: CAMEL-9047: Replace deprecated boxjavalibv2 with box-java-sdk

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/45335d1e/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2UsersManagerIntegrationTest.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2UsersManagerIntegrationTest.java
 
b/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2UsersManagerIntegrationTest.java
new file mode 100644
index 000..6b4b952
--- /dev/null
+++ 
b/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2UsersManagerIntegrationTest.java
@@ -0,0 +1,323 @@
+/**
+ * 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.box2;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.box.sdk.BoxAPIConnection;
+import com.box.sdk.BoxAPIException;
+import com.box.sdk.BoxUser;
+import com.box.sdk.CreateUserParams;
+import com.box.sdk.EmailAlias;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.box2.internal.Box2ApiCollection;
+import org.apache.camel.component.box2.internal.Box2UsersManagerApiMethod;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test class for {@link org.apache.camel.component.box2.api.Box2UsersManager}
+ * APIs.
+ */
+public class Box2UsersManagerIntegrationTest extends AbstractBox2TestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(Box2UsersManagerIntegrationTest.class);
+private static final String PATH_PREFIX = Box2ApiCollection.getCollection()
+.getApiName(Box2UsersManagerApiMethod.class).getName();
+private static final String CAMEL_TEST_USER_EMAIL_ALIAS = 
"ca...@example.com";
+private static final String CAMEL_TEST_USER_JOB_TITLE = "Camel Tester";
+private static final String CAMEL_TEST_CREATE_APP_USER_NAME = "Wilma";
+private static final String CAMEL_TEST_CREATE_ENTERPRISE_USER_NAME = 
"fred";
+private static final String CAMEL_TEST_CREATE_ENTERPRISE_USER_LOGIN = 
"f...@example.com";
+
+private BoxUser testUser;
+
+@Ignore
+@Test
+public void testAddUserEmailAlias() throws Exception {
+com.box.sdk.EmailAlias result = null;
+try {
+final Map headers = new HashMap();
+// parameter type is String
+headers.put("CamelBox2.userId", testUser.getID());
+// parameter type is String
+headers.put("CamelBox2.email", CAMEL_TEST_USER_EMAIL_ALIAS);
+result = requestBodyAndHeaders("direct://ADDUSEREMAILALIAS", null, 
headers);
+assertNotNull("addUserEmailAlias result", result);
+LOG.debug("addUserEmailAlias: " + result);
+} finally {
+if (result != null) {
+try {
+testUser.deleteEmailAlias(result.getID());
+} catch (Throwable t) {
+}
+}
+}
+}
+
+@Test
+public void testCreateAppUser() throws Exception {
+com.box.sdk.BoxUser result = null;
+
+try {
+CreateUserParams params = new CreateUserParams();
+params.setSpaceAmount(1073741824); // 1 GB
+
+final Map headers = new HashMap();
+// parameter type is String
+headers.put("CamelBox2.name", CAMEL_TEST_CREATE_APP_USER_NAME);
+// parameter type is com.box.sdk.CreateUserParams
+headers.put("CamelBox2.params", params);
+
+result = requestBodyAndHeaders("direct://CREATEAPPUSER", null, 
headers);
+
+assertNotNull("createAppUser result", result);
+LOG.debug("createAppUser: " + result);
+} finally {
+if (result != null) {
+try {
+result.delete(false, true);
+} catch (Throwable t) {
+}
+}
+}
+}
+
+@Test
+

[6/8] camel git commit: CAMEL-9047: Replace deprecated boxjavalibv2 with box-java-sdk

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/45335d1e/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
--
diff --git 
a/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
new file mode 100644
index 000..50698e2
--- /dev/null
+++ 
b/components/camel-box2/camel-box2-api/src/main/java/org/apache/camel/component/box2/api/Box2GroupsManager.java
@@ -0,0 +1,274 @@
+/**
+ * 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.box2.api;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import com.box.sdk.BoxAPIConnection;
+import com.box.sdk.BoxAPIException;
+import com.box.sdk.BoxGroup;
+import com.box.sdk.BoxGroupMembership;
+import com.box.sdk.BoxUser;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Box2 Groups Manager
+ * 
+ * 
+ * Provides operations to manage Box groups.
+ * 
+ * @author mailto:punkhor...@gmail.com;>William Collins
+ *
+ */
+public class Box2GroupsManager {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(Box2GroupsManager.class);
+
+/**
+ * Box connection to authenticated user account.
+ */
+private BoxAPIConnection boxConnection;
+
+/**
+ * Create groups manager to manage the users of Box connection's
+ * authenticated user.
+ * 
+ * @param boxConnection
+ *- Box connection to authenticated user account.
+ */
+public Box2GroupsManager(BoxAPIConnection boxConnection) {
+this.boxConnection = boxConnection;
+}
+
+/**
+ * Get all the groups in the enterprise.
+ * 
+ * @return Collection containing all the enterprise's groups.
+ */
+public Collection getAllGroups() {
+try {
+LOG.debug("Getting all groups");
+
+Collection groups = new ArrayList();
+for (BoxGroup.Info groupInfo : 
BoxGroup.getAllGroups(boxConnection)) {
+groups.add(groupInfo.getResource());
+}
+return groups;
+} catch (BoxAPIException e) {
+throw new RuntimeException(
+String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
+}
+}
+
+/**
+ * Create a new group with a specified name.
+ * 
+ * @param name
+ *- the name of the new group.
+ * @return The newly created group.
+ */
+public BoxGroup createGroup(String name) {
+try {
+LOG.debug("Creating group name=" + name);
+if (name == null) {
+throw new IllegalArgumentException("Parameter 'name' can not 
be null");
+}
+
+return BoxGroup.createGroup(boxConnection, name).getResource();
+} catch (BoxAPIException e) {
+throw new RuntimeException(
+String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
+}
+}
+
+/**
+ * Delete group.
+ * 
+ * @param groupId
+ *- the id of group to delete.
+ */
+public void deleteGroup(String groupId) {
+try {
+LOG.debug("Deleting group(" + groupId + ")");
+if (groupId == null) {
+throw new IllegalArgumentException("Parameter 'groupId' can 
not be null");
+}
+
+BoxGroup group = new BoxGroup(boxConnection, groupId);
+group.delete();
+} catch (BoxAPIException e) {
+throw new RuntimeException(
+String.format("Box API returned the error code %d\n\n%s", 
e.getResponseCode(), e.getResponse()), e);
+}
+}
+
+/**
+ * Get group information.
+ * 
+ * @param groupId
+ *- the id of group.
+ * @return The group information.
+ */
+public BoxGroup.Info getGroupInfo(String groupId) {
+try {
+LOG.debug("Getting info for

[8/8] camel git commit: CAMEL-9047: camel-box2

2017-03-06 Thread davsclaus 
CAMEL-9047: camel-box2


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

Branch: refs/heads/master
Commit: d16d265cfc5112be33937c95e5753aa30f6482bb
Parents: bc7a741
Author: Claus Ibsen 
Authored: Mon Mar 6 09:35:48 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 09:35:48 2017 +0100

--
 components/readme.adoc  |   7 +-
 docs/user-manual/en/SUMMARY.md  |   2 +-
 .../camel-box2-starter/pom.xml  |  59 
 .../Box2ComponentAutoConfiguration.java | 110 +++
 .../springboot/Box2ComponentConfiguration.java  | 300 +++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 ...dditional-spring-configuration-metadata.json |  10 +
 .../main/resources/META-INF/spring.factories|  19 ++
 .../src/main/resources/META-INF/spring.provides |  18 ++
 .../camel-spring-boot-dependencies/pom.xml  |   5 -
 11 files changed, 734 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d16d265c/components/readme.adoc
--
diff --git a/components/readme.adoc b/components/readme.adoc
index fde808d..8270761 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -98,9 +98,6 @@ Number of Components: 220 in 175 JAR artifacts
 | link:camel-box/src/main/docs/box-component.adoc[Box] (camel-box) +
 `box:apiName/methodName` | 2.14 | For uploading downloading and managing files 
folders groups collaborations etc on box DOT com.
 
-| link:camel-box2/src/main/docs/box2-component.adoc[Box] (camel-box2) +
-`box2:apiName/methodName` | 2.19 | For uploading downloading and managing 
files folders groups collaborations etc on box DOT com.
-
 | link:camel-braintree/src/main/docs/braintree-component.adoc[Braintree] 
(camel-braintree) +
 `braintree:apiName/methodName` | 2.17 | The braintree component is used for 
integrating with the Braintree Payment System.
 
@@ -843,7 +840,7 @@ Miscellaneous Components
 
 
 // others: START
-Number of Miscellaneous Components: 36 in 36 JAR artifacts
+Number of Miscellaneous Components: 37 in 37 JAR artifacts
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -853,6 +850,8 @@ Number of Miscellaneous Components: 36 in 36 JAR artifacts
 
 | link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] 
(camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
 
+| link:camel-box2-parent/src/main/docs/box2-parent.adoc[Box2 Parent] 
(camel-box2-parent) |  | Parent project for Camel {Box2} Component
+
 | link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel 
with CDI
 
 | link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[CXF Transport] 
(camel-cxf-transport) | 2.8 | Camel Transport for Apache CXF

http://git-wip-us.apache.org/repos/asf/camel/blob/d16d265c/docs/user-manual/en/SUMMARY.md
--
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 57a4822..b5bb5a3 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -152,7 +152,6 @@
* [Beanstalk](beanstalk-component.adoc)
* [Bonita](bonita-component.adoc)
* [Box](box-component.adoc)
-   * [Box2](box2-component.adoc)
* [Braintree](braintree-component.adoc)
* [Camel Context](context-component.adoc)
* [Cassandra CQL](cql-component.adoc)
@@ -329,6 +328,7 @@
 * Miscellaneous Components
* [BAM](bam.adoc)
* [Blueprint](blueprint.adoc)
+   * [Box2 Parent](box2-parent.adoc)
* [CDI](cdi.adoc)
* [CXF Transport](cxf-transport.adoc)
* [Eclipse](eclipse.adoc)

http://git-wip-us.apache.org/repos/asf/camel/blob/d16d265c/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml
--
diff --git 
a/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml
new file mode 100644
index 000..2d49fef
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-box2-starter/pom.xml
@@ -0,0 +1,59 @@
+
+
+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
+

[4/8] camel git commit: CAMEL-9047: Replace deprecated boxjavalibv2 with box-java-sdk

2017-03-06 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/45335d1e/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2CommentsManagerIntegrationTest.java
--
diff --git 
a/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2CommentsManagerIntegrationTest.java
 
b/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2CommentsManagerIntegrationTest.java
new file mode 100644
index 000..39cbf1e
--- /dev/null
+++ 
b/components/camel-box2/camel-box2-component/src/test/java/org/apache/camel/component/box2/Box2CommentsManagerIntegrationTest.java
@@ -0,0 +1,201 @@
+/**
+ * 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.box2;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.box.sdk.BoxAPIConnection;
+import com.box.sdk.BoxComment;
+import com.box.sdk.BoxFile;
+import com.box.sdk.BoxFolder;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.box2.internal.Box2ApiCollection;
+import org.apache.camel.component.box2.internal.Box2CommentsManagerApiMethod;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test class for
+ * {@link org.apache.camel.component.box2.api.Box2CommentsManager} APIs.
+ */
+public class Box2CommentsManagerIntegrationTest extends 
AbstractBox2TestSupport {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(Box2CommentsManagerIntegrationTest.class);
+private static final String PATH_PREFIX = Box2ApiCollection.getCollection()
+.getApiName(Box2CommentsManagerApiMethod.class).getName();
+private static final String CAMEL_TEST_FILE = "/CamelTestFile.txt";
+private static final String CAMEL_TEST_FILE_NAME = "CamelTestFile.txt";
+private static final String CAMEL_TEST_FILE_COMMENT = "CamelTestFile 
comment.";
+private static final String CAMEL_TEST_FILE_CHANGED_COMMENT = 
"CamelTestFile changed comment.";
+private static final String CAMEL_TEST_FILE_REPLY_COMMENT = "CamelTestFile 
changed comment.";
+
+private BoxFile testFile;
+
+@Test
+public void testAddFileComment() throws Exception {
+final Map headers = new HashMap();
+// parameter type is String
+headers.put("CamelBox2.fileId", testFile.getID());
+// parameter type is String
+headers.put("CamelBox2.message", CAMEL_TEST_FILE_COMMENT);
+
+final com.box.sdk.BoxFile result = 
requestBodyAndHeaders("direct://ADDFILECOMMENT", null, headers);
+
+assertNotNull("addFileComment result", result);
+assertNotNull("addFileComment comments", result.getComments());
+assertTrue("changeCommentMessage comments size", 
result.getComments().size() > 0);
+assertEquals("changeCommentMessage comment message", 
CAMEL_TEST_FILE_COMMENT,
+result.getComments().get(0).getMessage());
+LOG.debug("addFileComment: " + result);
+}
+
+@Test
+public void testChangeCommentMessage() throws Exception {
+
+BoxComment.Info commentInfo = 
testFile.addComment(CAMEL_TEST_FILE_COMMENT);
+
+final Map headers = new HashMap();
+// parameter type is String
+headers.put("CamelBox2.commentId", commentInfo.getID());
+// parameter type is String
+headers.put("CamelBox2.message", CAMEL_TEST_FILE_CHANGED_COMMENT);
+
+final com.box.sdk.BoxComment result = 
requestBodyAndHeaders("direct://CHANGECOMMENTMESSAGE", null, headers);
+
+assertNotNull("changeCommentMessage result", result);
+assertNotNull("changeCommentMessage message", 
result.getInfo().getMessage());
+assertEquals("changeCommentMessage message", 
CAMEL_TEST_FILE_CHANGED_COMMENT, result.getInfo().getMessage());
+LOG.debug("changeCommentMessage: " + result);
+}
+
+@Test
+public void testDeleteComment() throws