[3/5] camel git commit: Component docs with enum should not only be assumed as string type

2016-12-22 Thread davsclaus
Component docs with enum should not only be assumed as string type


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

Branch: refs/heads/master
Commit: a39bdf6a3c6f0dda871e2dd12004adf63cdaab5f
Parents: 4724f36
Author: Claus Ibsen 
Authored: Thu Dec 22 16:52:54 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Dec 22 18:13:37 2016 +0100

--
 .../springboot/JmsComponentConfiguration.java|  2 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc |  8 
 .../src/main/docs/flatpack-component.adoc|  2 +-
 .../apache/camel/component/jms/JmsComponent.java |  1 -
 .../camel/tools/apt/helper/JsonSchemaHelper.java |  3 ++-
 .../maven/packaging/ReadmeComponentMojo.java |  3 +++
 .../SpringBootAutoConfigurationMojo.java |  6 +++---
 .../packaging/model/ComponentOptionModel.java| 19 ++-
 .../packaging/model/EndpointOptionModel.java |  9 +
 9 files changed, 37 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a39bdf6a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
--
diff --git 
a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
 
b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index 65b1c6c..3fd040a 100644
--- 
a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++ 
b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -294,7 +294,7 @@ public class JmsComponentConfiguration {
  * is the lowest priority and 9 is the highest). The explicitQosEnabled
  * option must also be enabled in order for this option to have any effect.
  */
