You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/07/21 05:51:26 UTC
svn commit: r1612179 -
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
Author: mattsicker
Date: Mon Jul 21 03:51:26 2014
New Revision: 1612179
URL: http://svn.apache.org/r1612179
Log:
Remove inner class in bundle activator.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java?rev=1612179&r1=1612178&r2=1612179&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java Mon Jul 21 03:51:26 2014
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.util.BundleResourceLoader;
import org.apache.logging.log4j.status.StatusLogger;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.SynchronousBundleListener;
@@ -31,7 +32,7 @@ import org.osgi.framework.SynchronousBun
/**
* OSGi BundleActivator.
*/
-public final class Activator implements org.osgi.framework.BundleActivator {
+public final class Activator implements BundleActivator, SynchronousBundleListener {
private static final Logger LOGGER = StatusLogger.getLogger();
@@ -40,7 +41,7 @@ public final class Activator implements
@Override
public void start(final BundleContext context) throws Exception {
if (this.context.compareAndSet(null, context)) {
- context.addBundleListener(new Listener());
+ context.addBundleListener(this);
// done after the BundleListener as to not miss any new bundle installs in the interim
scanInstalledBundlesForPlugins(context);
}
@@ -57,7 +58,7 @@ public final class Activator implements
}
private static void scanBundleForPlugins(final Bundle bundle) {
- LOGGER.debug("Scanning bundle [{}] for plugins.", bundle.getSymbolicName());
+ LOGGER.trace("Scanning bundle [{}] for plugins.", bundle.getSymbolicName());
PluginManager.loadPlugins(new BundleResourceLoader(bundle));
}
@@ -67,18 +68,15 @@ public final class Activator implements
this.context.compareAndSet(context, null);
}
- private static class Listener implements SynchronousBundleListener {
-
- @Override
- public void bundleChanged(final BundleEvent event) {
- switch (event.getType()) {
- case BundleEvent.STARTED:
- scanBundleForPlugins(event.getBundle());
- break;
+ @Override
+ public void bundleChanged(BundleEvent event) {
+ switch (event.getType()) {
+ case BundleEvent.STARTED:
+ scanBundleForPlugins(event.getBundle());
+ break;
- default:
- break;
- }
+ default:
+ break;
}
}
}