Repository: camel Updated Branches: refs/heads/camel-2.18.x 31c9422fd -> b9cf169c0 refs/heads/camel-2.19.x ba4689296 -> d759b51d2 refs/heads/master 9cbd7c3c9 -> 83b11c961
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/83b11c96 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83b11c96 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83b11c96 Branch: refs/heads/master Commit: 83b11c96127bbfa2c828f432e7cbac1cfa9bc740 Parents: 9cbd7c3 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jun 23 15:58:37 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jun 23 15:58:37 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/83b11c96/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); - } }