-private Integer priority = Integer;
+private Integer priority = 4;
 /**
  * Specifies whether to inhibit the delivery of messages published by its
  * own connection.

http://git-wip-us.apache.org/repos/asf/camel/blob/a39bdf6a/components/camel-amqp/src/main/docs/amqp-component.adoc
--
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc 
b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 28330ac..f582d83 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -71,8 +71,8 @@ The AMQP component supports 74 options which are listed below.
 | durableSubscriptionName | common |  | String | The durable subscriber name 
for specifying durable topic subscriptions. The clientId option must be 
configured as well.
 | exceptionListener | advanced |  | ExceptionListener | Specifies the JMS 
Exception Listener that is to be notified of any underlying JMS exceptions.
 | errorHandler | advanced |  | ErrorHandler | Specifies a 
org.springframework.util.ErrorHandler to be invoked in case of any uncaught 
exceptions thrown while processing a Message. By default these exceptions will 
be logged at the WARN level if no errorHandler has been configured. You can 
configure logging level and whether stack traces should be logged using 
errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it 
much easier to configure than having to code a custom errorHandler.
-| errorHandlerLoggingLevel | advanced | WARN | LoggingLevel | Allows to 
configure the default errorHandler logging level for logging uncaught 
exceptions.
-| errorHandlerLogStackTrace | advanced | true | boolean | Allows to control 
whether stacktraces should be logged or not by the default errorHandler.
+| errorHandlerLoggingLevel | logging | WARN | LoggingLevel | Allows to 
configure the default errorHandler logging level for logging uncaught 
exceptions.
+| errorHandlerLogStackTrace | logging | true | boolean | Allows to control 
whether stacktraces should be logged or not by the default errorHandler.
 | explicitQosEnabled | producer | false | boolean | Set if the deliveryMode 
priority or timeToLive qualities of service should be used when sending 
messages. This option is based on Spring's JmsTemplate. The deliveryMode 
priority and timeToLive options are applied to the current endpoint. This 
contrasts with the preserveMessageQos option which operates at message 
granularity reading QoS properties exclusively 

[3/5] camel git commit: Component docs

2016-05-30 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/bb7874df
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb7874df
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb7874df

Branch: refs/heads/master
Commit: bb7874df392e898ea29ae7c92bbd848ab6aff6a6
Parents: 0871e28
Author: Claus Ibsen 
Authored: Mon May 30 08:16:19 2016 +0200
Committer: Claus Ibsen 
Committed: Mon May 30 08:16:19 2016 +0200

--
 components/camel-jms/src/main/docs/jms.adoc | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bb7874df/components/camel-jms/src/main/docs/jms.adoc
--
diff --git a/components/camel-jms/src/main/docs/jms.adoc 
b/components/camel-jms/src/main/docs/jms.adoc
index 590d3a4..672d208 100644
--- a/components/camel-jms/src/main/docs/jms.adoc
+++ b/components/camel-jms/src/main/docs/jms.adoc
@@ -210,8 +210,9 @@ Component options
 
 
 
+
 // component options: START
-The JMS component supports 71 options which are listed below.
+The JMS component supports 72 options which are listed below.
 
 
 
@@ -246,6 +247,7 @@ The JMS component supports 71 options which are listed 
below.
 | idleConsumerLimit | int | Specify the limit for the number of consumers that 
are allowed to be idle at any given time.
 | maxConcurrentConsumers | int | Specifies the maximum number of concurrent 
consumers when consuming from JMS (not for request/reply over JMS). See also 
the maxMessagesPerTask option to control dynamic scaling up/down of threads. 
When doing request/reply over JMS then the option replyToMaxConcurrentConsumers 
is used to control number of concurrent consumers on the reply message listener.
 | replyToMaxConcurrentConsumers | int | Specifies the maximum number of 
concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
+| replyOnTimeoutToMaxConcurrentConsumers | int | Specifies the maximum number 
of concurrent consumers for continue routing when timeout occurred when using 
request/reply over JMS.
 | maxMessagesPerTask | int | The number of messages per task. -1 is unlimited. 
If you use a range for concurrent consumers (eg min max) then this option can 
be used to set a value to eg 100 to control how fast the consumers will shrink 
when less work is required.
 | messageConverter | MessageConverter | To use a custom Spring 
org.springframework.jms.support.converter.MessageConverter so you can be in 
control how to map to/from a javax.jms.Message.
 | mapJmsMessage | boolean | Specifies whether Camel should auto map the 
received JMS message to a suited payload type such as javax.jms.TextMessage to 
a String etc. See section about how mapping works below for more details.
@@ -298,6 +300,7 @@ The JMS component supports 71 options which are listed 
below.
 
 
 
+
 [[JMS-Endpointoptions]]
 Endpoint options
 
@@ -307,8 +310,9 @@ Endpoint options
 
 
 
+
 // endpoint options: START
-The JMS component supports 78 endpoint options which are listed below:
+The JMS component supports 79 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -346,6 +350,7 @@ The JMS component supports 78 endpoint options which are 
listed below:
 | priority | producer | 4 | int | Values greater than 1 specify the message 
priority when sending (where 0 is the lowest priority and 9 is the highest). 
The explicitQosEnabled option must also be enabled in order for this option to 
have any effect.
 | replyToConcurrentConsumers | producer | 1 | int | Specifies the default 
number of concurrent consumers when doing request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
 | replyToMaxConcurrentConsumers | producer |  | int | Specifies the maximum 
number of concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads.
+| replyToOnTimeoutMaxConcurrentConsumers | producer | 1 | int | Specifies the 
maximum number of concurrent consumers for continue routing when timeout 
occurred when using request/reply over JMS.
 | replyToOverride | producer |  | String | Provides an explicit ReplyTo 
destination in the JMS message which overrides the setting of replyTo. It is 
useful if you want to forward the message to a remote Queue and receive the 
reply message from the ReplyTo destination.
 | replyToType | producer |  | ReplyToType | Allows for explicitly specifying 
which kind of strategy to use for replyTo queues when doing request/reply over 
JMS. Possible values are: 

[3/5] camel git commit: Component docs

2016-01-07 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/e0de8bf3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0de8bf3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0de8bf3

Branch: refs/heads/master
Commit: e0de8bf3c84495d48131ec63f57708605fee10b5
Parents: 22d5c57
Author: Claus Ibsen 
Authored: Thu Jan 7 10:36:52 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 11:01:11 2016 +0100

--
 .../component/google/drive/GoogleDriveComponent.java   |  4 +++-
 .../google/drive/GoogleDriveConfiguration.java |  5 +++--
 .../component/google/drive/GoogleDriveEndpoint.java| 13 ++---
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e0de8bf3/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 55fd4d2..bcb2b25 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -80,6 +80,8 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/e0de8bf3/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
index 3f597af..a3c2218 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
@@ -34,10 +34,11 @@ public class GoogleDriveConfiguration {
 private static final List DEFAULT_SCOPES = 
Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, 
DriveScopes.DRIVE_METADATA_READONLY,
 DriveScopes.DRIVE);
 
-@UriPath @Metadata(required = "true")
+@UriPath(enums = 
"drive-about,drive-apps,drive-changes,drive-channels,drive-children,drive-comments,drive-files,drive-parents"
++ 
",drive-permissions,drive-properties,drive-realtime,drive-replies,drive-revisions")
 @Metadata(required = "true")
 private GoogleDriveApiName apiName;
 
-@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,untrash,update,watch")
+@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,trash,untrash,update,watch")
 @Metadata(required = "true")
 private String methodName;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e0de8bf3/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index c6769f2..c18b0e5 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
 /**
- * The google-driverr component provides access to Google Drive file storage 
service.
+ * The google-drive component provides access to Google Drive file storage 
service.
  */
 @UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = 
