You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/06/27 09:26:34 UTC
[2/2] karaf git commit: Extract logger hack
Extract logger hack
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b8344240
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b8344240
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b8344240
Branch: refs/heads/master
Commit: b83442407945d68a2dae125f11cf05cb3d177876
Parents: 9d3676a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jun 27 10:03:44 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jun 27 10:03:44 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/karaf/main/Main.java | 76 ++++++++++----------
1 file changed, 40 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b8344240/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 09a3dc1..c370b30 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -251,11 +251,46 @@ public class Main {
FrameworkFactory factory = loadFrameworkFactory(classLoader);
framework = factory.newFramework(config.props);
- /*
- * KARAF-3706: disable the logger related code to avoid the exception
- * It needs to be revisited when the FELIX-4871 is fixed.
- */
- // Hack to set felix logger
+ setLogger();
+
+ framework.init();
+ framework.getBundleContext().addFrameworkListener(lockCallback);
+ framework.start();
+
+ FrameworkStartLevel sl = framework.adapt(FrameworkStartLevel.class);
+ sl.setInitialBundleStartLevel(config.defaultBundleStartlevel);
+
+ // If we have a clean state, install everything
+ if (framework.getBundleContext().getBundles().length == 1) {
+
+ LOG.info("Installing and starting initial bundles");
+ File startupPropsFile = new File(config.karafEtc, STARTUP_PROPERTIES_FILE_NAME);
+ List<BundleInfo> bundles = readBundlesFromStartupProperties(startupPropsFile);
+ installAndStartBundles(resolver, framework.getBundleContext(), bundles);
+ LOG.info("All initial bundles installed and set to start");
+ }
+
+ ServerInfo serverInfo = new ServerInfoImpl(args, config);
+ framework.getBundleContext().registerService(ServerInfo.class, serverInfo, null);
+
+ activatorManager = new KarafActivatorManager(classLoader, framework);
+ activatorManager.startKarafActivators();
+
+ setStartLevel(config.lockStartLevel);
+ // Progress bar
+ if (config.delayConsoleStart) {
+ new StartupListener(LOG, framework.getBundleContext());
+ }
+ monitor();
+ registerSignalHandler();
+ }
+
+ /*
+ * Hack to set felix logger
+ * KARAF-3706: disable the logger related code to avoid the exception
+ * It needs to be revisited when the FELIX-4871 is fixed.
+ */
+ private void setLogger() {
try {
if (framework.getClass().getName().startsWith("org.apache.felix.")) {
Field field = framework.getClass().getDeclaredField("m_logger");
@@ -290,37 +325,6 @@ public class Main {
} catch (Throwable t) {
t.printStackTrace();
}
-
- framework.init();
- framework.getBundleContext().addFrameworkListener(lockCallback);
- framework.start();
-
- FrameworkStartLevel sl = framework.adapt(FrameworkStartLevel.class);
- sl.setInitialBundleStartLevel(config.defaultBundleStartlevel);
-
- // If we have a clean state, install everything
- if (framework.getBundleContext().getBundles().length == 1) {
-
- LOG.info("Installing and starting initial bundles");
- File startupPropsFile = new File(config.karafEtc, STARTUP_PROPERTIES_FILE_NAME);
- List<BundleInfo> bundles = readBundlesFromStartupProperties(startupPropsFile);
- installAndStartBundles(resolver, framework.getBundleContext(), bundles);
- LOG.info("All initial bundles installed and set to start");
- }
-
- ServerInfo serverInfo = new ServerInfoImpl(args, config);
- framework.getBundleContext().registerService(ServerInfo.class, serverInfo, null);
-
- activatorManager = new KarafActivatorManager(classLoader, framework);
- activatorManager.startKarafActivators();
-
- setStartLevel(config.lockStartLevel);
- // Progress bar
- if (config.delayConsoleStart) {
- new StartupListener(LOG, framework.getBundleContext());
- }
- monitor();
- registerSignalHandler();
}
private void registerSignalHandler() {