Repository: camel
Updated Branches:
  refs/heads/master 1b7ddbefc -> 662dd8f99


Improve javadoc


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

Branch: refs/heads/master
Commit: 662dd8f99eed339f64bbed2db56850e13942608a
Parents: 1b7ddbe
Author: Claus Ibsen <davscl...@apache.org>
Authored: Wed Nov 23 10:17:25 2016 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Wed Nov 23 10:17:25 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/CamelContext.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/662dd8f9/camel-core/src/main/java/org/apache/camel/CamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/CamelContext.java 
b/camel-core/src/main/java/org/apache/camel/CamelContext.java
index 9b4ecac..e3710d8 100644
--- a/camel-core/src/main/java/org/apache/camel/CamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/CamelContext.java
@@ -1218,13 +1218,23 @@ public interface CamelContext extends 
SuspendableService, RuntimeConfiguration {
 
     /**
      * Sets the properties that can be referenced in the camel context
+     * <p/>
+     * <b>Important:</b> This has nothing to do with property placeholders, 
and is just a plain set of key/value pairs
+     * which are used to configure global settings on CamelContext, such as a 
maximum debug logging length etc.
+     * For property placeholders use {@link 
#resolvePropertyPlaceholders(String)} method and see more details
+     * at the <a 
href="http://camel.apache.org/using-propertyplaceholder.html";>property 
placeholder</a> documentation.
      *
      * @param properties properties
      */
     void setProperties(Map<String, String> properties);
 
     /**
-     * Gets the properties that can be referenced in the camel context
+     * Gets the properties that can be referenced in the camel context.
+     * <p/>
+     * <b>Important:</b> This has nothing to do with property placeholders, 
and is just a plain set of key/value pairs
+     * which are used to configure global settings on CamelContext, such as a 
maximum debug logging length etc.
+     * For property placeholders use {@link 
#resolvePropertyPlaceholders(String)} method and see more details
+     * at the <a 
href="http://camel.apache.org/using-propertyplaceholder.html";>property 
placeholder</a> documentation.
      *
      * @return the properties
      */
@@ -1232,6 +1242,11 @@ public interface CamelContext extends 
SuspendableService, RuntimeConfiguration {
 
     /**
      * Gets the property value that can be referenced in the camel context
+     * <p/>
+     * <b>Important:</b> This has nothing to do with property placeholders, 
and is just a plain set of key/value pairs
+     * which are used to configure global settings on CamelContext, such as a 
maximum debug logging length etc.
+     * For property placeholders use {@link 
#resolvePropertyPlaceholders(String)} method and see more details
+     * at the <a 
href="http://camel.apache.org/using-propertyplaceholder.html";>property 
placeholder</a> documentation.
      *
      * @return the string value of property
      */

Reply via email to