You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/02/10 09:50:55 UTC
karaf git commit: [KARAF-4361] Allow dynamic config customization
when embedding Karaf using the Main class
Repository: karaf
Updated Branches:
refs/heads/master 990b483c7 -> 49f095cb3
[KARAF-4361] Allow dynamic config customization when embedding Karaf using the Main class
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/49f095cb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/49f095cb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/49f095cb
Branch: refs/heads/master
Commit: 49f095cb345d1495220c2e5511ff2513e6d316af
Parents: 990b483
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Feb 10 10:50:33 2017 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Feb 10 10:50:33 2017 +0100
----------------------------------------------------------------------
main/src/main/java/org/apache/karaf/main/Main.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/49f095cb/main/src/main/java/org/apache/karaf/main/Main.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java
index 1857420..685677e 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -230,7 +230,9 @@ public class Main {
}
public void launch() throws Exception {
- config = new ConfigProperties();
+ if (config == null) {
+ config = new ConfigProperties();
+ }
config.performInit();
if (config.delayConsoleStart) {
System.out.println(config.startupMessage);
@@ -603,6 +605,14 @@ public class Main {
framework.adapt(FrameworkStartLevel.class).setStartLevel(level);
}
+ public ConfigProperties getConfig() {
+ return config;
+ }
+
+ public void setConfig(ConfigProperties config) {
+ this.config = config;
+ }
+
public void awaitShutdown() throws Exception {
if (framework == null) {
return;