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/06/23 14:02:32 UTC
[3/3] camel git commit: CAMEL-11441: Main -
setPropertyPlaceholderLocations should be public
CAMEL-11441: Main - setPropertyPlaceholderLocations should be public
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9cf169c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9cf169c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9cf169c
Branch: refs/heads/camel-2.18.x
Commit: b9cf169c07343e275366bb9cce98367428518edf
Parents: 31c9422
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jun 23 15:58:37 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jun 23 16:02:22 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/main/Main.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b9cf169c/camel-core/src/main/java/org/apache/camel/main/Main.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/main/Main.java b/camel-core/src/main/java/org/apache/camel/main/Main.java
index 0c12d6d..f19b567 100644
--- a/camel-core/src/main/java/org/apache/camel/main/Main.java
+++ b/camel-core/src/main/java/org/apache/camel/main/Main.java
@@ -116,7 +116,17 @@ public class Main extends MainSupport {
throw new IllegalStateException("Error creating CamelContext");
}
}
-
+
+ /**
+ * A list of locations to load properties. You can use comma to separate multiple locations.
+ * This option will override any default locations and only use the locations from this option.
+ */
+ public void setPropertyPlaceholderLocations(String location) {
+ PropertiesComponent pc = new PropertiesComponent();
+ pc.setLocation(location);
+ bind("properties", pc);
+ }
+
// Implementation methods
// -------------------------------------------------------------------------
@@ -175,13 +185,4 @@ public class Main extends MainSupport {
return new DefaultCamelContext();
}
- /**
- * A list of locations to load properties. You can use comma to separate multiple locations.
- * This option will override any default locations and only use the locations from this option.
- */
- protected void setPropertyPlaceholderLocations(String location) {
- PropertiesComponent pc = new PropertiesComponent();
- pc.setLocation(location);
- bind("properties", pc);
- }
}