camel git commit: Align pom.xml like the others

2016-07-30 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 1f7f98f50 -> 136db7f25


Align pom.xml like the others


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

Branch: refs/heads/master
Commit: 136db7f25344091783d4606db1a667f36a2b839f
Parents: 1f7f98f
Author: Claus Ibsen 
Authored: Sat Jul 30 12:56:50 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Jul 30 13:00:30 2016 +0200

--
 components/camel-etcd/pom.xml | 32 ++--
 1 file changed, 14 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/136db7f2/components/camel-etcd/pom.xml
--
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 4e307b9..c5154c8 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-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://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
 
@@ -31,31 +32,27 @@
   Camel Etcd support
 
   
-2.10.0
-
-etcd
-Etcd
-org.apache.camel.component.etcd
-
-UTF-8
-UTF-8
+
org.apache.camel.component.etcd.*
+
+  org.apache.camel.spi.ComponentResolver;component=etc
+
+  
 
-${componentPackage}
+  
 
-  
+
+  org.apache.camel
+  camel-core
+  ${project.version}
+
 
-
+
 
   org.mousio
   etcd4j
   ${etcd4j-version}
 
 
-  org.apache.camel
-  camel-core
-  ${project.version}
-
-
   org.apache.commons
   commons-lang3
   ${commons-lang3-version}
@@ -101,7 +98,6 @@
 
   
 
-
   
 
   etcd-skip-tests

camel git commit: Upgrade Univocity-parsers to version 2.2.0

2016-07-30 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 61fd78a6a -> 1f7f98f50


Upgrade Univocity-parsers to version 2.2.0


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

Branch: refs/heads/master
Commit: 1f7f98f505f83d0a73b60e29c346acf65b2c670b
Parents: 61fd78a
Author: Andrea Cosentino 
Authored: Sat Jul 30 10:55:06 2016 +0200
Committer: Andrea Cosentino 
Committed: Sat Jul 30 10:55:06 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/1f7f98f5/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d161529..62d3b99 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -583,7 +583,7 @@
 4.0.4_1
 4.0.4
 1.3.23.Final
-2.1.2
+2.2.0
 
2015-01-27T15-02-14
 
1.0.0
 4.0.4

camel git commit: Added automatic docs generation to camel-disruptor

2016-07-30 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 631d792a6 -> 61fd78a6a


Added automatic docs generation to camel-disruptor


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

Branch: refs/heads/master
Commit: 61fd78a6a7bf13c5a4610b3ffc4420c86e4bd095
Parents: 631d792
Author: Andrea Cosentino 
Authored: Sat Jul 30 10:39:23 2016 +0200
Committer: Andrea Cosentino 
Committed: Sat Jul 30 10:39:23 2016 +0200

--
 .../src/main/docs/disruptor.adoc| 117 +++
 1 file changed, 45 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/61fd78a6/components/camel-disruptor/src/main/docs/disruptor.adoc
--
diff --git a/components/camel-disruptor/src/main/docs/disruptor.adoc 
b/components/camel-disruptor/src/main/docs/disruptor.adoc
index fcda340..c6d0da4 100644
--- a/components/camel-disruptor/src/main/docs/disruptor.adoc
+++ b/components/camel-disruptor/src/main/docs/disruptor.adoc
@@ -97,80 +97,53 @@ Options
 All the following options are valid for both the **disruptor:** and
 **disruptor-vm:** components.
 
-[width="100%",cols="10%,10%,80%",options="header",]
+
+// component options: START
+The Disruptor component supports 7 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,8",options="header"]
 |===
