Remove unnecessary Bundle-Activator from ECF tests

There are many default Bundle-Activator implementations that add little
value other than the template that gets generated from PDE. Remove and
replace with equivalent code as necessary.

Bug: 568177
Change-Id: Ie5f072af8f084e3a660a02ffa1f6a9576dafa815
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>

37 files changed, 48 insertions, 596 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF
index 2349b8749..044e8b63a 100644
--- a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.apache.httpclient.server
 Automatic-Module-Name: org.eclipse.ecf.tests.apache.httpclient.server
 Bundle-Version: 3.0.101.qualifier
-Bundle-Activator: org.eclipse.ecf.internal.tests.apache.httpclient.server.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/eclipse/ecf/internal/tests/apache/httpclient/server/Activator.java b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/eclipse/ecf/internal/tests/apache/httpclient/server/Activator.java
deleted file mode 100644
index 33a26c03d..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/eclipse/ecf/internal/tests/apache/httpclient/server/Activator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.ecf.internal.tests.apache.httpclient.server;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.datashare/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.datashare/META-INF/MANIFEST.MF
index e33e8f94b..9b3a56f3f 100644
--- a/tests/bundles/org.eclipse.ecf.tests.datashare/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.datashare/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.datashare
 Automatic-Module-Name: org.eclipse.ecf.tests.datashare
 Bundle-Version: 2.0.101.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.datashare.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common,