"google:drive:apiName/methodName",
 consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label 
= "api,cloud,file")
@@ -43,6 +43,9 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[3/5] camel git commit: Component docs

2016-01-07 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/7f4dd3c0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f4dd3c0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f4dd3c0

Branch: refs/heads/camel-2.16.x
Commit: 7f4dd3c0da43b3b8b60ab1a520363db95df4ef32
Parents: e559bcd
Author: Claus Ibsen 
Authored: Thu Jan 7 10:36:52 2016 +0100
Committer: Claus Ibsen 
Committed: Thu Jan 7 10:54:57 2016 +0100

--
 .../component/google/drive/GoogleDriveComponent.java   |  4 +++-
 .../google/drive/GoogleDriveConfiguration.java |  5 +++--
 .../component/google/drive/GoogleDriveEndpoint.java| 13 ++---
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7f4dd3c0/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
index 55fd4d2..bcb2b25 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveComponent.java
@@ -80,6 +80,8 @@ public class GoogleDriveComponent extends 
AbstractApiComponenthttp://git-wip-us.apache.org/repos/asf/camel/blob/7f4dd3c0/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
index 3f597af..a3c2218 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveConfiguration.java
@@ -34,10 +34,11 @@ public class GoogleDriveConfiguration {
 private static final List DEFAULT_SCOPES = 
Arrays.asList(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_APPS_READONLY, 
DriveScopes.DRIVE_METADATA_READONLY,
 DriveScopes.DRIVE);
 
-@UriPath @Metadata(required = "true")
+@UriPath(enums = 
"drive-about,drive-apps,drive-changes,drive-channels,drive-children,drive-comments,drive-files,drive-parents"
++ 
",drive-permissions,drive-properties,drive-realtime,drive-replies,drive-revisions")
 @Metadata(required = "true")
 private GoogleDriveApiName apiName;
 
-@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,untrash,update,watch")
+@UriPath(enums = 
"copy,delete,get,getIdForEmail,insert,list,patch,stop,touch,trash,untrash,update,watch")
 @Metadata(required = "true")
 private String methodName;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7f4dd3c0/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
--
diff --git 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
index d6e509c..c18b0e5 100644
--- 
a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
+++ 
b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/GoogleDriveEndpoint.java
@@ -33,7 +33,7 @@ import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
 /**
- * Represents a GoogleDrive endpoint.
+ * The google-drive component provides access to Google Drive file storage 
service.
  */
 @UriEndpoint(scheme = "google-drive", title = "Google Drive", syntax = 
"google:drive:apiName/methodName",
 consumerClass = GoogleDriveConsumer.class, consumerPrefix = "consumer", label 
= "api,cloud,file")
@@ -43,6 +43,9 @@ public class GoogleDriveEndpoint extends 
AbstractApiEndpoint

[3/5] camel git commit: Component docs

2015-06-14 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/1e1e1f9f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e1e1f9f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e1e1f9f

Branch: refs/heads/master
Commit: 1e1e1f9f69269ed4fdaa40a153871c8780bda219
Parents: be75520
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 10:06:38 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 13:08:07 2015 +0200

--
 .../camel/tools/apt/DocumentationHelper.java| 52 +++-
 .../tools/apt/EndpointAnnotationProcessor.java  |  2 +-
 .../camel/tools/apt/JsonSchemaHelper.java   | 89 
 3 files changed, 141 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e1e1f9f/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index 93a7ae5..37e190b 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -17,17 +17,67 @@
 package org.apache.camel.tools.apt;
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.camel.tools.apt.JsonSchemaHelper.parseJsonSchema;
 
 /**
  * Helper to find documentation for inherited options when a component extends 
another.
  */
 public final class DocumentationHelper {
 
-public static String findJavaDoc(String scheme, String fieldName) {
+public static String findJavaDoc(String scheme, String extendsScheme, 
String fieldName) {
+File file = jsonFile(scheme, extendsScheme);
+if (file != null) {
+FileInputStream fis = null;
+try {
+fis = new FileInputStream(file);
+String json = loadText(fis);
+ListMapString, String rows = parseJsonSchema(properties, 
json, true);
+
+for (MapString, String row : rows) {
+String name = row.get(name);
+String description = row.get(description);
+if (fieldName.equals(name)) {
+return description;
+}
+}
+} catch (Exception e) {
+// ignore
+} finally {
+IOHelper.close(fis);
+}
+}
+
+// not found
+return null;
+}
+
+private static File jsonFile(String scheme, String extendsScheme) {
+// TODO: scan components for each component and find component name 
from extendsScheme
+// and then find the package name where the json file is
+
+if (file.equals(extendsScheme)) {
+return new 
File(../../camel-core/target/classes/org/apache/camel/component/file/file.json);
+} else if (http.equals(extendsScheme)) {
+return new 
File(../camel-http/target/classes/org/apache/camel/component/http/http.json);
+} else if (https.equals(extendsScheme)) {
+return new 
File(../camel-http/target/classes/org/apache/camel/component/http/https.json);
+} else if (netty.equals(extendsScheme)) {
+return new 
File(../camel-netty/target/classes/org/apache/camel/component/netty/netty.json);
+} else if (netty4.equals(extendsScheme)) {
+return new 
File(../camel-netty4/target/classes/org/apache/camel/component/netty4/netty4.json);
+} else if (servlet.equals(extendsScheme)) {
+return new 
File(../camel-servlet/target/classes/org/apache/camel/component/servlet/servlet.json);
+}
+// not found
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1e1e1f9f/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 6cb7973..7f895ed 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
@@ -286,7 +286,7 @@ public class EndpointAnnotationProcessor 

[3/5] camel git commit: Component docs

2015-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/7f28a1e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f28a1e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f28a1e5

Branch: refs/heads/master
Commit: 7f28a1e5c63b664e7f656f87b9b87bd7bc5722b3
Parents: be2e819
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Apr 28 07:45:54 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Apr 28 07:45:54 2015 +0200

--
 .../integration/SpringIntegrationEndpoint.java  | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7f28a1e5/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
--
diff --git 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
index d8d1239..f3f816a 100644
--- 
a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
+++ 
b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
@@ -36,13 +36,13 @@ import org.springframework.integration.MessageChannel;
 @UriEndpoint(scheme = spring-integration, title = Spring Integration, 
syntax = spring-integration:defaultChannel,
 consumerClass = SpringIntegrationConsumer.class, label = 
spring,eventbus)
 public class SpringIntegrationEndpoint extends DefaultEndpoint {
+private MessageChannel messageChannel;
 @UriPath @Metadata(required = true)
 private String defaultChannel;
-@UriParam
+@UriParam(label = consumer)
 private String inputChannel;
-@UriParam
+@UriParam(label = producer)
 private String outputChannel;
-private MessageChannel messageChannel;
 @UriParam
 private boolean inOut;
 
@@ -73,6 +73,9 @@ public class SpringIntegrationEndpoint extends 
DefaultEndpoint {
 return answer;
 }
 
+/**
+ * The Spring integration input channel name that this endpoint wants to 
consume from Spring integration.
+ */
 public void setInputChannel(String input) {
 inputChannel = input;
 }
@@ -81,6 +84,9 @@ public class SpringIntegrationEndpoint extends 
DefaultEndpoint {
 return inputChannel;
 }
 
+/**
+ * The Spring integration output channel name that is used to send 
messages to Spring integration.
+ */
 public void setOutputChannel(String output) {
 outputChannel = output;
 }
@@ -89,6 +95,14 @@ public class SpringIntegrationEndpoint extends 
DefaultEndpoint {
 return outputChannel;
 }
 
+/**
+ * The default channel name which is used by the Spring Integration Spring 
context.
+ * It will equal to the inputChannel name for the Spring Integration 
consumer and the outputChannel name for the Spring Integration provider.
+ */
+public void setDefaultChannel(String defaultChannel) {
+this.defaultChannel = defaultChannel;
+}
+
 public String getDefaultChannel() {
 return defaultChannel;
 }
@@ -102,6 +116,10 @@ public class SpringIntegrationEndpoint extends 
DefaultEndpoint {
 return false;
 }
 
+/**
+ * The exchange pattern that the Spring integration endpoint should use.
+ * If inOut=true then a reply channel is expected, either from the Spring 
Integration Message header or configured on the endpoint.
+ */
 public void setInOut(boolean inOut) {
 this.inOut = inOut;
 }