Changes to remove references to Plugin class.

2 files changed, 16 insertions, 6 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF
index 7bf54dc01..77d08ea67 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/META-INF/MANIFEST.MF
@@ -5,9 +5,12 @@ Bundle-SymbolicName: org.eclipse.ecf.tests.filetransfer;singleton:=true
 Bundle-Version: 1.0.0.20070212
 Bundle-Activator: org.eclipse.ecf.tests.filetransfer.Activator
 Bundle-Vendor: eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.equinox.common,
  org.junit,
  org.eclipse.ecf,
  org.eclipse.ecf.filetransfer,
  org.eclipse.ecf.tests
 Eclipse-LazyStart: true
+Import-Package: org.osgi.framework;version="1.4.0",
+ org.osgi.service.url;version="1.0.0",
+ org.osgi.util.tracker;version="1.3.2"
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/Activator.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/Activator.java
index 00401c037..491289ee9 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/Activator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/Activator.java
@@ -1,14 +1,15 @@
 package org.eclipse.ecf.tests.filetransfer;
 
-import org.eclipse.core.runtime.Plugin;
 import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * The activator class controls the plug-in life cycle
  */
-public class Activator extends Plugin {
+public class Activator implements BundleActivator {
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.filetransfer";
@@ -16,6 +17,8 @@ public class Activator extends Plugin {
 	// The shared instance
 	private static Activator plugin;
 	
+	private BundleContext context = null;
+	
 	private ServiceTracker tracker = null;
 	
 	/**
@@ -24,12 +27,16 @@ public class Activator extends Plugin {
 	public Activator() {
 	}
 
+	public Bundle getBundle() {
+		if (context == null) return null;
+		else return context.getBundle();
+	}
 	/*
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext context) throws Exception {
-		super.start(context);
+		this.context = context;
 		plugin = this;
 		tracker = new ServiceTracker(context,IRetrieveFileTransferFactory.class.getName(),null);
 		tracker.open();
@@ -40,12 +47,12 @@ public class Activator extends Plugin {
 	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop(BundleContext context) throws Exception {
-		plugin = null;
 		if (tracker != null) {
 			tracker.close();
 			tracker = null;
 		}
-		super.stop(context);
+		this.context = null;
+		plugin = null;
 	}
 
 	/**