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 2017/02/02 17:44:04 UTC
[2/2] camel git commit: Add missing doc
Add missing doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef4e7ed5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef4e7ed5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef4e7ed5
Branch: refs/heads/master
Commit: ef4e7ed52948fa7a44cb6ac685d9e5a5445d0bdd
Parents: 1ab55da
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Feb 2 18:43:54 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Feb 2 18:43:54 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/spring/CamelContextFactoryBean.java | 7 +++++++
components/readme.adoc | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ef4e7ed5/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index 1380a5d..a05b4f0 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -518,6 +518,10 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
this.properties = properties;
}
+ /**
+ * Configuration of CamelContext properties such as limit of debug logging
+ * and other general options.
+ */
public void setGlobalOptions(GlobalOptionsDefinition globalOptions) {
this.globalOptions = globalOptions;
}
@@ -924,6 +928,9 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
return beans;
}
+ /**
+ * Miscellaneous configurations
+ */
public void setBeans(List<?> beans) {
this.beans = beans;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ef4e7ed5/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 06b6a11..f2d34bf 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -166,7 +166,7 @@ Components
`elsql:elsqlName:resourceUri` | The elsql component is an extension to the existing SQL Component that uses ElSql to define the SQL queries.
| link:camel-etcd/src/main/docs/etcd-component.adoc[etcd] (camel-etcd) +
-`etcd:namespace/path` | The camel etcd component allows you to work with Etcd a distributed A distributed reliable key-value store.
+`etcd:namespace/path` | The camel etcd component allows you to work with Etcd a distributed reliable key-value store.
| link:camel-exec/src/main/docs/exec-component.adoc[Exec] (camel-exec) +
`exec:executable` | The exec component can be used to execute OS system commands.