-|Name | Default | Description
-
-|size |1024 |The maximum capacity of the Disruptors ringbuffer. Will be 
effectively
-increased to the nearest power of two. *Notice:* Mind if you use this
-option, then its the first endpoint being created with the queue name,
-that determines the size. To make sure all endpoints use same size, then
-configure the size option on all of them, or the first endpoint being
-created.
-
-|bufferSize |  | *Component only:* The maximum default size (capacity of the 
number of
-messages it can hold) of the Disruptors ringbuffer. This option is used
-if size is not in use.
-
-|queueSize |  | *Component only:* Additional option to specify the 
bufferSize
-to maintain maximum compatibility with the link:seda.html[SEDA]
-Component.
-
-|concurrentConsumers |1 |Number of concurrent threads processing exchanges.
-
-|waitForTaskToComplete |IfReplyExpected |Option to specify whether the caller 
should wait for the async task to
-complete or not before continuing. The following three options are
-supported: _Always_, _Never_ or _IfReplyExpected_. The first two values
-are self-explanatory. The last value, _IfReplyExpected_, will only wait
-if the message is link:request-reply.html[Request Reply] based. See more
-information about link:async.html[Async] messaging.
-
-|timeout |3 |Timeout (in milliseconds) before a producer will stop waiting 
for an
-asynchronous task to complete. See _waitForTaskToComplete_ and
-link:async.html[Async] for more details. You can disable timeout by
-using 0 or a negative value.
-
-|defaultMultipleConsumers |  | *Component only:* Allows to set the default 
allowance of multiple
-consumers for endpoints created by this component used when
-_multipleConsumers_ is not provided.
-
-|multipleConsumers |false |Specifies whether multiple consumers are allowed. 
If enabled, you can
-use Disruptor for 
http://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern[Publish-Subscribe]Â
 messaging.
-That is, you can send a message to the SEDA queue and have each consumer
-receive a copy of the message. When enabled, this option should be
-specified on every consumer endpoint.
-
-|limitConcurrentConsumers |true |Whether to limit the number of 
concurrentConsumers to the maximum of
-500. By default, an exception will be thrown if a Disruptor endpoint is
-configured with a greater number. You can disable that check by turning
-this option off.
-
-|blockWhenFull |true |Whether a thread that sends messages to a full Disruptor 
will block
-until the ringbuffer's capacity is no longer exhausted. By default, the
-calling thread will block and wait until the message can be accepted. By
-disabling this option, an exception will be thrown stating that the
-queue is full.
-
-|defaultBlockWhenFull | | *Component only:* Allows to set the default producer 
behaviour when the
-ringbuffer is full for endpoints created by this comonent used when
-_blockWhenFull_ is not provided.
-
-|waitStrategy |Blocking |Defines the strategy used by consumer threads to wait 
on new exchanges
-to be published. The options allowed are:_Blocking_, _Sleeping_,
-_BusySpin_ and _Yielding_. Refer to the section below

camel git commit: Upgrade Rabbitmq Amqp client to version 3.6.4

2016-07-30 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 1233ea02a -> 631d792a6


Upgrade Rabbitmq Amqp client to version 3.6.4


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

Branch: refs/heads/master
Commit: 631d792a665dc91688132ea4cbbaf4d2e2c14e2a
Parents: 1233ea0
Author: Andrea Cosentino 
Authored: Sat Jul 30 10:35:30 2016 +0200
Committer: Andrea Cosentino 
Committed: Sat Jul 30 10:35:30 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/631d792a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fcacd02..d161529 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -480,7 +480,7 @@
 [1.8,2)
 2.2.3
 1.6.2
-3.6.3
+3.6.4
 0.9.10_3
 1.4_1
 3.0.0

camel git commit: Removed unusued code

2016-07-30 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 560844c2c -> 1233ea02a


Removed unusued code


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

Branch: refs/heads/master
Commit: 1233ea02ae4414a07b76d16b709beefbb0b1e448
Parents: 560844c
Author: Claus Ibsen 
Authored: Sat Jul 30 09:18:51 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Jul 30 09:18:51 2016 +0200

--
 .../camel/spring/CamelBeanPostProcessor.java | 19 ---
 1 file changed, 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1233ea02/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
--
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
index 50b5ceb..9810154 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.spring;
 
-import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -26,11 +25,9 @@ import javax.xml.bind.annotation.XmlTransient;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
-import org.apache.camel.Service;
 import org.apache.camel.core.xml.CamelJMXAgentDefinition;
 import org.apache.camel.impl.CamelPostProcessorHelper;
 import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
-import org.apache.camel.util.ServiceHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanInstantiationException;
@@ -49,8 +46,6 @@ import org.springframework.context.ApplicationContextAware;
 public class CamelBeanPostProcessor implements BeanPostProcessor, 
ApplicationContextAware {
 private static final Logger LOG = 
LoggerFactory.getLogger(CamelBeanPostProcessor.class);
 @XmlTransient
-Set prototypeBeans = new LinkedHashSet();
-@XmlTransient
 private CamelContext camelContext;
 @XmlTransient
 private ApplicationContext applicationContext;
@@ -120,20 +115,6 @@ public class CamelBeanPostProcessor implements 
BeanPostProcessor, ApplicationCon
 return applicationContext.isSingleton(beanName);
 }
 }
