[1/2] camel git commit: Component docs - Fixed

2017-04-13 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master f8e590c67 -> 3bb4b5a49


Component docs - Fixed


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

Branch: refs/heads/master
Commit: 46cbdbd5d8564c800457c4fc97bde7fad377c397
Parents: f8e590c
Author: Claus Ibsen 
Authored: Thu Apr 13 10:14:32 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 13 10:14:32 2017 +0200

--
 .../src/main/docs/ribbon-component.adoc | 79 
 .../camel-ribbon/src/main/docs/ribbon.adoc  | 79 
 2 files changed, 79 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/46cbdbd5/components/camel-ribbon/src/main/docs/ribbon-component.adoc
--
diff --git a/components/camel-ribbon/src/main/docs/ribbon-component.adoc 
b/components/camel-ribbon/src/main/docs/ribbon-component.adoc
deleted file mode 100644
index c4b968d..000
--- a/components/camel-ribbon/src/main/docs/ribbon-component.adoc
+++ /dev/null
@@ -1,79 +0,0 @@
-## Ribbon Component
-
-*Available as of Camel version 2.18*
-
-The ribbon component provides use of Netflix Ribbon for client side load 
balancing.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-
-
-org.apache.camel
-camel-ribbon
-x.x.x
-
-
-
-
-This component helps applying load balancing feature at the client side when 
using http://camel.apache.org/servicecall-eip.html[ServiceCall EIP].
-
- Configuration
-
-* *Programmatic*
-+
-[source,java]
-
-RibbonConfiguration configuration = new RibbonConfiguration();
-configuration.setClientConfig(Collections.singletonMap("ServerListRefreshInterval",
 "250"));
-
-RibbonLoadBalancer loadBalancer = new RibbonLoadBalancer(configuration);
-
-from("direct:start")
-.serviceCall()
-.name("myService")
-.loadBalancer(loadBalancer)
-.consulServiceDiscovery()
-.end()
-.to("mock:result");
-
-
-* *Spring Boot*
-+
-[source,properties]
-.application.properties
-
-camel.cloud.ribbon.client-config[ServerListRefreshInterval] = 250
-
-+
-[source,java]
-.routes
-
-from("direct:start")
-.serviceCall()
-.name("myService")
-.ribbonLoadBalancer()
-.consulServiceDiscovery()
-.end()
-.to("mock:result");
-
-
-* *XML*
-+
-[source,xml]
-
-
-
-
-
-
-
-
-
-
-
-
- See Also
-
-* link:http://camel.apache.org/servicecall-eip.html[ServiceCall EIP]

http://git-wip-us.apache.org/repos/asf/camel/blob/46cbdbd5/components/camel-ribbon/src/main/docs/ribbon.adoc
--
diff --git a/components/camel-ribbon/src/main/docs/ribbon.adoc 
b/components/camel-ribbon/src/main/docs/ribbon.adoc
new file mode 100644
index 000..ceb2e0e
--- /dev/null
+++ b/components/camel-ribbon/src/main/docs/ribbon.adoc
@@ -0,0 +1,79 @@
+## Ribbon Component
+
+*Available as of Camel version 2.18*
+
+The ribbon component provides use of Netflix Ribbon for client side load 
balancing.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-ribbon
+x.x.x
+
+
+
+
+This component helps applying load balancing feature at the client side when 
using http://camel.apache.org/servicecall-eip.html[ServiceCall EIP].
+
+### Configuration
+
+* *Programmatic*
++
+[source,java]
+
+RibbonConfiguration configuration = new RibbonConfiguration();
+configuration.setClientConfig(Collections.singletonMap("ServerListRefreshInterval",
 "250"));
+
+RibbonLoadBalancer loadBalancer = new RibbonLoadBalancer(configuration);
+
+from("direct:start")
+.serviceCall()
+.name("myService")
+.loadBalancer(loadBalancer)
+.consulServiceDiscovery()
+.end()
+.to("mock:result");
+
+
+* *Spring Boot*
++
+[source,properties]
+.application.properties
+
+camel.cloud.ribbon.client-config[ServerListRefreshInterval] = 250
+
++
+[source,java]
+.routes
+
+from("direct:start")
+.serviceCall()
+.name("myService")
+.ribbonLoadBalancer()
+.consulServiceDiscovery()
+.end()
+.to("mock:result");
+
+
+* *XML*
++
+[source,xml]
+
+
+
+
+
+
+
+
+
+
+
+
+### See Also
+
+* link:http://camel.apache.org/servicecall-eip.html[ServiceCall EIP]

