[1/2] camel git commit: Component doc

2017-03-08 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 584111a94 -> 6407919bb


Component doc


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

Branch: refs/heads/master
Commit: 42b9e9c1547bd4c8b0f8e8ef3fe82854c1c7d85e
Parents: 584111a
Author: Claus Ibsen 
Authored: Wed Mar 8 10:01:24 2017 +0100
Committer: Claus Ibsen 
Committed: Wed Mar 8 10:01:24 2017 +0100

--
 .../camel-box-component/src/main/docs/box-component.adoc | 4 ++--
 .../main/java/org/apache/camel/component/box/BoxEndpoint.java| 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/42b9e9c1/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
index 9d2bee5..2a1102c 100644
--- 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
@@ -1,6 +1,6 @@
 ## Box Component
 
-*Available as of Camel version *
+*Available as of Camel version 2.14*
 
 The Box component provides access to all of the Box.com APIs accessible
 using https://github.com/box/box-java-sdk/[box-java-sdk]. It
@@ -800,4 +800,4 @@ as follows:
 .setHeader("CamelBox.output", header("output"))
 .to("box://files/download")
 .to("file://...");

+---
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/42b9e9c1/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
--
diff --git 
a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
 
b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
index b406c95..e033839 100644
--- 
a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
+++ 
b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
@@ -46,7 +46,8 @@ import 
org.apache.camel.util.component.ApiMethodPropertiesHelper;
 /**
  * For uploading downloading and managing files folders groups collaborations 
etc on box DOT com.
  */