-
-protected void startService(Service service, Object bean, 
String beanName) throws Exception {
-if (isSingleton(bean, beanName)) {
-getCamelContext().addService(service);
-} else {
-// only start service and do not add it to 
CamelContext
-ServiceHelper.startService(service);
-if (prototypeBeans.add(beanName)) {
-// do not spam the log with WARN so do this 
only once per bean name
-CamelBeanPostProcessor.LOG.warn("The bean with 
id [" + beanName + "] is prototype scoped and cannot stop the injected service 
when bean is destroyed: "
-+ service + ". You may want to stop 
the service manually from the bean.");
-}
-}
-}
 };
 }
 return camelPostProcessorHelper;

[1/3] camel git commit: CAMEL-10057: add optional JobRegistry

2016-07-30 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 977604bd7 -> 560844c2c


CAMEL-10057: add optional JobRegistry


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

Branch: refs/heads/master
Commit: 697ff58ced3f38f75119e0fa60314087df5818c9
Parents: 977604b
Author: asegarra 
Authored: Fri Jul 29 14:27:26 2016 -0400
Committer: asegarra 
Committed: Fri Jul 29 15:02:37 2016 -0400

--
 components/camel-spring-batch/pom.xml   |   5 +
 .../src/main/docs/spring-batch.adoc |   9 +-
 .../spring/batch/SpringBatchComponent.java  |  16 +-
 .../spring/batch/SpringBatchEndpoint.java   |  33 +++-
 .../spring/batch/SpringBatchProducer.java   |  12 +-
 .../SpringBatchComponentAutoConfiguration.java  |  70 
 .../SpringBatchComponentConfiguration.java  |  52 +++---
 .../spring/batch/SpringBatchEndpointTest.java   |  96 ++-
 .../batch/SpringBatchJobRegistryTest.java   | 170 +++
 9 files changed, 390 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/697ff58c/components/camel-spring-batch/pom.xml
--
diff --git a/components/camel-spring-batch/pom.xml 
b/components/camel-spring-batch/pom.xml
index 7daa107..dbfe869 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -78,6 +78,11 @@
 camel-spring
 test
 
+
+org.apache.camel
+camel-spring-javaconfig
+test
+ 
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/697ff58c/components/camel-spring-batch/src/main/docs/spring-batch.adoc
--
diff --git a/components/camel-spring-batch/src/main/docs/spring-batch.adoc 
b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
index bf82d27..fd5f999 100644
--- a/components/camel-spring-batch/src/main/docs/spring-batch.adoc
+++ b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
@@ -29,7 +29,8 @@ spring-batch:jobName[?options]
 --
 
 Where *jobName* represents the name of the Spring Batch job located in
-the Camel registry.
+the Camel registry. Alternatively if a JobRegistry is provided it will be used 
+to locate the job instead.
 
 WARNING:This component can only be used to define producer endpoints, which
 means that you cannot use the Spring Batch component in a `from()`
@@ -50,6 +51,7 @@ The Spring Batch component supports 1 options which are 
listed below.
 |===
 | Name | Java Type | Description
 | jobLauncher | JobLauncher | Explicitly specifies a JobLauncher to be used.
+| jobRegistry | JobRegistry | Explicitly specifies a JobRegistry to be used.
 |===
 {% endraw %}
 // component options: END
@@ -57,6 +59,7 @@ The Spring Batch component supports 1 options which are 
listed below.
 
 
 
+
 // endpoint options: START
 The Spring Batch component supports 5 endpoint options which are listed below:
 
@@ -65,8 +68,9 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 |===
 | Name | Group | Default | Java Type | Description
 | jobName | producer |  | String | *Required* The name of the Spring Batch job 
located in the registry.
-| jobFromHeader | producer | false | boolean | Explicitly defines if the 
jobName shouls be taken from the headers instead of the URI.
+| jobFromHeader | producer |  | Boolean | Explicitly defines if the jobName 
shouls be taken from the headers instead of the URI.
 | jobLauncher | producer |  | JobLauncher | Explicitly specifies a JobLauncher 
to be used.
+| jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used. If set it it will be used to locate jobs.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 |===
@@ -75,6 +79,7 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 
 
 
+
 [[SpringBatch-Usage]]
 Usage
 ^

[3/3] camel git commit: Fixed CS. This closes #1094. This closes #1088

2016-07-30 Thread davsclaus 
Fixed CS. This closes #1094. This closes #1088


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