[1/2] camel git commit: Component docs. Fixed test

2016-01-16 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x f06c7995b -> 2451f0636
  refs/heads/master 9dc14070c -> ebd93ccf3


Component docs. Fixed test


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

Branch: refs/heads/master
Commit: ebd93ccf3a1b11525ce1ec29c1de79512216045b
Parents: 9dc1407
Author: Claus Ibsen 
Authored: Sat Jan 16 11:50:12 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Jan 16 11:50:12 2016 +0100

--
 .../main/java/org/apache/camel/component/jms/JmsComponent.java   | 4 
 .../java/org/apache/camel/component/jms/JmsConfiguration.java| 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ebd93ccf/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index 8d5982c..46ef75d 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -891,6 +891,10 @@ public class JmsComponent extends UriEndpointComponent 
implements ApplicationCon
 
 MessageListenerContainerFactory messageListenerContainerFactory = 
resolveAndRemoveReferenceParameter(parameters,
 "messageListenerContainerFactoryRef", 
MessageListenerContainerFactory.class);
+if (messageListenerContainerFactory == null) {
+messageListenerContainerFactory = 
resolveAndRemoveReferenceParameter(parameters,
+"messageListenerContainerFactory", 
MessageListenerContainerFactory.class);
+}
 if (messageListenerContainerFactory != null) {
 
endpoint.setMessageListenerContainerFactory(messageListenerContainerFactory);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/ebd93ccf/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
--
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index b516408..ce13961 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -493,7 +493,7 @@ public class JmsConfiguration implements Cloneable {
  * The consumer type to use, which can be one of: Simple, Default, or 
Custom.
  * The consumer type determines which Spring JMS listener to use. Default 
will use org.springframework.jms.listener.DefaultMessageListenerContainer,
  * Simple will use 
org.springframework.jms.listener.SimpleMessageListenerContainer.
- * When Custom is specified, the MessageListenerContainerFactory defined 
by the messageListenerContainerFactoryRef option
+ * When Custom is specified, the MessageListenerContainerFactory defined 
by the messageListenerContainerFactory option
  * will determine what 
org.springframework.jms.listener.AbstractMessageListenerContainer to use.
  */
 public void setConsumerType(ConsumerType consumerType) {

[1/2] camel git commit: Component docs - fixed issue with hazelcast not including all of them

2016-01-02 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 0db69ba10 -> 4e4e9e59d
  refs/heads/master 9d0dc7b2c -> 622ccbb69


Component docs - fixed issue with hazelcast not including all of them


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

Branch: refs/heads/master
Commit: 622ccbb69839958c07374699fa0ce7108b289f73
Parents: 9d0dc7b
Author: Claus Ibsen 
Authored: Sat Jan 2 22:49:08 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Jan 2 22:49:08 2016 +0100

--
 .../component/hazelcast/HazelcastComponent.java |  6 ++--
 .../hazelcast/HazelcastDefaultEndpoint.java |  3 ++
 .../seda/HazelcastSedaConfiguration.java| 37 
 3 files changed, 38 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/622ccbb6/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
index a0a4308..b2f8716 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
@@ -119,11 +119,13 @@ public class HazelcastComponent extends 
UriEndpointComponent {
 }
 
 if (remaining.startsWith(HazelcastConstants.SEDA_PREFIX)) {
+// remaining is anything (name it foo ;)
+remaining = 
removeStartingCharacters(remaining.substring(HazelcastConstants.SEDA_PREFIX.length()),
 '/');
 final HazelcastSedaConfiguration config = new 
HazelcastSedaConfiguration();
 setProperties(config, parameters);
-config.setQueueName(remaining.substring(remaining.indexOf(":") + 
1, remaining.length()));
-
+config.setQueueName(remaining);
 endpoint = new HazelcastSedaEndpoint(hzInstance, uri, this, 
config);
+endpoint.setCacheName(remaining);
 endpoint.setCommand(HazelcastCommand.seda);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/622ccbb6/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
index dec3f48..63b0ac7 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastDefaultEndpoint.java
@@ -21,6 +21,7 @@ import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
+import org.apache.camel.component.hazelcast.seda.HazelcastSedaConfiguration;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
@@ -43,6 +44,8 @@ public abstract class HazelcastDefaultEndpoint extends 
DefaultEndpoint {
 protected String hazelcastInstanceName;
 @UriParam
 private int defaultOperation = -1;
+@UriParam
+private HazelcastSedaConfiguration hazelcastSedaConfiguration; // to 
include component schema docs
 
 public HazelcastDefaultEndpoint(HazelcastInstance hazelcastInstance, 
String endpointUri, Component component) {
 this(hazelcastInstance, endpointUri, component, null);

http://git-wip-us.apache.org/repos/asf/camel/blob/622ccbb6/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
index 3d9d1d8..99b801b 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConfiguration.java
+++

[1/2] camel git commit: Component docs - fixed issue with file not including all of them

2016-01-02 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 920a0d5f9 -> b76ae1868
  refs/heads/master b10c741fe -> c3d0322a1


Component docs - fixed issue with file not including all of them


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

Branch: refs/heads/master
Commit: c3d0322a1f971ec6f6732ac1347d818c7e09ef9e
Parents: b10c741
Author: Claus Ibsen 
Authored: Sat Jan 2 23:38:25 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Jan 2 23:49:37 2016 +0100

--
 .../component/file/GenericFileEndpoint.java | 37 +---
 .../AntPathMatcherGenericFileFilterTest.java| 12 ---
 2 files changed, 24 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c3d0322a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 9c4586d..160fc9f 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -145,6 +145,8 @@ public abstract class GenericFileEndpoint extends 
ScheduledPollEndpoint imple
 protected IdempotentRepository idempotentRepository;
 @UriParam(label = "consumer,filter")
 protected GenericFileFilter filter;
+@UriParam(label = "consumer,filter", defaultValue = "true")
+protected boolean antFilterCaseSensitive = true;
 protected volatile AntPathMatcherGenericFileFilter antFilter;
 @UriParam(label = "consumer,filter")
 protected String antInclude;
@@ -451,10 +453,6 @@ public abstract class GenericFileEndpoint extends 
ScheduledPollEndpoint imple
  */
 public void setAntInclude(String antInclude) {
 this.antInclude = antInclude;
-if (this.antFilter == null) {
-this.antFilter = new AntPathMatcherGenericFileFilter();
-}
-this.antFilter.setIncludes(antInclude);
 }
 
 public String getAntExclude() {
@@ -467,20 +465,17 @@ public abstract class GenericFileEndpoint extends 
ScheduledPollEndpoint imple
  */
 public void setAntExclude(String antExclude) {
 this.antExclude = antExclude;
-if (this.antFilter == null) {
-this.antFilter = new AntPathMatcherGenericFileFilter();
-}
-this.antFilter.setExcludes(antExclude);
+}
+
+public boolean isAntFilterCaseSensitive() {
+return antFilterCaseSensitive;
 }
 
 /**
- * Sets case sensitive flag on {@link 
org.apache.camel.component.file.AntPathMatcherFileFilter}
+ * Sets case sensitive flag on ant fiter
  */
 public void setAntFilterCaseSensitive(boolean antFilterCaseSensitive) {
-if (this.antFilter == null) {
-this.antFilter = new AntPathMatcherGenericFileFilter();
-}
-this.antFilter.setCaseSensitive(antFilterCaseSensitive);
+this.antFilterCaseSensitive = antFilterCaseSensitive;
 }
 
 public GenericFileFilter getAntFilter() {
@@ -1417,6 +1412,22 @@ public abstract class GenericFileEndpoint extends 
ScheduledPollEndpoint imple
 throw new IllegalArgumentException("IdempotentRepository must be 
configured when using readLock=idempotent");
 }
 
+if (antInclude != null) {
+if (antFilter == null) {
+antFilter = new AntPathMatcherGenericFileFilter<>();
+}
+antFilter.setIncludes(antInclude);
+}
+if (antExclude != null) {
+if (antFilter == null) {
+antFilter = new AntPathMatcherGenericFileFilter<>();
+}
+antFilter.setExcludes(antExclude);
+}
+if (antFilter != null) {
+antFilter.setCaseSensitive(antFilterCaseSensitive);
+}
+
 // idempotent repository may be used by others, so add it as a service 
so its stopped when CamelContext stops
 if (idempotentRepository != null) {
 getCamelContext().addService(idempotentRepository, true);

http://git-wip-us.apache.org/repos/asf/camel/blob/c3d0322a/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java