[4/4] camel git commit: Component docs - Adjust tables as the previous attempt did not look so good.

2017-03-17 Thread davsclaus 
Component docs - Adjust tables as the previous attempt did not look so good.


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

Branch: refs/heads/master
Commit: 1f50c7291f73a0738b8f5e13481cd550ed639f57
Parents: 0b074a7
Author: Claus Ibsen 
Authored: Fri Mar 17 12:10:22 2017 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 17 13:16:54 2017 +0100

--
 .../tools/apt/EndpointAnnotationProcessor.java  |  3 +-
 .../maven/camel-package-maven-plugin/pom.xml|  7 ++
 .../camel/maven/packaging/StringHelper.java | 74 
 .../packaging/model/ComponentOptionModel.java   | 28 
 .../packaging/model/EndpointOptionModel.java| 26 +++
 .../src/main/resources/component-options.mvel   |  3 +-
 .../src/main/resources/endpoint-options.mvel|  5 +-
 7 files changed, 140 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1f50c729/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 561dce8..3c7a381 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -452,7 +452,8 @@ public class EndpointAnnotationProcessor extends 
AbstractProcessor {
 }
 
 // skip unwanted methods as they are inherited from default 
component and are not intended for end users to configure
-if ("setEndpointClass".equals(methodName) || 
"setCamelContext".equals(methodName) || 
"setEndpointHeaderFilterStrategy".equals(methodName)) {
+if ("setEndpointClass".equals(methodName) || 
"setCamelContext".equals(methodName)
+|| "setEndpointHeaderFilterStrategy".equals(methodName) || 
"setApplicationContext".equals(methodName)) {
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1f50c729/tooling/maven/camel-package-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml 
b/tooling/maven/camel-package-maven-plugin/pom.xml
index c702518..24bbc02 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -105,6 +105,13 @@
   ${asciidoctorj-version}
 
 
+
+
+  com.google.guava
+  guava
+  ${google-guava-version}
+
+
 
 
   org.jboss.forge.roaster

http://git-wip-us.apache.org/repos/asf/camel/blob/1f50c729/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
index d7829ae..2f0dfcd 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/StringHelper.java
@@ -18,6 +18,8 @@ package org.apache.camel.maven.packaging;
 
 import java.util.Collection;
 
+import com.google.common.base.CaseFormat;
+
 public final class StringHelper {
 
 private StringHelper() {
@@ -97,4 +99,76 @@ public final class StringHelper {
 return answer;
 }
 
+/**
+ * To wrap long camel cased texts by words.
+ *
+ * @param option  the option which is camel cased.
+ * @param watermark a watermark to denote the size to cut after
+ * @param newLine the new line to use when breaking into a new line
+ */
+public static String wrapCamelCaseWords(String option, int watermark, 
String newLine) {
+String text = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, 
option);
+text = text.replace('-', ' ');
+text = wrapWords(text, "\n", watermark, false);
+text = text.replace(' ', '-');
+text = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, text);
+text = text.replaceAll("\\n", newLine);
+return text;
+}
+
+/**
+ * To wrap a big line by words.
+ *
+ * @param line the big

[4/4] camel git commit: Component docs - polished

2017-03-06 Thread davsclaus 
Component docs - polished


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

Branch: refs/heads/master
Commit: 71d4ae2a73b97de638948aa73c8f13d190423e02
Parents: 6cc7224
Author: Claus Ibsen 
Authored: Mon Mar 6 18:35:09 2017 +0100
Committer: Claus Ibsen 
Committed: Mon Mar 6 18:35:09 2017 +0100

--
 camel-core/src/main/docs/bean-component.adoc | 8 +---
 camel-core/src/main/docs/binding-component.adoc  | 8 +---
 camel-core/src/main/docs/browse-component.adoc   | 8 +---
 camel-core/src/main/docs/class-component.adoc| 8 +---
 camel-core/src/main/docs/controlbus-component.adoc   | 8 +---
 camel-core/src/main/docs/dataformat-component.adoc   | 8 +---
 camel-core/src/main/docs/dataset-component.adoc  | 8 +---
 camel-core/src/main/docs/direct-component.adoc   | 8 +---
 camel-core/src/main/docs/direct-vm-component.adoc| 8 +---
 camel-core/src/main/docs/file-component.adoc | 8 +---
 camel-core/src/main/docs/language-component.adoc | 8 +---
 camel-core/src/main/docs/log-component.adoc  | 8 +---
 camel-core/src/main/docs/mock-component.adoc | 8 +---
 camel-core/src/main/docs/properties-component.adoc   | 8 +---
 camel-core/src/main/docs/ref-component.adoc  | 8 +---
 camel-core/src/main/docs/rest-api-component.adoc | 8 +---
 camel-core/src/main/docs/rest-component.adoc | 8 +---
 camel-core/src/main/docs/scheduler-component.adoc| 8 +---
 camel-core/src/main/docs/seda-component.adoc | 8 +---
 camel-core/src/main/docs/stub-component.adoc | 8 +---
 camel-core/src/main/docs/test-component.adoc | 8 +---
 camel-core/src/main/docs/timer-component.adoc| 8 +---
 camel-core/src/main/docs/validator-component.adoc| 8 +---
 camel-core/src/main/docs/vm-component.adoc   | 8 +---
 camel-core/src/main/docs/xslt-component.adoc | 8 +---
 components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc  | 4 +++-
 components/camel-ahc/src/main/docs/ahc-component.adoc| 4 +++-
 components/camel-amqp/src/main/docs/amqp-component.adoc  | 4 +++-
 components/camel-apns/src/main/docs/apns-component.adoc  | 4 +++-
 .../camel-asterisk/src/main/docs/asterisk-component.adoc | 4 +++-
 components/camel-atmos/src/main/docs/atmos-component.adoc| 4 +++-
 .../src/main/docs/atmosphere-websocket-component.adoc| 4 +++-
 components/camel-atom/src/main/docs/atom-component.adoc  | 4 +++-
 components/camel-avro/src/main/docs/avro-component.adoc  | 4 +++-
 components/camel-aws/src/main/docs/aws-cw-component.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-ddb-component.adoc| 4 +++-
 .../camel-aws/src/main/docs/aws-ddbstream-component.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-ec2-component.adoc| 4 +++-
 .../camel-aws/src/main/docs/aws-kinesis-component.adoc   | 4 +++-
 components/camel-aws/src/main/docs/aws-s3-component.adoc | 4 +++-
 components/camel-aws/src/main/docs/aws-sdb-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-ses-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-sns-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-sqs-component.adoc| 4 +++-
 components/camel-aws/src/main/docs/aws-swf-component.adoc| 4 +++-
 .../camel-azure/src/main/docs/azure-blob-component.adoc  | 4 +++-
 .../camel-azure/src/main/docs/azure-queue-component.adoc | 4 +++-
 .../src/main/docs/bean-validator-component.adoc  | 4 +++-
 .../camel-beanstalk/src/main/docs/beanstalk-component.adoc   | 4 +++-
 components/camel-bonita/src/main/docs/bonita-component.adoc  | 4 +++-
 .../camel-box-component/src/main/docs/box-component.adoc | 4 +++-
 .../camel-braintree/src/main/docs/braintree-component.adoc   | 4 +++-
 components/camel-cache/src/main/docs/cache-component.adoc| 4 +++-
 .../camel-cassandraql/src/main/docs/cql-component.adoc   | 4 +++-
 .../src/main/docs/chronicle-engine-component.adoc| 4 +++-
 components/camel-chunk/src/main/docs/chunk-component.adoc| 4 +++-
 components/camel-cm-sms/src/main/docs/cm-sms-component.adoc  | 4 +++-
 components/camel-cmis/src/main/docs/cmis-component.adoc  | 4 +++-
 components/camel-coap/src/main/docs/coap-component.adoc  | 4 +++-
 components/camel-cometd/src/main/docs/cometd-component.adoc  | 4 +++-

[4/4] camel git commit: Component docs

2016-08-20 Thread davsclaus 
Component docs


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

Branch: refs/heads/master
Commit: 62e03a732166cce6dc88603ae30dce21c76c0781
Parents: 9d0c661
Author: Claus Ibsen 
Authored: Sat Aug 20 11:26:37 2016 +0200
Committer: Claus Ibsen 
Committed: Sat Aug 20 11:26:37 2016 +0200

--
 .../src/main/docs/xstream-dataformat.adoc   | 27 
 1 file changed, 27 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/62e03a73/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
--
diff --git a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc 
b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
index 14ce541..ea7e217 100644
--- a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
@@ -22,6 +22,33 @@ Maven users will need to add the following dependency to 
their
 
 --
 
+[[XStream-Options]]
+Options
+^^^
+
+// dataformat options: START
+The XStream dataformat supports 9 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,1m,6",options="header"]
+|===
+| Name | Default | Java Type | Description
+| permissions |  | String | Adds permissions that controls which Java packages 
and classes XStream is allowed to use during unmarshal from xml/json to Java 
beans. A permission must be configured either here or globally using a JVM 
system property. The permission can be specified in a syntax where a plus sign 
is allow and minus sign is deny. Wildcards is supported by using . as prefix. 
For example to allow com.foo and all subpackages then specfy com.foo.. Multiple 
permissions can be configured separated by comma such as 
com.foo.-com.foo.bar.MySecretBean. The following default permission is always 
included: -java.lang.java.util. unless its overridden by specifying a JVM 
system property with they key org.apache.camel.xstream.permissions.
+| encoding |  | String | Sets the encoding to use
+| driver |  | String | To use a custom XStream driver. The instance must be of 
type com.thoughtworks.xstream.io.HierarchicalStreamDriver
+| driverRef |  | String | To refer to a custom XStream driver to lookup in the 
registry. The instance must be of type 
com.thoughtworks.xstream.io.HierarchicalStreamDriver
+| mode |  | String | Mode for dealing with duplicate references The possible 
values are: NO_REFERENCES ID_REFERENCES XPATH_RELATIVE_REFERENCES 
XPATH_ABSOLUTE_REFERENCES SINGLE_NODE_XPATH_RELATIVE_REFERENCES 
SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES
+| converters |  | List | List of class names for using custom XStream 
converters. The classes must be of type 
com.thoughtworks.xstream.converters.Converter
+| aliases |  | Map | Alias a Class to a shorter name to be used in XML 
elements.
+| omitFields |  | Map | Prevents a field from being serialized. To omit a 
field you must always provide the declaring type and not necessarily the type 
that is converted.
+| implicitCollections |  | Map | Adds a default implicit collection which is 
used for any unmapped XML tag.
+|===
+{% endraw %}
+// dataformat options: END
+
+
 [[XStream-UsingtheJavaDSL]]
 Using the Java DSL
 ^^

[4/4] camel git commit: Component docs

2016-04-28 Thread davsclaus 
Component docs


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

Branch: refs/heads/camel-2.17.x
Commit: 7aa181a4d1c14378dbc046b0a83cfb4fac3fd1e6
Parents: 7459007
Author: Claus Ibsen 
Authored: Thu Apr 28 21:04:23 2016 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 28 21:04:23 2016 +0200

--
 components/camel-etcd/src/main/docs/etcd.adoc | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7aa181a4/components/camel-etcd/src/main/docs/etcd.adoc
--
diff --git a/components/camel-etcd/src/main/docs/etcd.adoc 
b/components/camel-etcd/src/main/docs/etcd.adoc
index d19db9f..3632b0d 100644
--- a/components/camel-etcd/src/main/docs/etcd.adoc
+++ b/components/camel-etcd/src/main/docs/etcd.adoc
@@ -8,8 +8,9 @@
 
 
 
+
 // endpoint options: START
-The etcd component supports 14 endpoint options which are listed below:
+The etcd component supports 15 endpoint options which are listed below:
 
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
@@ -25,6 +26,7 @@ The etcd component supports 14 endpoint options which are 
listed below:
 | timeToLive | producer |  | Integer | To set the lifespan of a key in 
milliseconds.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+| fromIndex | advance | 0 | Long | The index to watch from
 | password | security |  | String | The password to use for basic 
authentication.
 | sslContextParameters | security |  | SSLContextParameters | To configure 
security using SSLContextParameters.
 | userName | security |  | String | The user name to use for basic 
authentication.
@@ -40,6 +42,7 @@ The etcd component supports 14 endpoint options which are 
listed below:
 
 
 
+
 // component options: START
 The etcd component has no options.
 // component options: END

[4/4] camel git commit: Component docs

2016-01-06 Thread davsclaus 
Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: aead21aaa0f20f00a4ffa5cc31eb570e3eb5cd63
Parents: 8c49ea9
Author: Claus Ibsen 
Authored: Wed Jan 6 19:15:14 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Jan 6 19:16:42 2016 +0100

--
 .../java/org/apache/camel/component/jcr/JcrEndpoint.java |  2 +-
 .../org/apache/camel/component/jcr/JcrConsumerTest.java  | 11 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/aead21aa/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
--
diff --git 
a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
 
b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
index 6a37d78..ca9bb5d 100644
--- 
a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
+++ 
b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
@@ -45,7 +45,7 @@ public class JcrEndpoint extends DefaultEndpoint {
 
 @UriPath @Metadata(required = "true")
 private String host;
-@UriPath @Metadata(required = "true")
+@UriPath
 private String base;
 @UriParam
 private String username;

http://git-wip-us.apache.org/repos/asf/camel/blob/aead21aa/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
--
diff --git 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
index 01dcb1f..65a8ad0 100644
--- 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
+++ 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
@@ -39,9 +39,6 @@ public class JcrConsumerTest extends JcrRouteTestSupport {
 private static final Logger LOG = 
LoggerFactory.getLogger(JcrConsumerTest.class);
 
 private String absPath = "/home/test";
-private int eventTypes = Event.NODE_ADDED;
-private boolean deep = true;
-private boolean noLocal;
 
 @Test
 public void testJcrConsumer() throws Exception {
@@ -104,12 +101,8 @@ public class JcrConsumerTest extends JcrRouteTestSupport {
 return new RouteBuilder() {
 @Override
 public void configure() throws Exception {
-String uri = "jcr://user:pass@repository";
-uri += absPath;
-uri += "?eventTypes=" + eventTypes;
-uri += "=" + deep;
-uri += "=" + noLocal;
-from(uri).to("direct:a");
+
from("jcr://user:pass@repository/home/test?eventTypes=1=true=false")
+.to("direct:a");
 }
 };
 }

[4/4] camel git commit: Component docs

2016-01-06 Thread davsclaus 
Component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 8c49ea9c830a22b2d6bdfd17a257ced8f92308ba
Parents: 74b78a1
Author: Claus Ibsen 
Authored: Wed Jan 6 18:27:00 2016 +0100
Committer: Claus Ibsen 
Committed: Wed Jan 6 18:28:35 2016 +0100

--
 .../processor/XmlSignatureConfiguration.java   |  4 ++--
 .../xmlsecurity/processor/XmlSignerConfiguration.java  |  1 +
 .../processor/XmlVerifierConfiguration.java| 13 -
 .../component/xmlsecurity/SpringXmlSignatureTests.xml  |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
--
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
index 5d72aa1..3c0648e 100644
--- 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
@@ -32,8 +32,6 @@ import org.apache.camel.spi.UriParams;
 public abstract class XmlSignatureConfiguration implements Cloneable, 
CamelContextAware {
 
 private CamelContext context;
-private URIDereferencer uriDereferencer;
-
 @UriParam(label = "common")
 private String baseUri;
 @UriParam(label = "common")
@@ -48,6 +46,8 @@ public abstract class XmlSignatureConfiguration implements 
Cloneable, CamelConte
 private String schemaResourceUri;
 @UriParam(label = "common")
 private String outputXmlEncoding;
+@UriParam(label = "advanced")
+private URIDereferencer uriDereferencer;
 
 public XmlSignatureConfiguration() {
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
--
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
index ee22768..112c345 100644
--- 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerConfiguration.java
@@ -40,6 +40,7 @@ public class XmlSignerConfiguration extends 
XmlSignatureConfiguration {
 
 @UriParam(label = "sign")
 private XPathFilterParameterSpec parentXpath;
+@UriParam(label = "sign")
 private List xpathsToIdAttributes = 
Collections.emptyList();
 @UriParam(label = "sign")
 private List transformMethods = 
Collections.singletonList(XmlSignatureHelper

http://git-wip-us.apache.org/repos/asf/camel/blob/8c49ea9c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
--
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
index dba59c6..b89159a 100644
--- 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlVerifierConfiguration.java
@@ -43,7 +43,7 @@ public class XmlVerifierConfiguration extends 
XmlSignatureConfiguration {
 @UriParam(label = "verify")
 private ValidationFailedHandler validationFailedHandler = new 
DefaultValidationFailedHandler();
 private String validationFailedHandlerName;
-@UriParam(label = "verify")
+@UriParam(label = "verify", javaType = "java.lang.String")
 private Object outputNodeSearch;
 @UriParam(label = "verify", defaultValue = 
DefaultXmlSignature2Message.OUTPUT_NODE_SEARCH_TYPE_DEFAULT)

[4/4] camel git commit: Component docs - Add missing options

2016-01-03 Thread davsclaus 
Component docs - Add missing options


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

Branch: refs/heads/camel-2.16.x
Commit: 6c211d494b90a6c770cce91efd0f34782173f7f9
Parents: 783e019
Author: Claus Ibsen 
Authored: Sun Jan 3 12:38:38 2016 +0100
Committer: Claus Ibsen 
Committed: Sun Jan 3 12:39:06 2016 +0100

--
 .../main/java/org/apache/camel/component/seda/SedaEndpoint.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6c211d49/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 23f6d91..6c2a794 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -56,7 +56,6 @@ import org.slf4j.LoggerFactory;
 @UriEndpoint(scheme = "seda", title = "SEDA", syntax = "seda:name", 
consumerClass = SedaConsumer.class, label = "core,endpoint")
 public class SedaEndpoint extends DefaultEndpoint implements 
BrowsableEndpoint, MultipleConsumersSupport {
 private static final Logger LOG = 
LoggerFactory.getLogger(SedaEndpoint.class);
-private volatile BlockingQueue queue;
 private final Set producers = new 
CopyOnWriteArraySet();
 private final Set consumers = new 
CopyOnWriteArraySet();
 private volatile MulticastProcessor consumerMulticastProcessor;
@@ -65,6 +64,8 @@ public class SedaEndpoint extends DefaultEndpoint implements 
BrowsableEndpoint,
 
 @UriPath(description = "Name of queue") @Metadata(required = "true")
 private String name;
+@UriParam(label = "advanced", description = "Define the queue instance 
which will be used by the endpoint")
+private BlockingQueue queue;
 @UriParam(defaultValue = "" + Integer.MAX_VALUE)
 private int size = Integer.MAX_VALUE;
 
@@ -241,7 +242,7 @@ public class SedaEndpoint extends DefaultEndpoint 
implements BrowsableEndpoint,
 }
 
 /**
- * Define the queue instance which will be used by seda endpoint.
+ * Define the queue instance which will be used by the endpoint.
  * 
  * This option is only for rare use-cases where you want to use a custom 
queue instance.
  */

[4/4] camel git commit: Component docs - fixed issue with sql not including all of them

2016-01-02 Thread davsclaus 
Component docs - fixed issue with sql 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/5e13
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e13
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e13

Branch: refs/heads/camel-2.16.x
Commit: 5e1329d57913510e72d8f515d4e4eddc77ae
Parents: fbb31ad
Author: Claus Ibsen 
Authored: Sat Jan 2 23:12:49 2016 +0100
Committer: Claus Ibsen 
Committed: Sat Jan 2 23:16:05 2016 +0100

--
 .../camel/component/sql/DefaultSqlEndpoint.java  | 19 +--
 .../apache/camel/component/sql/SqlComponent.java |  3 ++-
 .../camel/component/sql/SqlDataSourceTest.java   |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5e13/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
index 0f7d4ce..67e8f23 100644
--- 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
+++ 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
@@ -85,7 +85,7 @@ public abstract class DefaultSqlEndpoint extends 
DefaultPollingEndpoint {
 private boolean alwaysPopulateStatement;
 @UriParam(defaultValue = ",",
 description = "The separator to use when parameter values is taken 
from message body (if the body is a String type), to be inserted at # 
placeholders."
-+ "Notice if you use named parameters, then a Map type is used 
instead. The default value is ,")
++ "Notice if you use named parameters, then a Map type is used 
instead. The default value is comma")
 private char separator = ',';
 @UriParam(defaultValue = "SelectList", description = "Make the output of 
consumer or producer to SelectList as List of Map, or SelectOne as single Java 
object in the following way:"
 + "a) If the query has only single column, then that JDBC Column 
object is returned. (such as SELECT COUNT( * ) FROM PROJECT will return a Long 
object."
@@ -107,6 +107,9 @@ public abstract class DefaultSqlEndpoint extends 
DefaultPollingEndpoint {
 private String outputHeader;
 @UriParam(label = "producer", description = "Whether to use the message 
body as the SQL and then headers for parameters. If this option is enabled then 
the SQL in the uri is not used.")
 private boolean useMessageBodyForSql;
+@UriParam(label = "advanced", defaultValue = "#", description = "Specifies 
a character that will be replaced to ? in SQL query."
++ " Notice, that it is simple String.replaceAll() operation and no 
SQL parsing is involved (quoted strings will also change).")
+private String placeholder = "#";
 
 public DefaultSqlEndpoint() {
 }
@@ -249,7 +252,7 @@ public abstract class DefaultSqlEndpoint extends 
DefaultPollingEndpoint {
  * The separator to use when parameter values is taken from message body 
(if the body is a String type), to be inserted at # placeholders.
  * Notice if you use named parameters, then a Map type is used instead.
  * 
- * The default value is ,
+ * The default value is comma.
  */
 public void setSeparator(char separator) {
 this.separator = separator;
@@ -400,6 +403,18 @@ public abstract class DefaultSqlEndpoint extends 
DefaultPollingEndpoint {
 this.breakBatchOnConsumeFail = breakBatchOnConsumeFail;
 }
 
+public String getPlaceholder() {
+return placeholder;
+}
+
+/**
+ * Specifies a character that will be replaced to ? in SQL query.
+ * Notice, that it is simple String.replaceAll() operation and no SQL 
parsing is involved (quoted strings will also change).
+ */
+public void setPlaceholder(String placeholder) {
+this.placeholder = placeholder;
+}
+
 @SuppressWarnings("unchecked")
 public List queryForList(ResultSet rs, boolean allowMapToClass) throws 
SQLException {
 if (allowMapToClass && outputClass != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/5e13/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
--
diff --git 
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
 
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java
index 7236392..0446520 100755
---

[4/4] camel git commit: Component docs

2015-06-18 Thread davsclaus 
Component docs


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

Branch: refs/heads/master
Commit: fc38b2e675490aab7e8cdcb079c04e5d169ebd2a
Parents: d38ffcf
Author: Claus Ibsen davscl...@apache.org
Authored: Thu Jun 18 14:01:18 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Jun 18 14:01:18 2015 +0200

--
 .../component/jetty/JettyHttpComponent.java | 29 
 1 file changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fc38b2e6/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c6c47ac..95b1185 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -49,6 +49,7 @@ import org.apache.camel.component.http.UrlRewrite;
 import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.spi.ManagementAgent;
 import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.RestConfiguration;
 import org.apache.camel.spi.RestConsumerFactory;
 import org.apache.camel.util.FileUtil;
@@ -481,6 +482,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * The key password, which is used to access the certificate's key entry 
in the keystore (this is the same password that is supplied to the keystore 
command's -keypass option).
  */
+@Metadata(description = The key password, which is used to access the 
certificate's key entry in the keystore (this is the same password that is 
supplied to the keystore command's -keypass option).)
 public void setSslKeyPassword(String sslKeyPassword) {
 this.sslKeyPassword = sslKeyPassword;
 }
@@ -492,6 +494,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * The ssl password, which is required to access the keystore file (this 
is the same password that is supplied to the keystore command's -storepass 
option).
  */
+@Metadata(description = The ssl password, which is required to access the 
keystore file (this is the same password that is supplied to the keystore 
command's -storepass option).)
 public void setSslPassword(String sslPassword) {
 this.sslPassword = sslPassword;
 }
@@ -499,6 +502,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * Specifies the location of the Java keystore file, which contains the 
Jetty server's own X.509 certificate in a key entry.
  */
+@Metadata(description = Specifies the location of the Java keystore file, 
which contains the Jetty server's own X.509 certificate in a key entry.)
 public void setKeystore(String sslKeystore) {
 this.sslKeystore = sslKeystore;
 }
@@ -514,6 +518,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * This option is used to set the ErrorHandler that Jetty server uses.
  */
+@Metadata(description = This option is used to set the ErrorHandler that 
Jetty server uses.)
 public void setErrorHandler(ErrorHandler errorHandler) {
 this.errorHandler = errorHandler;
 }
@@ -626,6 +631,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * A map which contains per port number specific SSL connectors.
  */
+@Metadata(description = A map which contains per port number specific SSL 
connectors.)
 public void setSslSocketConnectors(Map Integer, Connector connectors) {
 sslSocketConnectors = connectors;
 }
@@ -633,6 +639,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 /**
  * A map which contains per port number specific HTTP connectors. Uses the 
same principle as sslSocketConnectors.
  */
+@Metadata(description = A map which contains per port number specific 
HTTP connectors. Uses the same principle as sslSocketConnectors.)
 public void setSocketConnectors(MapInteger, Connector socketConnectors) {
 this.socketConnectors = socketConnectors;
 }
@@ -707,6 +714,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent

[4/4] camel git commit: Component docs

2015-06-14 Thread acosentino 
Component docs


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

Branch: refs/heads/master
Commit: bd881496e4bc80695d4a26c4334c91b51f754554
Parents: 8252672
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 23:53:56 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 23:53:56 2015 +0200

--
 .../org/apache/camel/component/http4/HttpServerTestSupport.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd881496/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
index 7fc1cc8..4a63e86 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
@@ -26,8 +26,7 @@ import org.apache.http.protocol.HttpProcessor;
 
 /**
  * Abstract base class for unit testing using a http server.
- * The setUp method starts the server before the camel context is started and
- * the tearDown method stops the server after the camel context is stopped.
+ * This class contains an empty configuration to be used.
  *
  * @version
  */

[4/4] camel git commit: Component docs

2015-05-11 Thread davsclaus 
Component docs


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

Branch: refs/heads/master
Commit: 4cc3541bef457d2b2a6c02f51bda2270a2082047
Parents: 5d66a29
Author: Claus Ibsen davscl...@apache.org
Authored: Mon May 11 09:31:13 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon May 11 09:31:13 2015 +0200

--
 .../component/cassandra/CassandraEndpoint.java  | 36 
 1 file changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4cc3541b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
--
diff --git 
a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
 
b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
index a1d1495..0e28d9f 100644
--- 
a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
+++ 
b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
@@ -185,6 +185,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return beanRef;
 }
 
+/**
+ * Instead of using a hostname:port, refer to an existing configured 
Session or Cluster from the Camel registry to be used.
+ */
 public void setBean(String beanRef) {
 this.beanRef = beanRef;
 }
@@ -203,6 +206,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return hosts;
 }
 
+/**
+ * Hostname(s) cassansdra server(s). Multiple hosts can be separated by 
comma.
+ */
 public void setHosts(String hosts) {
 this.hosts = hosts;
 }
@@ -211,6 +217,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return port;
 }
 
+/**
+ * Port number of cassansdra server(s)
+ */
 public void setPort(Integer port) {
 this.port = port;
 }
@@ -219,6 +228,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return keyspace;
 }
 
+/**
+ * Keyspace to use
+ */
 public void setKeyspace(String keyspace) {
 this.keyspace = keyspace;
 }
@@ -227,6 +239,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return cql;
 }
 
+/**
+ * CQL query to perform. Can be overridden with the message header with 
key CamelCqlQuery.
+ */
 public void setCql(String cql) {
 this.cql = cql;
 }
@@ -235,6 +250,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return cluster;
 }
 
+/**
+ * To use the Cluster instance (you would normally not use this option)
+ */
 public void setCluster(Cluster cluster) {
 this.cluster = cluster;
 }
@@ -247,6 +265,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 }
 }
 
+/**
+ * To use the Session instance (you would normally not use this option)
+ */
 public void setSession(Session session) {
 this.session = session;
 }
@@ -255,6 +276,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return clusterName;
 }
 
+/**
+ * Cluster name
+ */
 public void setClusterName(String clusterName) {
 this.clusterName = clusterName;
 }
@@ -263,6 +287,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return username;
 }
 
+/**
+ * Username for session authentication
+ */
 public void setUsername(String username) {
 this.username = username;
 }
@@ -271,6 +298,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return password;
 }
 
+/**
+ * Password for session authentication
+ */
 public void setPassword(String password) {
 this.password = password;
 }
@@ -279,6 +309,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return consistencyLevel;
 }
 
+/**
+ * Consistency level to use
+ */
 public void setConsistencyLevel(ConsistencyLevel consistencyLevel) {
 this.consistencyLevel = consistencyLevel;
 }
@@ -287,6 +320,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 return resultSetConversionStrategy;
 }
 
+/**
+ * To use a custom class that implements logic for converting ResultSet 
into message body ALL, ONE, LIMIT_10, LIMIT_100...
+ */
 public void setResultSetConversionStrategy(ResultSetConversionStrategy 
resultSetConversionStrategy) {
 this.resultSetConversionStrategy =