You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/03 12:39:20 UTC
[1/4] camel git commit: Component docs - Fixed invalid syntax in
language component
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x b98c8ae65 -> 6c211d494
refs/heads/master ec91dc5af -> ff75709b4
Component docs - Fixed invalid syntax in language component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/334f5e11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/334f5e11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/334f5e11
Branch: refs/heads/master
Commit: 334f5e112e742d5c7a8f84cdc13f80d03efd1999
Parents: ec91dc5
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 3 12:31:44 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 3 12:31:44 2016 +0100
----------------------------------------------------------------------
.../component/language/LanguageEndpoint.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/334f5e11/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
index a48b487..7afb5f1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
@@ -55,6 +55,9 @@ public class LanguageEndpoint extends ResourceEndpoint {
private boolean contentResolvedFromResource;
@UriPath(enums = "bean,constant,el,exchangeProperty,file,groovy,header,jsonpath,jxpath,mvel,ognl,ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize") @Metadata(required = "true")
private String languageName;
+ // resourceUri is optional in the language endpoint
+ @UriPath(description = "Path to the resource, or a reference to lookup a bean in the Registry to use as the resource") @Metadata(required = "false")
+ private String resourceUri;
@UriParam
private String script;
@UriParam(defaultValue = "true")
@@ -187,6 +190,21 @@ public class LanguageEndpoint extends ResourceEndpoint {
}
/**
+ * Path to the resource, or a reference to lookup a bean in the Registry to use as the resource
+ *
+ * @param resourceUri the resource path
+ */
+ @Override
+ public void setResourceUri(String resourceUri) {
+ super.setResourceUri(resourceUri);
+ }
+
+ @Override
+ public String getResourceUri() {
+ return super.getResourceUri();
+ }
+
+ /**
* Sets the script to execute
*
* @param script the script
[2/4] camel git commit: Component docs - Add missing options
Posted by da...@apache.org.
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/ff75709b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff75709b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff75709b
Branch: refs/heads/master
Commit: ff75709b44b172db405a78a93508fabe14a9c15e
Parents: 334f5e1
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 3 12:38:38 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 3 12:38:38 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/ff75709b/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 4d04342..29c26bb 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
@@ -54,7 +54,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<Exchange> queue;
private final Set<SedaProducer> producers = new CopyOnWriteArraySet<SedaProducer>();
private final Set<SedaConsumer> consumers = new CopyOnWriteArraySet<SedaConsumer>();
private volatile MulticastProcessor consumerMulticastProcessor;
@@ -63,6 +62,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;
@@ -239,7 +240,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.
* <p/>
* This option is only for rare use-cases where you want to use a custom queue instance.
*/
[4/4] camel git commit: Component docs - Add missing options
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Sun Jan 3 12:38:38 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
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<Exchange> queue;
private final Set<SedaProducer> producers = new CopyOnWriteArraySet<SedaProducer>();
private final Set<SedaConsumer> consumers = new CopyOnWriteArraySet<SedaConsumer>();
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.
* <p/>
* This option is only for rare use-cases where you want to use a custom queue instance.
*/
[3/4] camel git commit: Component docs - Fixed invalid syntax in
language component
Posted by da...@apache.org.
Component docs - Fixed invalid syntax in language component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/783e0196
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/783e0196
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/783e0196
Branch: refs/heads/camel-2.16.x
Commit: 783e019619b7d6594aef0a5c26d970241b582b90
Parents: b98c8ae
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 3 12:31:44 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 3 12:39:00 2016 +0100
----------------------------------------------------------------------
.../component/language/LanguageEndpoint.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/783e0196/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
index 96105ac..9bacf5b 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
@@ -49,6 +49,9 @@ public class LanguageEndpoint extends ResourceEndpoint {
private boolean contentResolvedFromResource;
@UriPath(enums = "bean,constant,el,exchangeProperty,file,groovy,header,jsonpath,jxpath,mvel,ognl,ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize") @Metadata(required = "true")
private String languageName;
+ // resourceUri is optional in the language endpoint
+ @UriPath(description = "Path to the resource, or a reference to lookup a bean in the Registry to use as the resource") @Metadata(required = "false")
+ private String resourceUri;
@UriParam
private String script;
@UriParam(defaultValue = "true")
@@ -181,6 +184,21 @@ public class LanguageEndpoint extends ResourceEndpoint {
}
/**
+ * Path to the resource, or a reference to lookup a bean in the Registry to use as the resource
+ *
+ * @param resourceUri the resource path
+ */
+ @Override
+ public void setResourceUri(String resourceUri) {
+ super.setResourceUri(resourceUri);
+ }
+
+ @Override
+ public String getResourceUri() {
+ return super.getResourceUri();
+ }
+
+ /**
* Sets the script to execute
*
* @param script the script