-@UriEndpoint(scheme = "box", title = "Box", syntax = "box:apiName/methodName", 
consumerClass = BoxConsumer.class, consumerPrefix = "consumer", label = 
"api,file,cloud", lenientProperties = true)
+@UriEndpoint(firstVersion = "2.14.0", scheme = "box", title = "Box", syntax = 
"box:apiName/methodName",
+consumerClass = BoxConsumer.class, consumerPrefix = "consumer", label = 
"api,file,cloud", lenientProperties = true)
 public class BoxEndpoint extends AbstractApiEndpoint {
 
 @UriParam



[03/33] camel git commit: Component doc label corrected

2015-11-12 Thread davsclaus
Component doc label corrected


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

Branch: refs/heads/master
Commit: 0471a55575ec0b6f3664588be5767fb8941ad6a6
Parents: 795316b
Author: Claus Ibsen 
Authored: Wed Nov 11 20:03:11 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Nov 12 09:19:11 2015 +0100

--
 .../src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0471a555/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index 7cc812e..f63e2ba 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -54,7 +54,7 @@ public abstract class ScheduledPollEndpoint extends 
DefaultEndpoint {
 private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
 @UriParam(defaultValue = "true", label = "consumer,scheduler", description 
= "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService 
in JDK for details.")
 private boolean useFixedDelay = true;
-@UriParam(label = "consumer", description = "A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation"
+@UriParam(label = "consumer,advanced", description = "A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation"
 + " to control error handling usually occurred during the poll 
operation before an Exchange have been created and being routed in Camel.")
 private PollingConsumerPollStrategy pollStrategy = new 
DefaultPollingConsumerPollStrategy();
 @UriParam(defaultValue = "TRACE", label = "consumer,scheduler",



[18/33] camel git commit: Component doc label corrected

2015-11-12 Thread davsclaus
Component doc label corrected


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

Branch: refs/heads/camel-2.16.x
Commit: e192d406f3bea158dc98084a721cb06a0b9dda3d
Parents: d4e9987
Author: Claus Ibsen 
Authored: Wed Nov 11 20:03:11 2015 +0100
Committer: Claus Ibsen 
Committed: Thu Nov 12 09:20:11 2015 +0100

--
 .../src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e192d406/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index 7cc812e..f63e2ba 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -54,7 +54,7 @@ public abstract class ScheduledPollEndpoint extends 
DefaultEndpoint {
 private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
 @UriParam(defaultValue = "true", label = "consumer,scheduler", description 
= "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService 
in JDK for details.")
 private boolean useFixedDelay = true;
-@UriParam(label = "consumer", description = "A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation"
+@UriParam(label = "consumer,advanced", description = "A pluggable 
org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your 
custom implementation"
 + " to control error handling usually occurred during the poll 
operation before an Exchange have been created and being routed in Camel.")
 private PollingConsumerPollStrategy pollStrategy = new 
DefaultPollingConsumerPollStrategy();
 @UriParam(defaultValue = "TRACE", label = "consumer,scheduler",



[6/6] camel git commit: Component doc

2015-04-24 Thread davsclaus
Component doc


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

Branch: refs/heads/master
Commit: 654bd8fea0a5103a7b49ea87256eadf004942574
Parents: 9f0ee1c
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 14:13:23 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 14:13:23 2015 +0200

--
 .../component/ganglia/GangliaComponent.java |  3 ++
 .../component/ganglia/GangliaConfiguration.java | 46 
 2 files changed, 49 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/654bd8fe/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
--
diff --git 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
index 1ebb9c6..fb2562f 100644
--- 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
+++ 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
@@ -53,6 +53,9 @@ public class GangliaComponent extends UriEndpointComponent {
 return configuration;
 }
 
+/**
+ * To use the shared configuration
+ */
 public void setConfiguration(GangliaConfiguration configuration) {
 this.configuration = configuration;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/654bd8fe/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
--
diff --git 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
index 39b79f4..6da1412 100644
--- 
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
+++ 
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
@@ -120,6 +120,9 @@ public class GangliaConfiguration implements Cloneable {
 return host;
 }
 
+/**
+ * Host name for Ganglia server
+ */
 public void setHost(String host) {
 this.host = host;
 }
@@ -128,6 +131,9 @@ public class GangliaConfiguration implements Cloneable {
 return port;
 }
 
+/**
+ * Port for Ganglia server
+ */
 public void setPort(int port) {
 this.port = port;
 }
@@ -136,6 +142,9 @@ public class GangliaConfiguration implements Cloneable {
 return mode;
 }
 
+/**
+ * Send the UDP metric packets using MULTICAST or UNICAST
+ */
 public void setMode(GMetric.UDPAddressingMode mode) {
 this.mode = mode;
 }
@@ -144,6 +153,9 @@ public class GangliaConfiguration implements Cloneable {
 return ttl;
 }
 
+/**
+ * If using multicast, set the TTL of the packets
+ */
 public void setTtl(int ttl) {
 this.ttl = ttl;
 }
@@ -152,6 +164,9 @@ public class GangliaConfiguration implements Cloneable {
 return wireFormat31x;
 }
 
+/**
+ * Use the wire format of Ganglia 3.1.0 and later versions.  Set this to 
false to use Ganglia 3.0.x or earlier.
+ */
 public void setWireFormat31x(boolean wireFormat31x) {
 this.wireFormat31x = wireFormat31x;
 }
@@ -160,6 +175,9 @@ public class GangliaConfiguration implements Cloneable {
 return spoofHostname;
 }
 
+/**
+ * Spoofing information IP:hostname
+ */
 public void setSpoofHostname(String spoofHostname) {
 this.spoofHostname = spoofHostname;
 }
@@ -168,6 +186,9 @@ public class GangliaConfiguration implements Cloneable {
 return groupName;
 }
 
+/**
+ * The group that the metric belongs to.
+ */
 public void setGroupName(String groupName) {
 this.groupName = groupName;
 }
@@ -176,6 +197,9 @@ public class GangliaConfiguration implements Cloneable {
 return prefix;
 }
 
+/**
+ * Prefix the metric name with this string and an underscore.
+ */
 public void setPrefix(String prefix) {
 this.prefix = prefix;
 }
@@ -184,6 +208,9 @@ public class GangliaConfiguration implements Cloneable {
 return metricName;
 }
 
+/**
+ * The name to use for the metric.
+ */
 public void setMetricName(String metricName) {
 this.metricName = metricName;
 }
@@ -192,6 +219,9 @@ 

[4/6] camel git commit: Component doc

2015-04-24 Thread davsclaus
Component doc


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

Branch: refs/heads/master
Commit: 9d9f2b3c47c4b138d6d3fc7b210ddd9c788a4c91
Parents: 429b354
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 14:00:00 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 14:00:00 2015 +0200

--
 .../component/jgroups/CamelJGroupsReceiver.java |  2 +-
 .../component/jgroups/JGroupsComponent.java | 18 +--
 .../component/jgroups/JGroupsEndpoint.java  | 54 
 3 files changed, 34 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9d9f2b3c/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
--
diff --git 
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
 
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
index 1fbbe7a..7233a8a 100644
--- 
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
+++ 
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
@@ -49,7 +49,7 @@ public class CamelJGroupsReceiver extends ReceiverAdapter {
 
 @Override
 public void viewAccepted(View view) {
-if (endpoint.isResolvedEnableViewMessages()) {
+if (endpoint.isEnableViewMessages()) {
 Exchange exchange = endpoint.createExchange(view);
 try {
 LOG.debug(Processing view: {}, view);

http://git-wip-us.apache.org/repos/asf/camel/blob/9d9f2b3c/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
--
diff --git 
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
 
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
index b7c906e..9096094 100644
--- 
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
+++ 
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
@@ -28,10 +28,8 @@ import org.jgroups.Channel;
 public class JGroupsComponent extends UriEndpointComponent {
 
 private Channel channel;
-
 private String channelProperties;
-
-private Boolean enableViewMessages;
+private boolean enableViewMessages;
 
 public JGroupsComponent() {
 super(JGroupsEndpoint.class);
@@ -46,6 +44,9 @@ public class JGroupsComponent extends UriEndpointComponent {
 return channel;
 }
 
+/**
+ * Channel to use
+ */
 public void setChannel(Channel channel) {
 this.channel = channel;
 }
@@ -54,15 +55,22 @@ public class JGroupsComponent extends UriEndpointComponent {
 return channelProperties;
 }
 
+/**
+ * Specifies configuration properties of the JChannel used by the endpoint.
+ */
 public void setChannelProperties(String channelProperties) {
 this.channelProperties = channelProperties;
 }
 
-public Boolean getEnableViewMessages() {
+public boolean isEnableViewMessages() {
 return enableViewMessages;
 }
 
-public void setEnableViewMessages(Boolean enableViewMessages) {
+/**
+ * If set to true, the consumer endpoint will receive org.jgroups.View 
messages as well (not only org.jgroups.Message instances).
+ * By default only regular messages are consumed by the endpoint.
+ */
+public void setEnableViewMessages(boolean enableViewMessages) {
 this.enableViewMessages = enableViewMessages;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/9d9f2b3c/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
--
diff --git 
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
 
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
index d92d09a..ea32da8 100644
--- 
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
+++ 
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
@@ -39,33 +39,25 @@ import org.slf4j.LoggerFactory;
 public class JGroupsEndpoint extends DefaultEndpoint {
 
 public static final String 

[1/6] camel git commit: Component doc

2015-04-24 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master c86c2f11f - 654bd8fea


Component doc


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

Branch: refs/heads/master
Commit: 4f283d1d1abdcdd9e1da4baf61e028c2248cb537
Parents: c86c2f1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 13:29:53 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 13:29:53 2015 +0200

--
 .../apache/camel/component/stomp/StompComponent.java| 12 
 .../camel/component/stomp/StompConfiguration.java   | 12 +++-
 .../org/apache/camel/component/stomp/StompEndpoint.java |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4f283d1d/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
--
diff --git 
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
 
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
index f8468e4..03459b3 100644
--- 
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
+++ 
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
@@ -48,18 +48,30 @@ public class StompComponent extends UriEndpointComponent {
 return configuration;
 }
 
+/**
+ * To use the shared stomp configuration
+ */
 public void setConfiguration(StompConfiguration configuration) {
 this.configuration = configuration;
 }
 
+/**
+ * The URI of the Stomp broker to connect to
+ */
 public void setBrokerURL(String brokerURL) {
 getConfiguration().setBrokerURL(brokerURL);
 }
 
+/**
+ * The username
+ */
 public void setLogin(String login) {
 getConfiguration().setLogin(login);
 }
 
+/**
+ * The password
+ */
 public void setPasscode(String passcode) {
 getConfiguration().setPasscode(passcode);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/4f283d1d/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
--
diff --git 
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
 
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
index 00b7fc8..72c1224 100644
--- 
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
+++ 
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
@@ -17,13 +17,14 @@
 package org.apache.camel.component.stomp;
 
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 
 @UriParams
 public class StompConfiguration implements Cloneable {
 
-@UriParam(defaultValue = tcp://localhost:61613)
+@UriParam(defaultValue = tcp://localhost:61613) @Metadata(required = 
true)
 private String brokerURL = tcp://localhost:61613;
 @UriParam
 private String login;
@@ -46,6 +47,9 @@ public class StompConfiguration implements Cloneable {
 return brokerURL;
 }
 
+/**
+ * The URI of the Stomp broker to connect to
+ */
 public void setBrokerURL(String brokerURL) {
 this.brokerURL = brokerURL;
 }
@@ -54,6 +58,9 @@ public class StompConfiguration implements Cloneable {
 return login;
 }
 
+/**
+ * The username
+ */
 public void setLogin(String login) {
 this.login = login;
 }
@@ -62,6 +69,9 @@ public class StompConfiguration implements Cloneable {
 return passcode;
 }
 
+/**
+ * The password
+ */
 public void setPasscode(String passcode) {
 this.passcode = passcode;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/4f283d1d/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
--
diff --git 
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
 
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
index 17600e4..2682ae3 100644
--- 
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
+++ 

camel git commit: Component doc

2015-04-24 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 654bd8fea - c57a42a56


Component doc


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

Branch: refs/heads/master
Commit: c57a42a5622596000b32161b1ff3718548e42e64
Parents: 654bd8f
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 14:39:08 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 14:39:08 2015 +0200

--
 .../component/beanstalk/BeanstalkCommand.java   |  2 -
 .../component/beanstalk/BeanstalkEndpoint.java  | 11 ++-
 .../camel/component/dns/DnsComponent.java   |  2 +
 .../apache/camel/component/dns/DnsEndpoint.java |  3 +
 .../component/dozer/DozerConfiguration.java | 24 ++
 .../camel/component/exec/ExecEndpoint.java  | 79 
 6 files changed, 50 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c57a42a5/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
--
diff --git 
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
 
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
index 76859e0..fac52ea 100644
--- 
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
+++ 
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
@@ -20,6 +20,4 @@ public enum BeanstalkCommand {
 
 bury, release, put, touch, delete, kick
 
-
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/c57a42a5/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
--
diff --git 
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
 
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
index 590c2b8..be7bfbe 100644
--- 
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
+++ 
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
@@ -47,11 +47,11 @@ public class BeanstalkEndpoint extends 
ScheduledPollEndpoint {
 private int jobDelay = BeanstalkComponent.DEFAULT_DELAY;
 @UriParam(defaultValue =  + BeanstalkComponent.DEFAULT_TIME_TO_RUN)
 private int jobTimeToRun = BeanstalkComponent.DEFAULT_TIME_TO_RUN;
-@UriParam
+@UriParam(label = consumer)
 private BeanstalkCommand onFailure = BeanstalkCommand.bury;
-@UriParam(defaultValue = true)
+@UriParam(label = consumer, defaultValue = true)
 private boolean useBlockIO = true;
-@UriParam(defaultValue = true)
+@UriParam(label = consumer, defaultValue = true)
 private boolean awaitJob = true;
 
 public BeanstalkEndpoint(final String uri, final Component component, 
final ConnectionSettings conn, final String connectionSettings) {
@@ -76,6 +76,11 @@ public class BeanstalkEndpoint extends ScheduledPollEndpoint 
{
 return command;
 }
 
+/**
+ * put means to put the job into Beanstalk. Job body is specified in the 
Camel message body. Job ID will be returned in beanstalk.jobId message header.
+ * delete, release, touch or bury expect Job ID in the message header 
beanstalk.jobId. Result of the operation is returned in beanstalk.result 
message header
+ * kick expects the number of jobs to kick in the message body and returns 
the number of jobs actually kicked out in the message header beanstalk.result.
+ */
 public void setCommand(BeanstalkCommand command) {
 this.command = command;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/c57a42a5/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
--
diff --git 
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
 
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
index 13a6fd8..fc69f62 100644
--- 
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
+++ 
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
@@ -22,6 +22,8 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
 
 /**
+ * This is a component for Camel to run DNS queries, using DNSJava.
+ * p/
  * The 

[3/6] camel git commit: Component doc

2015-04-24 Thread davsclaus
Component doc


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

Branch: refs/heads/master
Commit: 429b354220b83721be260af54b7ec0c5d22d2184
Parents: 525b56b
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 13:50:23 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 13:50:23 2015 +0200

--
 .../camel/component/xquery/XQueryComponent.java |  3 ++
 .../camel/component/xquery/XQueryEndpoint.java  | 36 
 2 files changed, 39 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/429b3542/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
--
diff --git 
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
 
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
index 2047c4d..0f3be86 100644
--- 
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
+++ 
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
@@ -54,6 +54,9 @@ public class XQueryComponent extends UriEndpointComponent {
 return moduleURIResolver;
 }
 
+/**
+ * To use the custom {@link ModuleURIResolver}
+ */
 public void setModuleURIResolver(ModuleURIResolver moduleURIResolver) {
 this.moduleURIResolver = moduleURIResolver;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/429b3542/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
--
diff --git 
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
 
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
index 1a23db9..d38c89c 100644
--- 
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
+++ 
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
@@ -75,6 +75,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return resourceUri;
 }
 
+/**
+ * The name of the template to load from classpath or file system
+ */
 public void setResourceUri(String resourceUri) {
 this.resourceUri = resourceUri;
 }
@@ -83,6 +86,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return configuration;
 }
 
+/**
+ * To use a custom Saxon configuration
+ */
 public void setConfiguration(Configuration configuration) {
 this.configuration = configuration;
 }
@@ -91,6 +97,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return staticQueryContext;
 }
 
+/**
+ * To use a custom Saxon StaticQueryContext
+ */
 public void setStaticQueryContext(StaticQueryContext staticQueryContext) {
 this.staticQueryContext = staticQueryContext;
 }
@@ -99,6 +108,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return parameters;
 }
 
+/**
+ * Additional parameters
+ */
 public void setParameters(MapString, Object parameters) {
 this.parameters = parameters;
 }
@@ -107,6 +119,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return namespacePrefixes;
 }
 
+/**
+ * Allows to control which namespace prefixes to use for a set of 
namespace mappings
+ */
 public void setNamespacePrefixes(MapString, String namespacePrefixes) {
 this.namespacePrefixes = namespacePrefixes;
 }
@@ -115,6 +130,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return resultsFormat;
 }
 
+/**
+ * What output result to use
+ */
 public void setResultsFormat(ResultFormat resultsFormat) {
 this.resultsFormat = resultsFormat;
 }
@@ -123,6 +141,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return properties;
 }
 
+/**
+ * Properties to configure the serialization parameters
+ */
 public void setProperties(Properties properties) {
 this.properties = properties;
 }
@@ -131,6 +152,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return resultType;
 }
 
+/**
+ * What output result to use defined as a class
+ */
 public void setResultType(Class? resultType) {
 this.resultType = resultType;
 }
@@ -139,6 +163,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
 return 

[2/6] camel git commit: Component doc

2015-04-24 Thread davsclaus
Component doc


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

Branch: refs/heads/master
Commit: 525b56b7321004d99d18e25bce0a70da38921079
Parents: 4f283d1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 13:38:49 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 13:38:49 2015 +0200

--
 .../camel/component/ssh/SshComponent.java   | 63 
 .../camel/component/ssh/SshConfiguration.java   |  3 +-
 2 files changed, 65 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/525b56b7/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 5635ff2..3f45770 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
@@ -55,6 +55,9 @@ public class SshComponent extends UriEndpointComponent {
 return configuration;
 }
 
+/**
+ * To use the shared SSH configuration
+ */
 public void setConfiguration(SshConfiguration configuration) {
 this.configuration = configuration;
 }
@@ -63,6 +66,11 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getHost();
 }
 
+/**
+ * Sets the hostname of the remote SSH server.
+ *
+ * @param host String representing hostname of SSH server.
+ */
 public void setHost(String host) {
 getConfiguration().setHost(host);
 }
@@ -71,6 +79,11 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getPort();
 }
 
+/**
+ * Sets the port number for the remote SSH server.
+ *
+ * @param port int representing port number on remote host. Defaults to 22.
+ */
 public void setPort(int port) {
 getConfiguration().setPort(port);
 }
@@ -79,6 +92,11 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getUsername();
 }
 
+/**
+ * Sets the username to use in logging into the remote SSH server.
+ *
+ * @param username String representing login username.
+ */
 public void setUsername(String username) {
 getConfiguration().setUsername(username);
 }
@@ -87,6 +105,12 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getPassword();
 }
 
+/**
+ * Sets the password to use in connecting to remote SSH server.
+ * Requires keyPairProvider to be set to null.
+ *
+ * @param password String representing password for username at remote 
host.
+ */
 public void setPassword(String password) {
 getConfiguration().setPassword(password);
 }
@@ -95,6 +119,13 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getPollCommand();
 }
 
+/**
+ * Sets the command string to send to the remote SSH server during every 
poll cycle.
+ * Only works with camel-ssh component being used as a consumer, i.e. 
from(ssh://...).
+ * You may need to end your command with a newline, and that must be URL 
encoded %0A
+ *
+ * @param pollCommand String representing the command to send.
+ */
 public void setPollCommand(String pollCommand) {
 getConfiguration().setPollCommand(pollCommand);
 }
@@ -103,6 +134,14 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getKeyPairProvider();
 }
 
+/**
+ * Sets the KeyPairProvider reference to use when connecting using 
Certificates to the remote SSH Server.
+ *
+ * @param keyPairProvider KeyPairProvider reference to use in 
authenticating. If set to 'null',
+ *then will attempt to connect using 
username/password settings.
+ *
+ * @see KeyPairProvider
+ */
 public void setKeyPairProvider(KeyPairProvider keyPairProvider) {
 getConfiguration().setKeyPairProvider(keyPairProvider);
 }
@@ -111,6 +150,14 @@ public class SshComponent extends UriEndpointComponent {
 return getConfiguration().getKeyType();
 }
 
+/**
+ * Sets the key type to pass to the KeyPairProvider as part of 
authentication.
+ * KeyPairProvider.loadKey(...) will be passed this value. Defaults to 
ssh-rsa.
+ *
+   

[1/2] camel git commit: Component doc

2015-04-24 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master c57a42a56 - 774860517


Component doc


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

Branch: refs/heads/master
Commit: e66df5f26cf315bbc9efd8c35fa45905b3b827f5
Parents: c57a42a
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 15:06:40 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 15:06:40 2015 +0200

--
 .../component/dropbox/DropboxConfiguration.java | 33 ++--
 .../apache/camel/component/rmi/RmiEndpoint.java | 12 +--
 .../component/weather/WeatherConfiguration.java | 26 +++
 3 files changed, 66 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e66df5f2/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
--
diff --git 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
index 2c9c842..4c3a2a5 100755
--- 
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
+++ 
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
@@ -35,7 +35,7 @@ public class DropboxConfiguration {
 @UriPath @Metadata(required = true)
 private DropboxOperation operation;
 //dropbox auth options
-@UriParam
+@UriParam @Metadata(required = true)
 private String accessToken;
 //local path to put files
 @UriParam
@@ -53,12 +53,15 @@ public class DropboxConfiguration {
 @UriParam
 private DropboxUploadMode uploadMode;
 //id of the app
-@UriParam
+@UriParam @Metadata(required = true)
 private String clientIdentifier;
 //reference to dropboxclient
 @UriParam
 private DbxClient client;
 
+/**
+ * To use an existing DbxClient instance as DropBox client.
+ */
 public void setClient(DbxClient client) {
 this.client = client;
 }
@@ -80,6 +83,9 @@ public class DropboxConfiguration {
 return accessToken;
 }
 
+/**
+ * The access token to make API requests for a specific Dropbox user
+ */
 public void setAccessToken(String accessToken) {
 this.accessToken = accessToken;
 }
@@ -88,6 +94,9 @@ public class DropboxConfiguration {
 return localPath;
 }
 
+/**
+ * Folder or file to upload on Dropbox from the local filesystem.
+ */
 public void setLocalPath(String localPath) {
 this.localPath = localPath;
 }
@@ -96,6 +105,9 @@ public class DropboxConfiguration {
 return remotePath;
 }
 
+/**
+ * Original file or folder to move
+ */
 public void setRemotePath(String remotePath) {
 this.remotePath = remotePath;
 }
@@ -104,6 +116,9 @@ public class DropboxConfiguration {
 return newRemotePath;
 }
 
+/**
+ * Destination file or folder
+ */
 public void setNewRemotePath(String newRemotePath) {
 this.newRemotePath = newRemotePath;
 }
@@ -112,6 +127,9 @@ public class DropboxConfiguration {
 return query;
 }
 
+/**
+ * A space-separated list of substrings to search for. A file matches only 
if it contains all the substrings. If this option is not set, all files will be 
matched.
+ */
 public void setQuery(String query) {
 this.query = query;
 }
@@ -120,6 +138,9 @@ public class DropboxConfiguration {
 return clientIdentifier;
 }
 
+/**
+ * Name of the app registered to make API requests
+ */
 public void setClientIdentifier(String clientIdentifier) {
 this.clientIdentifier = clientIdentifier;
 }
@@ -128,6 +149,9 @@ public class DropboxConfiguration {
 return operation;
 }
 
+/**
+ * The specific action (typically is a CRUD action) to perform on Dropbox 
remote folder.
+ */
 public void setOperation(DropboxOperation operation) {
 this.operation = operation;
 }
@@ -136,6 +160,11 @@ public class DropboxConfiguration {
 return uploadMode;
 }
 
+/**
+ * Which mode to upload.
+ * in case of add the new file will be renamed if a file with the same 
name already exists on dropbox.
+ * in case of force if a file with the same name already exists on 
dropbox, this will be overwritten.
+ */
 public void setUploadMode(DropboxUploadMode uploadMode) {
 this.uploadMode = uploadMode;
 }


[2/2] camel git commit: Component doc

2015-04-24 Thread davsclaus
Component doc


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

Branch: refs/heads/master
Commit: 774860517bf4c51a98b38fa33b6bef0b5aaffefe
Parents: e66df5f
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 15:14:38 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 15:14:38 2015 +0200

--
 .../camel/component/paho/PahoEndpoint.java  | 21 
 .../stringtemplate/StringTemplateEndpoint.java  | 10 --
 2 files changed, 29 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/77486051/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
--
diff --git 
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
 
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
index 7f24703..5ca943a 100644
--- 
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
+++ 
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
@@ -143,6 +143,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return clientId;
 }
 
+/**
+ * MQTT client identifier.
+ */
 public void setClientId(String clientId) {
 this.clientId = clientId;
 }
@@ -151,6 +154,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return brokerUrl;
 }
 
+/**
+ * The URL of the MQTT broker.
+ */
 public void setBrokerUrl(String brokerUrl) {
 this.brokerUrl = brokerUrl;
 }
@@ -159,6 +165,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return topic;
 }
 
+/**
+ * Name of the topic
+ */
 public void setTopic(String topic) {
 this.topic = topic;
 }
@@ -167,6 +176,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return qos;
 }
 
+/**
+ * Client quality of service level (0-2).
+ */
 public void setQos(int qos) {
 this.qos = qos;
 }
@@ -177,6 +189,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return persistence;
 }
 
+/**
+ * Client persistence to be used - memory or file.
+ */
 public void setPersistence(PahoPersistence persistence) {
 this.persistence = persistence;
 }
@@ -185,6 +200,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return client;
 }
 
+/**
+ * To use the existing MqttClient instance as client.
+ */
 public void setClient(MqttClient client) {
 this.client = client;
 }
@@ -193,6 +211,9 @@ public class PahoEndpoint extends DefaultEndpoint {
 return connectOptions;
 }
 
+/**
+ * Client connection options
+ */
 public void setConnectOptions(MqttConnectOptions connOpts) {
 this.connectOptions = connOpts;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/77486051/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
--
diff --git 
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
 
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
index 96037be..ca2978a 100644
--- 
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
+++ 
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
@@ -37,9 +37,9 @@ import org.stringtemplate.v4.STGroup;
 @UriEndpoint(scheme = stringtemplate, title = String Template, syntax = 
stringtemplate:resourceUri, producerOnly = true, label = transformation)
 public class StringTemplateEndpoint extends ResourceEndpoint {
 
-@UriParam
+@UriParam(defaultValue = )
 private char delimiterStart = STGroup.defaultGroup.delimiterStartChar;
-@UriParam
+@UriParam(defaultValue = )
 private char delimiterStop = STGroup.defaultGroup.delimiterStopChar;
 
 public StringTemplateEndpoint() {
@@ -63,6 +63,9 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
 return delimiterStart;
 }
 
+/**
+ * The variable start delimiter
+ */
 public void setDelimiterStart(char delimiterStart) {
 this.delimiterStart = delimiterStart;
 }
@@ -71,6 +74,9 @@ public class StringTemplateEndpoint extends ResourceEndpoint {

[2/2] camel git commit: Component doc

2015-04-24 Thread davsclaus
Component doc


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

Branch: refs/heads/master
Commit: 196c1f5ea8c14cc5a36c7f4aed3dacaeb577e733
Parents: df79b59
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 08:03:09 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 08:03:09 2015 +0200

--
 .../camel/component/yammer/YammerComponent.java | 12 
 .../component/yammer/YammerConfiguration.java   | 61 +---
 2 files changed, 64 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/196c1f5e/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
--
diff --git 
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
 
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
index 2655beb..6d83570 100644
--- 
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
+++ 
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
@@ -57,6 +57,9 @@ public class YammerComponent extends DefaultComponent {
 return consumerKey;
 }
 
+/**
+ * The consumer key
+ */
 public void setConsumerKey(String consumerKey) {
 this.consumerKey = consumerKey;
 }
@@ -65,6 +68,9 @@ public class YammerComponent extends DefaultComponent {
 return consumerSecret;
 }
 
+/**
+ * The consumer secret
+ */
 public void setConsumerSecret(String consumerSecret) {
 this.consumerSecret = consumerSecret;
 }
@@ -73,6 +79,9 @@ public class YammerComponent extends DefaultComponent {
 return accessToken;
 }
 
+/**
+ * The access token
+ */
 public void setAccessToken(String accessToken) {
 this.accessToken = accessToken;
 }
@@ -81,6 +90,9 @@ public class YammerComponent extends DefaultComponent {
 return config;
 }
 
+/**
+ * To use a shared yammer configuration
+ */
 public void setConfig(YammerConfiguration config) {
 this.config = config;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/196c1f5e/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
--
diff --git 
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
 
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
index deee282..9899d05 100644
--- 
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
+++ 
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
@@ -27,25 +27,25 @@ public class YammerConfiguration {
 @UriPath(name = function) @Metadata(required = true)
 private YammerFunctionType functionType;
 private String function;
-@UriParam
+@UriParam  @Metadata(required = true)
 private String consumerKey;
-@UriParam
+@UriParam  @Metadata(required = true)
 private String consumerSecret;
-@UriParam
+@UriParam  @Metadata(required = true)
 private String accessToken;
 @UriParam
 private boolean useJson;
-@UriParam(defaultValue = 5000)
+@UriParam(label = consumer, defaultValue = 5000)
 private long delay = 3000 + 2000; // 3 sec per poll is enforced by yammer; 
add 2 sec for safety
-@UriParam(defaultValue = -1)
+@UriParam(label = consumer, defaultValue = -1)
 private int limit = -1; // default is unlimited
-@UriParam(defaultValue = -1)
+@UriParam(label = consumer, defaultValue = -1)
 private int olderThan = -1;
-@UriParam(defaultValue = -1)
+@UriParam(label = consumer, defaultValue = -1)
 private int newerThan = -1;
-@UriParam
+@UriParam(label = consumer, enums = true,extended)
 private String threaded;
-@UriParam
+@UriParam(label = consumer)
 private String userId;
 private ApiRequestor requestor;
 
@@ -53,6 +53,9 @@ public class YammerConfiguration {
 return consumerKey;
 }
 
+/**
+ * The consumer key
+ */
 public void setConsumerKey(String consumerKey) {
 this.consumerKey = consumerKey;
 }
@@ -61,6 +64,9 @@ public class YammerConfiguration {
 return consumerSecret;
 }
 
+/**
+ * The consumer secret
+ */
 public void setConsumerSecret(String consumerSecret) {
 

[1/2] camel git commit: Component doc

2015-04-24 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 157c7366f - 196c1f5ea


Component doc


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

Branch: refs/heads/master
Commit: df79b5991ec555a4befd4fb031d1bfca95b47aea
Parents: 157c736
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 07:53:11 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 07:53:11 2015 +0200

--
 .../component/docker/DockerConfiguration.java   | 46 
 1 file changed, 19 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/df79b599/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
--
diff --git 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
index 4ac97a5..442bc83 100644
--- 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
+++ 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
@@ -30,45 +30,32 @@ public class DockerConfiguration implements Cloneable {
 
 @UriPath @Metadata(required = true)
 private DockerOperation operation;
-
 @UriParam(defaultValue = localhost) @Metadata(required = true)
 private String host = localhost;
-
 @UriParam(defaultValue = 2375) @Metadata(required = true)
 private Integer port = 2375;
-
 @UriParam
 private String username;
-
 @UriParam
 private String password;
-
 @UriParam
 private String email;
-
 @UriParam(defaultValue = https://index.docker.io/v1/;)
 private String serverAddress = https://index.docker.io/v1/;;
-
 @UriParam
 private Integer requestTimeout;
-
 @UriParam
-private Boolean secure;
-
+private boolean secure;
 @UriParam
 private String certPath;
-
 @UriParam(defaultValue = 100)
 private Integer maxTotalConnections = 100;
-
 @UriParam(defaultValue = 100)
 private Integer maxPerRouteConnections = 100;
-
 @UriParam
-private Boolean loggingFilterEnabled;
-
+private boolean loggingFilter;
 @UriParam
-private Boolean followRedirectFilterEnabled;
+private boolean followRedirectFilter;
 
 private MapString, Object parameters = new HashMapString, Object();
 
@@ -149,14 +136,14 @@ public class DockerConfiguration implements Cloneable {
 this.requestTimeout = requestTimeout;
 }
 
-public Boolean isSecure() {
+public boolean isSecure() {
 return secure;
 }
 
 /**
  * Use HTTPS communication
  */
-public void setSecure(Boolean secure) {
+public void setSecure(boolean secure) {
 this.secure = secure;
 }
 
@@ -193,20 +180,26 @@ public class DockerConfiguration implements Cloneable {
 this.maxPerRouteConnections = maxPerRouteConnections;
 }
 
-public Boolean isLoggingFilterEnabled() {
-return loggingFilterEnabled;
+public boolean isLoggingFilterEnabled() {
+return loggingFilter;
 }
 
-public void setLoggingFilter(Boolean loggingFilterEnabled) {
-this.loggingFilterEnabled = loggingFilterEnabled;
+/**
+ * Whether to use logging filter
+ */
+public void setLoggingFilter(boolean loggingFilterEnabled) {
+this.loggingFilter = loggingFilterEnabled;
 }
 
-public Boolean isFollowRedirectFilterEnabled() {
-return followRedirectFilterEnabled;
+public boolean isFollowRedirectFilterEnabled() {
+return followRedirectFilter;
 }
 
-public void setFollowRedirectFilter(Boolean followRedirectFilterEnabled) {
-this.followRedirectFilterEnabled = followRedirectFilterEnabled;
+/**
+ * Whether to follow redirect filter
+ */
+public void setFollowRedirectFilter(boolean followRedirectFilterEnabled) {
+this.followRedirectFilter = followRedirectFilterEnabled;
 }
 
 public MapString, Object getParameters() {
@@ -239,5 +232,4 @@ public class DockerConfiguration implements Cloneable {
 }
 }
 
-
 }



camel git commit: Component doc

2015-04-23 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 4118be401 - 56823320c


Component doc


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

Branch: refs/heads/master
Commit: 56823320c21edf4e569623d7ecfd0c5dbc5dc910
Parents: 4118be4
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Apr 23 16:59:22 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Apr 23 16:59:22 2015 +0200

--
 .../camel/component/docker/DockerComponent.java |  6 +++
 .../component/docker/DockerConfiguration.java   | 44 ++--
 2 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/56823320/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
--
diff --git 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
index 35f641d..3f0cef2 100644
--- 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
+++ 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
@@ -70,6 +70,9 @@ public class DockerComponent extends DefaultComponent {
 this.configuration = configuration;
 }
 
+/**
+ * To use the shared docker configuration
+ */
 protected DockerConfiguration getConfiguration() {
 return configuration;
 }
@@ -78,6 +81,9 @@ public class DockerComponent extends DefaultComponent {
 return clients.get(clientProfile);
 }
 
+/**
+ * To use the given docker client
+ */
 public void setClient(DockerClientProfile clientProfile, DockerClient 
client) {
 clients.put(clientProfile, client);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/56823320/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
--
diff --git 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
index c1434e6..af1a32c 100644
--- 
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
+++ 
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
@@ -31,10 +31,10 @@ public class DockerConfiguration implements Cloneable {
 @UriPath @Metadata(required = true)
 private DockerOperation operation;
 
-@UriParam(defaultValue = localhost)
+@UriParam(defaultValue = localhost) @Metadata(required = true)
 private String host = localhost;
 
-@UriParam(defaultValue = 2375)
+@UriParam(defaultValue = 2375) @Metadata(required = true)
 private Integer port = 2375;
 
 @UriParam
@@ -70,6 +70,9 @@ public class DockerConfiguration implements Cloneable {
 return host;
 }
 
+/**
+ * Docker host
+ */
 public void setHost(String host) {
 this.host = host;
 }
@@ -78,6 +81,9 @@ public class DockerConfiguration implements Cloneable {
 return port;
 }
 
+/**
+ * Docker port
+ */
 public void setPort(Integer port) {
 this.port = port;
 }
@@ -86,6 +92,9 @@ public class DockerConfiguration implements Cloneable {
 return username;
 }
 
+/**
+ * User name to authenticate with
+ */
 public void setUsername(String username) {
 this.username = username;
 }
@@ -94,6 +103,9 @@ public class DockerConfiguration implements Cloneable {
 return password;
 }
 
+/**
+ * Password to authenticate with
+ */
 public void setPassword(String password) {
 this.password = password;
 }
@@ -102,6 +114,9 @@ public class DockerConfiguration implements Cloneable {
 return email;
 }
 
+/**
+ * Email address associated with the user
+ */
 public void setEmail(String email) {
 this.email = email;
 }
@@ -110,6 +125,9 @@ public class DockerConfiguration implements Cloneable {
 return serverAddress;
 }
 
+/**
+ * Server address for docker registry.
+ */
 public void setServerAddress(String serverAddress) {
 this.serverAddress = serverAddress;
 }
@@ -118,6 +136,9 @@ public class DockerConfiguration implements Cloneable {
 return requestTimeout;
 }
 
+/**
+ * Request timeout for response (in