Branch: refs/heads/master
Commit: 560844c2c5ac0f330838e4c5490d4c6139e20dc0
Parents: 8b796b5
Author: Claus Ibsen 
Authored: Sat Jul 30 08:58:51 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Jul 30 08:58:51 2016 +0200

--
 .../src/main/docs/spring-batch.adoc | 10 ++-
 .../spring/batch/SpringBatchEndpoint.java   |  4 +-
 .../spring/batch/SpringBatchProducer.java   |  2 +-
 .../SpringBatchComponentAutoConfiguration.java  | 70 -
 .../SpringBatchComponentConfiguration.java  | 65 +---
 .../spring/batch/SpringBatchEndpointTest.java   | 10 ++-
 .../batch/SpringBatchJobRegistryTest.java   | 79 ++--
 7 files changed, 127 insertions(+), 113 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/560844c2/components/camel-spring-batch/src/main/docs/spring-batch.adoc
--
diff --git a/components/camel-spring-batch/src/main/docs/spring-batch.adoc 
b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
index d970c0e..2064f4b 100644
--- a/components/camel-spring-batch/src/main/docs/spring-batch.adoc
+++ b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
@@ -41,8 +41,9 @@ Options
 ^^^
 
 
+
 // component options: START
-The Spring Batch component supports 1 options which are listed below.
+The Spring Batch component supports 2 options which are listed below.
 
 
 
@@ -60,8 +61,10 @@ The Spring Batch component supports 1 options which are 
listed below.
 
 
 
+
+
 // endpoint options: START
-The Spring Batch component supports 5 endpoint options which are listed below:
+The Spring Batch component supports 6 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -70,7 +73,7 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 | jobName | producer |  | String | *Required* The name of the Spring Batch job 
located in the registry.
 | jobFromHeader | producer | false | boolean | Explicitly defines if the 
jobName should be taken from the headers instead of the URI.
 | jobLauncher | producer |  | JobLauncher | Explicitly specifies a JobLauncher 
to be used.
-| jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used. If set it it will be used to locate jobs.
+| jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 |===
@@ -80,6 +83,7 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 
 
 
+
 [[SpringBatch-Usage]]
 Usage
 ^

http://git-wip-us.apache.org/repos/asf/camel/blob/560844c2/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
--
diff --git 
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
 
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 4f4fcd1..1d14d8f 100644
--- 
a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ 
b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -23,7 +23,6 @@ import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultEndpoint;
-
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -73,7 +72,6 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
 this.allResolvedJobLaunchers = allResolvedJobLaunchers;
 this.jobName = jobName;
 this.jobRegistry = jobRegistry;
-
 }
 
 @Override
@@ -97,7 +95,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
 jobLauncher = resolveJobLauncher();
 } 
 if (job == null && jobName != null && !jobFromHeader) {
-if(jobRegistry != null) {
+if

[2/3] camel git commit: fix spring-batch doc

2016-07-30 Thread davsclaus 
fix spring-batch doc


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

Branch: refs/heads/master
Commit: 8b796b51a8e1e316065875a9668ca10a7db7de04
Parents: 697ff58
Author: asegarra 
Authored: Fri Jul 29 15:15:27 2016 -0400
Committer: asegarra 
Committed: Fri Jul 29 15:15:27 2016 -0400

--
 components/camel-spring-batch/src/main/docs/spring-batch.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8b796b51/components/camel-spring-batch/src/main/docs/spring-batch.adoc
--
diff --git a/components/camel-spring-batch/src/main/docs/spring-batch.adoc 
b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
index fd5f999..d970c0e 100644
--- a/components/camel-spring-batch/src/main/docs/spring-batch.adoc
+++ b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
@@ -68,7 +68,7 @@ The Spring Batch component supports 5 endpoint options which 
are listed below:
 |===
 | Name | Group | Default | Java Type | Description
 | jobName | producer |  | String | *Required* The name of the Spring Batch job 
located in the registry.
-| jobFromHeader | producer |  | Boolean | Explicitly defines if the jobName 
shouls be taken from the headers instead of the URI.
+| jobFromHeader | producer | false | boolean | Explicitly defines if the 
jobName should be taken from the headers instead of the URI.
 | jobLauncher | producer |  | JobLauncher | Explicitly specifies a JobLauncher 
to be used.
 | jobRegistry | producer |  | JobRegistry | Explicitly specifies a JobRegistry 
to be used. If set it it will be used to locate jobs.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange