[1/5] camel git commit: Component docs

2016-01-07 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 1190318e9 -> 0254e7574


Component docs


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

Branch: refs/heads/master
Commit: 22d5c57847b404c38cdec329ec90a9efd928c230
Parents: c7a1ca4
Author: Claus Ibsen 
Authored: Thu Jan 7 10:29:12 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 11:01:10 2016 +0100

--
 .../camel/component/google/mail/GoogleMailConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/22d5c578/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
--
diff --git 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
index 96b2b76..69944c7 100644
--- 
a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
+++ 
b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailConfiguration.java
@@ -36,7 +36,7 @@ public class GoogleMailConfiguration {
 @UriPath @Metadata(required = "true")
 private GoogleMailApiName apiName;
 
-@UriPath(enums = 
"create,delete,get,getProfile,gmailImport,insert,list,modify,patch,send,trash,untrash,update")
+@UriPath(enums = 
"attachments,create,delete,get,getProfile,gmailImport,insert,list,modify,patch,send,trash,untrash,update")
 @Metadata(required = "true")
 private String methodName;
 



[1/5] camel git commit: Component docs

2016-01-07 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x aead21aaa -> 8fb98e907


Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 81b2e7b9bcbfec51488c96803267bb279f6c9e9c
Parents: aead21a
Author: Claus Ibsen 
Authored: Thu Jan 7 10:26:07 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 10:54:04 2016 +0100

--
 .../camel/component/infinispan/InfinispanConfiguration.java   | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/81b2e7b9/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
--
diff --git 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
index 1cf5a9e..a738ce4 100644
--- 
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
+++ 
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
@@ -28,17 +28,18 @@ import org.infinispan.commons.api.BasicCacheContainer;
 
 @UriParams
 public class InfinispanConfiguration {
-private BasicCacheContainer cacheContainer;
 @UriPath @Metadata(required = "true")
 private String host;
 @UriParam
+private BasicCacheContainer cacheContainer;
+@UriParam
 private String cacheName;
 @UriParam(label = "producer", defaultValue = "put", enums = 
"put,putAll,putIfAbsent,putAsync,putAllAsync,putIfAbsentAsync,get,containsKey,containsValue,remove,removeAsync,"
-   + "replace,replaceAsync,clear,size")
+   + "replace,replaceAsync,clear,clearAsync,size")
 private String command;
 @UriParam(label = "consumer", defaultValue = "true")
 private boolean sync = true;
-@UriParam(label = "consumer")
+@UriParam(label = "consumer", javaType = "java.lang.String")
 private Set eventTypes;
 
 public String getCommand() {



[1/5] camel git commit: Component docs

2015-06-14 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master 722a588e7 - e20ae861b


Component docs


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

Branch: refs/heads/master
Commit: be7552085c875dc8871ce5f39c61e615163ef185
Parents: 722a588
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 09:46:35 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 13:08:06 2015 +0200

--
 .../camel/component/ahc/ws/WsEndpoint.java  |  3 +-
 .../camel/component/amqp/AMQPEndpoint.java  |  3 +-
 .../atmosphere/websocket/WebsocketEndpoint.java |  3 +-
 .../component/file/remote/FtpEndpoint.java  |  3 +-
 .../component/file/remote/FtpsEndpoint.java |  3 +-
 .../component/file/remote/SftpEndpoint.java |  3 +-
 .../camel/component/gae/http/GHttpEndpoint.java |  3 +-
 .../camel/component/gae/task/GTaskEndpoint.java |  3 +-
 .../component/jetty8/JettyHttpEndpoint8.java|  3 +-
 .../component/jetty9/JettyHttpEndpoint9.java|  3 +-
 .../apache/camel/component/scp/ScpEndpoint.java |  3 +-
 .../component/netty/http/NettyHttpEndpoint.java |  3 +-
 .../netty4/http/NettyHttpEndpoint.java  |  3 +-
 .../apache/camel/component/rss/RssEndpoint.java |  3 +-
 .../component/servlet/ServletEndpoint.java  |  3 +-
 .../camel/tools/apt/DocumentationHelper.java| 63 
 .../tools/apt/EndpointAnnotationProcessor.java  | 16 +
 .../java/org/apache/camel/spi/UriEndpoint.java  | 11 
 18 files changed, 120 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/be755208/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
--
diff --git 
a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
 
b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index ec37304..e0d0b88 100644
--- 
a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ 
b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -38,7 +38,8 @@ import org.apache.camel.spi.UriParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@UriEndpoint(scheme = ahc-ws,ahc-wss, title = AHC Websocket,AHC Secure 
Websocket, syntax = ahc-ws:httpUri, consumerClass = WsConsumer.class, label 
= websocket)
+@UriEndpoint(scheme = ahc-ws,ahc-wss, extendsScheme = ahc,ahc, title = 
AHC Websocket,AHC Secure Websocket,
+syntax = ahc-ws:httpUri, consumerClass = WsConsumer.class, label = 
websocket)
 public class WsEndpoint extends AhcEndpoint {
 private static final transient Logger LOG = 
LoggerFactory.getLogger(WsEndpoint.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/be755208/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
--
diff --git 
a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
 
b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
index 109a393..ce630f6 100644
--- 
a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
+++ 
b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
@@ -20,7 +20,8 @@ import org.apache.camel.component.jms.JmsConsumer;
 import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
-@UriEndpoint(scheme = amqp, title = AMQP, syntax = 
amqp:destinationType:destinationName, consumerClass = JmsConsumer.class, 
label = messaging)
+@UriEndpoint(scheme = amqp, extendsScheme = jms, title = AMQP,
+syntax = amqp:destinationType:destinationName, consumerClass = 
JmsConsumer.class, label = messaging)
 public class AMQPEndpoint extends JmsEndpoint {
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/be755208/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
--
diff --git 
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
 
b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
index 9b5abe8..77a6306 100644
--- 
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++ 

[1/5] camel git commit: Component docs

2015-04-28 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master d57437c66 - 9dd120a53


Component docs


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

Branch: refs/heads/master
Commit: c3990f5184af3d69df71dcdbc9e95ad4f401a14b
Parents: d57437c
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Apr 28 07:30:01 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Apr 28 07:30:01 2015 +0200

--
 .../component/springldap/LdapOperation.java |   1 -
 .../springldap/SpringLdapEndpoint.java  | 131 ++-
 .../springldap/SpringLdapProducer.java  |   2 +-
 .../springldap/SpringLdapEndpointTest.java  | 101 --
 .../springldap/SpringLdapProducerTest.java  |   2 +-
 5 files changed, 40 insertions(+), 197 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
--
diff --git 
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
 
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
index dd0acc5..2710acc 100644
--- 
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
+++ 
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/LdapOperation.java
@@ -20,7 +20,6 @@ package org.apache.camel.component.springldap;
  * The list of supported LDAP operations. Currently supported operations are
  * search, bind, and unbind. Modify is currently not supported.
  */
-
 public enum LdapOperation {
 SEARCH, BIND, UNBIND
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/c3990f51/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
--
diff --git 
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
 
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
index fe63ad5..3e54c27 100644
--- 
a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
+++ 
b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.springldap;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
 import javax.naming.directory.SearchControls;
 
 import org.apache.camel.Consumer;
@@ -38,141 +35,89 @@ public class SpringLdapEndpoint extends DefaultEndpoint {
 private static final String ONELEVEL_SCOPE_NAME = onelevel;
 private static final String SUBTREE_SCOPE_NAME = subtree;
 
-private static MapString, LdapOperation operationMap;
-private static MapString, Integer scopeMap;
-
 private LdapTemplate ldapTemplate;
 @UriPath @Metadata(required = true)
 private String templateName;
-@UriParam
+@UriParam @Metadata(required = true)
 private LdapOperation operation;
-@UriParam(defaultValue = 2)
-private int scope = SearchControls.SUBTREE_SCOPE;
+@UriParam(defaultValue = subtree, enums = object,onelevel,subtree)
+private String scope = SUBTREE_SCOPE_NAME;
 
 /**
  * Initializes the SpringLdapEndpoint using the provided template
+ *
  * @param templateName name of the LDAP template
  * @param ldapTemplate LDAP template, see 
org.springframework.ldap.core.LdapTemplate
  */
 public SpringLdapEndpoint(String templateName, LdapTemplate ldapTemplate) {
 this.templateName = templateName;
 this.ldapTemplate = ldapTemplate;
-if (null == operationMap) {
-initializeOperationMap();
-}
-
-if (null == scopeMap) {
-initializeScopeMap();
-}
-}
-
-private static void initializeScopeMap() {
-scopeMap = new HashMapString, Integer();
-
-scopeMap.put(OBJECT_SCOPE_NAME, SearchControls.OBJECT_SCOPE);
-scopeMap.put(ONELEVEL_SCOPE_NAME, SearchControls.ONELEVEL_SCOPE);
-scopeMap.put(SUBTREE_SCOPE_NAME, SearchControls.SUBTREE_SCOPE);
-}
-
-private static void initializeOperationMap() {
-operationMap = new HashMapString, LdapOperation();
-
-operationMap.put(LdapOperation.SEARCH.name(), LdapOperation.SEARCH);
-operationMap.put(LdapOperation.BIND.name(), LdapOperation.BIND);
-