You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2015/07/02 13:12:32 UTC
svn commit: r1688807 -
/felix/trunk/webconsole-plugins/subsystems/src/main/java/org/apache/felix/webconsole/plugins/subsystem/internal/Activator.java
Author: davidb
Date: Thu Jul 2 11:12:31 2015
New Revision: 1688807
URL: http://svn.apache.org/r1688807
Log:
FELIX-4947 Webconsole plugin for OSGi Subsystems
Removed a bunch of unused comments.
Modified:
felix/trunk/webconsole-plugins/subsystems/src/main/java/org/apache/felix/webconsole/plugins/subsystem/internal/Activator.java
Modified: felix/trunk/webconsole-plugins/subsystems/src/main/java/org/apache/felix/webconsole/plugins/subsystem/internal/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/subsystems/src/main/java/org/apache/felix/webconsole/plugins/subsystem/internal/Activator.java?rev=1688807&r1=1688806&r2=1688807&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/subsystems/src/main/java/org/apache/felix/webconsole/plugins/subsystem/internal/Activator.java (original)
+++ felix/trunk/webconsole-plugins/subsystems/src/main/java/org/apache/felix/webconsole/plugins/subsystem/internal/Activator.java Thu Jul 2 11:12:31 2015
@@ -16,101 +16,17 @@
*/
package org.apache.felix.webconsole.plugins.subsystem.internal;
-import org.apache.felix.webconsole.SimpleWebConsolePlugin;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class Activator implements BundleActivator
{
- private SimpleWebConsolePlugin plugin;
-
public void start(BundleContext context) throws Exception
{
- plugin = new WebConsolePlugin(context).register();
+ new WebConsolePlugin(context).register();
}
public void stop(BundleContext context) throws Exception
{
- plugin = null;
- }
-
- /*
- public synchronized URLStreamHandlerService addingService(ServiceReference<URLStreamHandlerService> reference)
- {
- SimpleWebConsolePlugin p = plugin;
- if (p == null)
- {
- URLStreamHandlerService svc = bundleContext.getService(reference);
- plugin = new WebConsolePlugin(svc).register(bundleContext);
- }
- return bundleContext.getService(reference);
}
-
- public void modifiedService(ServiceReference<URLStreamHandlerService> reference, URLStreamHandlerService service)
- {
- // Unused
- }
-
- public synchronized void removedService(ServiceReference<URLStreamHandlerService> reference, URLStreamHandlerService service)
- {
- if (plugin != null)
- {
- plugin.unregister();
- plugin = null;
- }
- }
- */
-}
-
-//public class Activator implements BundleActivator
-//{
-// private SubsystemPluginServlet plugin;
-//
-// public void start(final BundleContext context) throws Exception
-// {
-// plugin = new SubsystemPluginServlet();
-//
-//// // now we create the listener
-//// this.eventListener = new EventListener(this.plugin, context);
-////
-//// // and the optional features handler
-//// this.featuresHandler = new OptionalFeaturesHandler(this.plugin, context);
-//
-// // finally we register the plugin
-// final Dictionary props = new Hashtable();
-// props.put( Constants.SERVICE_DESCRIPTION, "Subsystems Plugin for the Apache Felix Web Console" );
-// props.put( "felix.webconsole.label", "subsystems");
-// props.put( "felix.webconsole.title", "Subsystems");
-//// props.put( "felix.webconsole.css", "/events/res/ui/events.css");
-// props.put( "felix.webconsole.category", "OSGi");
-// context.registerService(Servlet.class.getName(),
-// plugin,
-// props);
-// }
-//
-// /**
-// * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-// */
-// public void stop(final BundleContext context) throws Exception
-// {
-//// if ( this.pluginRegistration != null )
-//// {
-//// this.pluginRegistration.unregister();
-//// this.pluginRegistration = null;
-//// }
-//// if ( this.eventListener != null )
-//// {
-//// this.eventListener.destroy();
-//// eventListener = null;
-//// }
-//// if ( this.featuresHandler != null)
-//// {
-//// this.featuresHandler.destroy();
-//// this.featuresHandler = null;
-//// }
-//// if ( this.plugin != null ) {
-//// this.plugin.destroy();
-//// this.plugin = null;
-//// }
-// }
-//}
+}
\ No newline at end of file