diff --git a/tests/bundles/org.eclipse.ecf.tests.datashare/src/org/eclipse/ecf/tests/datashare/Activator.java b/tests/bundles/org.eclipse.ecf.tests.datashare/src/org/eclipse/ecf/tests/datashare/Activator.java
deleted file mode 100755
index 5efff6eaa..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.datashare/src/org/eclipse/ecf/tests/datashare/Activator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.ecf.tests.datashare;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator implements BundleActivator {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.datashare";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/META-INF/MANIFEST.MF
index 0c10c8538..6ec3b9d23 100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.filetransfer.httpserver
 Automatic-Module-Name: org.eclipse.ecf.tests.filetransfer.httpserver
 Bundle-Version: 1.0.101.qualifier
-Bundle-Activator: org.eclipse.ecf.internal.tests.filetransfer.httpserver.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/src/org/eclipse/ecf/internal/tests/filetransfer/httpserver/Activator.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/src/org/eclipse/ecf/internal/tests/filetransfer/httpserver/Activator.java
deleted file mode 100644
index 8dce69b3c..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/src/org/eclipse/ecf/internal/tests/filetransfer/httpserver/Activator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.ecf.internal.tests.filetransfer.httpserver;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.httpservice/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.httpservice/META-INF/MANIFEST.MF
index 4dd6fe6c3..3390f702c 100644
--- a/tests/bundles/org.eclipse.ecf.tests.httpservice/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.httpservice/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-Vendor: %plugin.provider
 Bundle-SymbolicName: org.eclipse.ecf.tests.httpservice.util
 Automatic-Module-Name: org.eclipse.ecf.tests.httpservice.util
 Bundle-Version: 1.0.101.qualifier
-Bundle-Activator: org.eclipse.ecf.internal.tests.httpservice.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.equinox.http.servlet;version="1.1.0",
diff --git a/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/internal/tests/httpservice/Activator.java b/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/internal/tests/httpservice/Activator.java
deleted file mode 100644
index 087e7d854..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/internal/tests/httpservice/Activator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.ecf.internal.tests.httpservice;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private BundleContext context;
-	private static Activator instance;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		instance = this;
-		this.context = context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		this.context = null;
-		instance = null;
-	}
-
-	public static Activator getDefault() {
-		return instance;
-	}
-
-	public BundleContext getContext() {
-		return context;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/tests/httpservice/AbstractHttpServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/tests/httpservice/AbstractHttpServiceTest.java
index 1b9211b69..8e4a3454f 100644
--- a/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/tests/httpservice/AbstractHttpServiceTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.httpservice/src/org/eclipse/ecf/tests/httpservice/AbstractHttpServiceTest.java
@@ -12,10 +12,10 @@
  *****************************************************************************/
 package org.eclipse.ecf.tests.httpservice;
 
-import org.eclipse.ecf.internal.tests.httpservice.Activator;
 import org.eclipse.ecf.tests.ECFAbstractTestCase;
 import org.eclipse.ecf.tests.util.BundleUtil;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
 
 public abstract class AbstractHttpServiceTest extends ECFAbstractTestCase {
 
@@ -27,7 +27,7 @@ public abstract class AbstractHttpServiceTest extends ECFAbstractTestCase {
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
-		bundleUtil = new BundleUtil(Activator.getDefault().getContext());
+		bundleUtil = new BundleUtil(FrameworkUtil.getBundle(getClass()).getBundleContext());
 	}
 	
 	@Override
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF
index 266e50fb0..664bbb683 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.osgi.services.distribution
 Automatic-Module-Name: org.eclipse.ecf.tests.osgi.services.distribution
 Bundle-Version: 1.1.101.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0",
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/internal/osgi/services/distribution/Activator.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/internal/osgi/services/distribution/Activator.java
deleted file mode 100644
index 58aa9a68c..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/internal/osgi/services/distribution/Activator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.ecf.tests.internal.osgi.services.distribution;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.osgi.services.distribution"; //$NON-NLS-1$
-
-	private static Activator plugin;
-	private BundleContext context;
-	
-	public static final Activator getDefault() {
-		return plugin;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		plugin = this;
-		this.context = context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		context = null;
-		plugin = null;
-	}
-
-	public BundleContext getContext() {
-		return context;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java
index 3da34fbd8..9d78481b5 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractDistributionTest.java
@@ -28,10 +28,10 @@ import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
 import org.eclipse.ecf.remoteservice.IRemoteServiceRegistration;
 import org.eclipse.ecf.remoteservice.events.IRemoteServiceEvent;
 import org.eclipse.ecf.tests.ContainerAbstractTestCase;
-import org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator;
 import org.eclipse.ecf.tests.remoteservice.IConcatService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
@@ -41,6 +41,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
 public abstract class AbstractDistributionTest extends
 		ContainerAbstractTestCase implements IDistributionConstants {
 
+	protected static final String PLUGIN_ID = "org.eclipse.ecf.tests.osgi.services.distribution";
 	protected IRemoteServiceContainerAdapter[] adapters = null;
 
 	/*
@@ -83,7 +84,7 @@ public abstract class AbstractDistributionTest extends
 	}
 
 	protected BundleContext getContext() {
-		return Activator.getDefault().getContext();
+		return FrameworkUtil.getBundle(getClass()).getBundleContext();
 	}
 
 	protected IRemoteServiceContainerAdapter[] getRemoteServiceAdapters() {
@@ -210,7 +211,7 @@ public abstract class AbstractDistributionTest extends
 			return;
 		} else {
 			// Check if the ECF bundles are even started
-			Bundle[] bundles = Activator.getDefault().getContext().getBundles();
+			Bundle[] bundles = getContext().getBundles();
 			for (Bundle bundle : bundles) {
 				String symbolicName = bundle.getSymbolicName();
 				if (symbolicName != null
@@ -258,20 +259,20 @@ public abstract class AbstractDistributionTest extends
 				new ServiceTrackerCustomizer() {
 
 					public Object addingService(ServiceReference reference) {
-						Trace.trace(Activator.PLUGIN_ID, "addingService="
+						Trace.trace(PLUGIN_ID, "addingService="
 								+ reference);
 						return getContext().getService(reference);
 					}
 
 					public void modifiedService(ServiceReference reference,
 							Object service) {
-						Trace.trace(Activator.PLUGIN_ID, "modifiedService="
+						Trace.trace(PLUGIN_ID, "modifiedService="
 								+ reference);
 					}
 
 					public void removedService(ServiceReference reference,
 							Object service) {
-						Trace.trace(Activator.PLUGIN_ID, "removedService="
+						Trace.trace(PLUGIN_ID, "removedService="
 								+ reference + ",svc=" + service);
 					}
 				});
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java
index d7b35595c..823adf463 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java
@@ -20,7 +20,6 @@ import org.eclipse.ecf.remoteservice.IRemoteCallListener;
 import org.eclipse.ecf.remoteservice.IRemoteService;
 import org.eclipse.ecf.remoteservice.events.IRemoteCallCompleteEvent;
 import org.eclipse.ecf.remoteservice.events.IRemoteCallEvent;
-import org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator;
 import org.eclipse.equinox.concurrent.future.IFuture;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
@@ -148,7 +147,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 		assertNotNull(proxy);
 		// Now use proxy
 		final String result = proxy.doStuff1();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertTrue(TestServiceInterface1.TEST_SERVICE_STRING1.equals(result));
 		endTest("testProxy");
 	}
@@ -172,7 +171,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 
 		// Call remote service synchronously
 		final Object result = remoteService.callSync(createRemoteCall());
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 		endTest("testCallSyncFromProxy");
 	}
@@ -192,7 +191,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 
 		// Call synchronously
 		final Object result = rs.callSync(createRemoteCall());
-		Trace.trace(Activator.PLUGIN_ID, "callSync.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "callSync.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 		endTest("testCallSync");
 	}
@@ -215,7 +214,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 				if (event instanceof IRemoteCallCompleteEvent) {
 					final Object result = ((IRemoteCallCompleteEvent) event)
 							.getResponse();
-					Trace.trace(Activator.PLUGIN_ID,
+					Trace.trace(PLUGIN_ID,
 							"callSync.doStuff1 result=" + result);
 					assertStringResultValid(result,TestServiceInterface1.TEST_SERVICE_STRING1);
 					syncNotify();
@@ -244,7 +243,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 
 		// now get result from futureResult
 		final Object result = futureResult.get();
-		Trace.trace(Activator.PLUGIN_ID, "callSync.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "callSync.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 		endTest("testCallFuture");
 	}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractTwoRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractTwoRemoteServiceAccessTest.java
index 946f7e284..b1840b12d 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractTwoRemoteServiceAccessTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractTwoRemoteServiceAccessTest.java
@@ -16,7 +16,6 @@ import java.util.Properties;
 
 import org.eclipse.ecf.core.util.Trace;
 import org.eclipse.ecf.remoteservice.IRemoteCall;
-import org.eclipse.ecf.tests.internal.osgi.services.distribution.Activator;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.util.tracker.ServiceTracker;
@@ -132,7 +131,7 @@ public abstract class AbstractTwoRemoteServiceAccessTest extends
 		assertNotNull(proxy);
 		// Now use proxy
 		final String result = proxy.doStuff1();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertTrue(TestServiceInterface1.TEST_SERVICE_STRING1.equals(result));
 		endTest("testProxyWithService1");
 	}
@@ -153,12 +152,12 @@ public abstract class AbstractTwoRemoteServiceAccessTest extends
 		assertNotNull(proxy);
 		// Now use proxy
 		String result = proxy.doStuff1();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertTrue(TestServiceInterface1.TEST_SERVICE_STRING1.equals(result));
 		
 		// Now use proxy
 		result = proxy.doStuff2();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff2 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff2 result=" + result);
 		assertTrue(TestServiceInterface2.TEST_SERVICE_STRING2.equals(result));
 		endTest("testProxyWithService2");
 	}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
index eb15d2791..cecfa4fd1 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin
 Automatic-Module-Name: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin
 Bundle-Version: 1.1.101.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.osgi.services.remoteserviceadmin.Activator
 Bundle-Vendor: %bundle.provider
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractDistributionTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractDistributionTest.java
index e92de6005..32da3705e 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractDistributionTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractDistributionTest.java
@@ -29,6 +29,7 @@ import org.eclipse.ecf.remoteservice.events.IRemoteServiceEvent;
 import org.eclipse.ecf.tests.ContainerAbstractTestCase;
 import org.eclipse.ecf.tests.remoteservice.IConcatService;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
@@ -38,6 +39,8 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
 public abstract class AbstractDistributionTest extends
 		ContainerAbstractTestCase {
 
+	protected static final String PLUGIN_ID = "org.eclipse.ecf.tests.osgi.services.remoteserviceadmin";
+
 	protected IRemoteServiceContainerAdapter[] adapters = null;
 
 	/*
@@ -72,7 +75,7 @@ public abstract class AbstractDistributionTest extends
 	}
 
 	protected BundleContext getContext() {
-		return Activator.getDefault().getContext();
+		return FrameworkUtil.getBundle(getClass()).getBundleContext();
 	}
 
 	protected IRemoteServiceContainerAdapter[] getRemoteServiceAdapters() {
@@ -219,20 +222,20 @@ public abstract class AbstractDistributionTest extends
 				new ServiceTrackerCustomizer() {
 
 					public Object addingService(ServiceReference reference) {
-						Trace.trace(Activator.PLUGIN_ID, "addingService="
+						Trace.trace(PLUGIN_ID, "addingService="
 								+ reference);
 						return getContext().getService(reference);
 					}
 
 					public void modifiedService(ServiceReference reference,
 							Object service) {
-						Trace.trace(Activator.PLUGIN_ID, "modifiedService="
+						Trace.trace(PLUGIN_ID, "modifiedService="
 								+ reference);
 					}
 
 					public void removedService(ServiceReference reference,
 							Object service) {
-						Trace.trace(Activator.PLUGIN_ID, "removedService="
+						Trace.trace(PLUGIN_ID, "removedService="
 								+ reference + ",svc=" + service);
 					}
 				});
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractMetadataFactoryTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractMetadataFactoryTest.java
index 16e2e1482..d09b55494 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractMetadataFactoryTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractMetadataFactoryTest.java
@@ -25,7 +25,9 @@ import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription;
 import org.eclipse.ecf.osgi.services.remoteserviceadmin.IDiscoveredEndpointDescriptionFactory;
 import org.eclipse.ecf.osgi.services.remoteserviceadmin.IServiceInfoFactory;
 import org.eclipse.ecf.tests.ECFAbstractTestCase;
+import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.util.tracker.ServiceTracker;
 
 public abstract class AbstractMetadataFactoryTest extends ECFAbstractTestCase {
@@ -50,7 +52,7 @@ public abstract class AbstractMetadataFactoryTest extends ECFAbstractTestCase {
 	protected IDiscoveryLocator discoveryLocator;
 
 	protected IDiscoveryLocator getDiscoveryLocator() {
-		ServiceTracker serviceTracker = new ServiceTracker(Activator.getDefault().getContext(),IDiscoveryLocator.class.getName(), null);
+		ServiceTracker serviceTracker = new ServiceTracker(getContext(),IDiscoveryLocator.class.getName(), null);
 		serviceTracker.open();
 		IDiscoveryLocator result = (IDiscoveryLocator) serviceTracker.getService();
 		serviceTracker.close();
@@ -58,12 +60,17 @@ public abstract class AbstractMetadataFactoryTest extends ECFAbstractTestCase {
 	}
 	
 	protected IDiscoveryAdvertiser getDiscoveryAdvertiser() {
-		ServiceTracker serviceTracker = new ServiceTracker(Activator.getDefault().getContext(),IDiscoveryAdvertiser.class.getName(), null);
+		ServiceTracker serviceTracker = new ServiceTracker(getContext(),IDiscoveryAdvertiser.class.getName(), null);
 		serviceTracker.open();
 		IDiscoveryAdvertiser result = (IDiscoveryAdvertiser) serviceTracker.getService();
 		serviceTracker.close();
 		return result;
 	}
+	
+	protected BundleContext getContext() {
+		return FrameworkUtil.getBundle(getClass()).getBundleContext();
+	}
+
 
 	protected void setUp() throws Exception {
 		super.setUp();
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceAccessTest.java
index 0a5936073..d877d091b 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceAccessTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceAccessTest.java
@@ -143,7 +143,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 		assertNotNull(proxy);
 		// Now use proxy
 		final String result = proxy.doStuff1();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertTrue(TestServiceInterface1.TEST_SERVICE_STRING1.equals(result));
 	}
 
@@ -182,7 +182,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 
 		// Call remote service synchronously
 		final Object result = remoteService.callSync(createRemoteCall());
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 	}
 
@@ -200,7 +200,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 
 		// Call synchronously
 		final Object result = rs.callSync(createRemoteCall());
-		Trace.trace(Activator.PLUGIN_ID, "callSync.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "callSync.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 	}
 
@@ -221,7 +221,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 				if (event instanceof IRemoteCallCompleteEvent) {
 					final Object result = ((IRemoteCallCompleteEvent) event)
 							.getResponse();
-					Trace.trace(Activator.PLUGIN_ID,
+					Trace.trace(PLUGIN_ID,
 							"callSync.doStuff1 result=" + result);
 					assertStringResultValid(result,TestServiceInterface1.TEST_SERVICE_STRING1);
 					syncNotify();
@@ -248,7 +248,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 
 		// now get result from futureResult
 		final Object result = futureResult.get();
-		Trace.trace(Activator.PLUGIN_ID, "callSync.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "callSync.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 	}
 
@@ -285,7 +285,7 @@ public abstract class AbstractRemoteServiceAccessTest extends
 		Future f = asyncSvc.doStuff1Async();
 		// now get result from futureResult
 		final Object result = f.get();
-		Trace.trace(Activator.PLUGIN_ID, "callSync.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "callSync.doStuff1 result=" + result);
 		assertStringResultValid(result, TestServiceInterface1.TEST_SERVICE_STRING1);
 	}
 
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractTwoRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractTwoRemoteServiceAccessTest.java
index 6519e2046..1a348b2f7 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractTwoRemoteServiceAccessTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractTwoRemoteServiceAccessTest.java
@@ -128,7 +128,7 @@ public abstract class AbstractTwoRemoteServiceAccessTest extends
 		assertNotNull(proxy);
 		// Now use proxy
 		final String result = proxy.doStuff1();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertTrue(TestServiceInterface1.TEST_SERVICE_STRING1.equals(result));
 	}
 
@@ -148,12 +148,12 @@ public abstract class AbstractTwoRemoteServiceAccessTest extends
 		assertNotNull(proxy);
 		// Now use proxy
 		String result = proxy.doStuff1();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff1 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff1 result=" + result);
 		assertTrue(TestServiceInterface1.TEST_SERVICE_STRING1.equals(result));
 		
 		// Now use proxy
 		result = proxy.doStuff2();
-		Trace.trace(Activator.PLUGIN_ID, "proxy.doStuff2 result=" + result);
+		Trace.trace(PLUGIN_ID, "proxy.doStuff2 result=" + result);
 		assertTrue(TestServiceInterface2.TEST_SERVICE_STRING2.equals(result));
 
 	}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/Activator.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/Activator.java
deleted file mode 100644
index 3592587cc..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/Activator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
- * Copyright (c) 2010 Composent, Inc. and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- *   Composent, Inc. - initial API and implementation
- *
- * SPDX-License-Identifier: EPL-2.0
- *****************************************************************************/
-package org.eclipse.ecf.tests.osgi.services.remoteserviceadmin;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.osgi.services.remoteserviceadmin";
-	
-	private static BundleContext context;
-	private static Activator instance;
-	
-	public BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-		instance = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-		instance = null;
-	}
-
-	public static Activator getDefault() {
-		return instance;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/EndpointListenerTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/EndpointListenerTest.java
index 26794d38a..b1061c8d4 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/EndpointListenerTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/EndpointListenerTest.java
@@ -3,6 +3,8 @@ package org.eclipse.ecf.tests.osgi.services.remoteserviceadmin;
 import java.util.Dictionary;
 import java.util.Properties;
 
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.remoteserviceadmin.EndpointDescription;
 import org.osgi.service.remoteserviceadmin.EndpointListener;
@@ -10,6 +12,7 @@ import org.osgi.service.remoteserviceadmin.RemoteConstants;
 
 import junit.framework.TestCase;
 
+@SuppressWarnings("deprecation")
 public class EndpointListenerTest extends TestCase {
 
 	private EndpointListener createEndpointListener() {
@@ -31,7 +34,8 @@ public class EndpointListenerTest extends TestCase {
 	public void testEndpointListenerNotification() throws Exception {
 		Properties props = new Properties();
 		props.put(org.osgi.service.remoteserviceadmin.EndpointListener.ENDPOINT_LISTENER_SCOPE,"("+RemoteConstants.ENDPOINT_ID+"=*)");
-		ServiceRegistration endpointListenerRegistration = Activator.getDefault().getContext().registerService(EndpointListener.class.getName(), createEndpointListener(), (Dictionary) props);
+		BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext();
+		ServiceRegistration endpointListenerRegistration = context.registerService(EndpointListener.class.getName(), createEndpointListener(), (Dictionary) props);
 		Thread.sleep(5000);
 		endpointListenerRegistration.unregister();
 	}
diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF
index 0ce5390f5..3bf410b0d 100755
--- a/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.presence
 Automatic-Module-Name: org.eclipse.ecf.tests.presence
 Bundle-Version: 2.0.102.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.presence.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ecf.tests,
diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/Activator.java b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/Activator.java
deleted file mode 100755
index 8f3d520d4..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/Activator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.ecf.tests.presence;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator implements BundleActivator {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.presence";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java
index b6aaba555..cb81c3f0b 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/archive/SingleCompositeDiscoveryServiceContainerTest.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
 import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
 import org.eclipse.ecf.discovery.IDiscoveryLocator;
 import org.eclipse.ecf.provider.discovery.CompositeDiscoveryContainer;
-import org.eclipse.ecf.tests.discovery.Activator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceReference;
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/META-INF/MANIFEST.MF
index b4a4a1336..8100449c3 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.provider.filetransfer.efs
 Automatic-Module-Name: org.eclipse.ecf.tests.provider.filetransfer.efs
 Bundle-Version: 2.0.200.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.provider.filetransfer.efs.Activator
 Bundle-Vendor: %plugin.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/Activator.java
deleted file mode 100755
index 219e9c93c..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ecf.tests.provider.filetransfer.efs;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.provider.filetransfer.efs";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/META-INF/MANIFEST.MF
index fbb9169aa..193c0f866 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: SCP Provider Tests
 Bundle-SymbolicName: org.eclipse.ecf.tests.provider.filetransfer.scp
 Automatic-Module-Name: org.eclipse.ecf.tests.provider.filetransfer.scp
 Bundle-Version: 2.1.100.qualifier
-Bundle-Activator: org.eclipse.ecf.internal.tests.provider.filetransfer.scp.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java
deleted file mode 100755
index 55c6e2554..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.scp/src/org/eclipse/ecf/internal/tests/provider/filetransfer/scp/Activator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.ecf.internal.tests.provider.filetransfer.scp;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.provider.filetransfer.scp"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		// nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/META-INF/MANIFEST.MF
index a3fee24cc..7ded3eff5 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.provider.filetransfer.xmpp
 Automatic-Module-Name: org.eclipse.ecf.tests.provider.filetransfer.xmpp
 Bundle-Version: 2.0.101.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.provider.filetransfer.xmpp.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/src/org/eclipse/ecf/tests/provider/filetransfer/xmpp/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/src/org/eclipse/ecf/tests/provider/filetransfer/xmpp/Activator.java
deleted file mode 100755
index 3a8a2feb5..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.xmpp/src/org/eclipse/ecf/tests/provider/filetransfer/xmpp/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ecf.tests.provider.filetransfer.xmpp;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.provider.filetransfer.xmpp";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPDiscoveryTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPDiscoveryTest.java
index 0a1c5bf87..adb598d04 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPDiscoveryTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPDiscoveryTest.java
@@ -17,7 +17,6 @@ import org.eclipse.ecf.discovery.identity.IServiceTypeID;
 import org.eclipse.ecf.internal.provider.jslp.NullPatternAdvertiser;
 import org.eclipse.ecf.internal.provider.jslp.NullPatternLocator;
 import org.eclipse.ecf.provider.jslp.container.JSLPDiscoveryContainer;
-import org.eclipse.ecf.tests.discovery.Activator;
 import org.eclipse.ecf.tests.discovery.DiscoveryContainerTest;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -67,7 +66,7 @@ public class JSLPDiscoveryTest extends DiscoveryContainerTest {
 		Bundle bundle = null;
 		try {
 			// stop the bundle assuming there is only one installed
-			BundleContext context = Activator.getDefault().getContext();
+			BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext();
 			Bundle[] bundles = context.getBundles();
 			for(int i = 0; i < bundles.length; i++) {
 				Bundle aBundle = bundles[i];
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.local/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.provider.local/META-INF/MANIFEST.MF
index d50a25890..435e439ca 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.local/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.local/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Local
 Bundle-SymbolicName: org.eclipse.ecf.tests.provider.local
 Automatic-Module-Name: org.eclipse.ecf.tests.provider.local
 Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.ecf.internal.tests.provider.local.Activator
 Bundle-Vendor: Eclipse.org - ECF
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.ecf.remoteservice,
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.local/src/org/eclipse/ecf/internal/tests/provider/local/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.local/src/org/eclipse/ecf/internal/tests/provider/local/Activator.java
deleted file mode 100644
index 809890904..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.local/src/org/eclipse/ecf/internal/tests/provider/local/Activator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.ecf.internal.tests.provider.local;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/META-INF/MANIFEST.MF
index 009cc09d1..efda4f542 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: ECF Xmpp Provider Tests
 Bundle-SymbolicName: org.eclipse.ecf.tests.provider.xmpp
 Automatic-Module-Name: org.eclipse.ecf.tests.provider.xmpp
 Bundle-Version: 2.0.102.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.provider.xmpp.Activator
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/src/org/eclipse/ecf/tests/provider/xmpp/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/src/org/eclipse/ecf/tests/provider/xmpp/Activator.java
deleted file mode 100755
index f8b0117b1..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/src/org/eclipse/ecf/tests/provider/xmpp/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ecf.tests.provider.xmpp;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.provider.presence.xmpp";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/bundles/org.eclipse.ecf.tests.sharedobject/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.sharedobject/META-INF/MANIFEST.MF
index 9cbd92156..4fb238cf3 100755
--- a/tests/bundles/org.eclipse.ecf.tests.sharedobject/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.sharedobject/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.sharedobject
 Automatic-Module-Name: org.eclipse.ecf.tests.sharedobject
 Bundle-Version: 2.0.102.qualifier
-Bundle-Activator: org.eclipse.ecf.tests.sharedobject.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common,
diff --git a/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/Activator.java b/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/Activator.java
deleted file mode 100755
index 5ae3de5fc..000000000
--- a/tests/bundles/org.eclipse.ecf.tests.sharedobject/src/org/eclipse/ecf/tests/sharedobject/Activator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.ecf.tests.sharedobject;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator implements BundleActivator {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ecf.tests.sharedobject";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}