Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B7C96200C07 for ; Sun, 22 Jan 2017 15:05:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B677D160B59; Sun, 22 Jan 2017 14:05:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E1563160B38 for ; Sun, 22 Jan 2017 15:05:42 +0100 (CET) Received: (qmail 30535 invoked by uid 500); 22 Jan 2017 14:05:42 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 30517 invoked by uid 99); 22 Jan 2017 14:05:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2017 14:05:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4252DF9FC; Sun, 22 Jan 2017 14:05:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Sun, 22 Jan 2017 14:05:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] camel git commit: Add lable to options. This closes #1417 archived-at: Sun, 22 Jan 2017 14:05:43 -0000 Add lable to options. This closes #1417 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bac2b54c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bac2b54c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bac2b54c Branch: refs/heads/master Commit: bac2b54c9abe9007fd1aec227b4693b15699ac87 Parents: 7c1528f Author: Claus Ibsen Authored: Sun Jan 22 15:05:14 2017 +0100 Committer: Claus Ibsen Committed: Sun Jan 22 15:05:14 2017 +0100 ---------------------------------------------------------------------- .../src/main/docs/couchdb-component.adoc | 14 +++++++------- .../camel/component/couchdb/CouchDbEndpoint.java | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bac2b54c/components/camel-couchdb/src/main/docs/couchdb-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-couchdb/src/main/docs/couchdb-component.adoc b/components/camel-couchdb/src/main/docs/couchdb-component.adoc index ccc42c9..0081fa1 100644 --- a/components/camel-couchdb/src/main/docs/couchdb-component.adoc +++ b/components/camel-couchdb/src/main/docs/couchdb-component.adoc @@ -59,17 +59,17 @@ The CouchDB component supports 16 endpoint options which are listed below: | port | common | 5984 | int | Port number for the running couchdb instance | database | common | | String | *Required* Name of the database to use | createDatabase | common | false | boolean | Creates the database if it does not already exist -| deletes | common | true | boolean | Document deletes are published as events -| heartbeat | common | 30000 | long | How often to send an empty message to keep socket alive in millis -| password | common | | String | Password for authenticated databases -| since | common | | String | Start tracking changes immediately after the given update sequence. The default null will start monitoring from the latest sequence. -| style | common | main_only | String | Specifies how many revisions are returned in the changes array. The default main_only will only return the current winning revision; all_docs will return all leaf revisions (including conflicts and deleted former conflicts.) -| updates | common | true | boolean | Document inserts/updates are published as events -| username | common | | String | Username in case of authenticated databases | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. +| deletes | consumer | true | boolean | Document deletes are published as events +| heartbeat | consumer | 30000 | long | How often to send an empty message to keep socket alive in millis +| since | consumer | | String | Start tracking changes immediately after the given update sequence. The default null will start monitoring from the latest sequence. +| style | consumer | main_only | String | Specifies how many revisions are returned in the changes array. The default main_only will only return the current winning revision; all_docs will return all leaf revisions (including conflicts and deleted former conflicts.) +| updates | consumer | true | boolean | Document inserts/updates are published as events | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN or ERROR level and ignored. | exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange. | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| password | security | | String | Password for authenticated databases +| username | security | | String | Username in case of authenticated databases |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/bac2b54c/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java index bd51b66..c4e7904 100644 --- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java +++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbEndpoint.java @@ -50,21 +50,21 @@ public class CouchDbEndpoint extends DefaultEndpoint { private int port; @UriPath @Metadata(required = "true") private String database; - @UriParam(enums = "all_docs,main_only", defaultValue = DEFAULT_STYLE) + @UriParam(label = "consumer", enums = "all_docs,main_only", defaultValue = DEFAULT_STYLE) private String style = DEFAULT_STYLE; - @UriParam + @UriParam(label = "security", secret = true) private String username; - @UriParam + @UriParam(label = "security", secret = true) private String password; - @UriParam(defaultValue = "" + DEFAULT_HEARTBEAT) + @UriParam(label = "consumer", defaultValue = "" + DEFAULT_HEARTBEAT) private long heartbeat = DEFAULT_HEARTBEAT; @UriParam private boolean createDatabase; - @UriParam(defaultValue = "true") + @UriParam(label = "consumer", defaultValue = "true") private boolean deletes = true; - @UriParam(defaultValue = "true") + @UriParam(label = "consumer", defaultValue = "true") private boolean updates = true; - @UriParam + @UriParam(label = "consumer") private String since; public CouchDbEndpoint() {