Removed all remaining references to Plugin class and Platform class

3 files changed, 5 insertions, 21 deletions

diff --git a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
index fb5804eea..1ca0daf90 100644
--- a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4,
  CDC-1.1/Foundation-1.1
-Require-Bundle: org.eclipse.ecf
-Import-Package: org.eclipse.core.runtime,
- org.eclipse.osgi.util;version="1.0.0",
+Require-Bundle: org.eclipse.equinox.common,
+ org.eclipse.ecf
+Import-Package: org.eclipse.osgi.util;version="1.0.0",
  org.osgi.framework;version="1.3.0"
diff --git a/server-side/bundles/org.eclipse.ecf.server/build.properties b/server-side/bundles/org.eclipse.ecf.server/build.properties
index 00a18bd6a..93ac94b36 100644
--- a/server-side/bundles/org.eclipse.ecf.server/build.properties
+++ b/server-side/bundles/org.eclipse.ecf.server/build.properties
@@ -1,8 +1,6 @@
 bin.includes = ., META-INF/,\
-               conf/,\
                about.html
 src.includes = META-INF/,\
-               conf/,\
                about.html
 jars.compile.order = .
 output.. = bin/
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
index 12401105b..d0c624fc8 100644
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
+++ b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
@@ -11,15 +11,13 @@
 
 package org.eclipse.ecf.internal.server;
 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
+import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 /**
  * The main plugin class to be used in the desktop.
  */
-public class Activator extends Plugin {
+public class Activator implements BundleActivator {
 
 	//The shared instance.
 	private static Activator plugin;
@@ -35,14 +33,12 @@ public class Activator extends Plugin {
 	 * This method is called upon plug-in activation
 	 */
 	public void start(BundleContext context) throws Exception {
-		super.start(context);
 	}
 
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
 	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
 		plugin = null;
 	}
 
@@ -55,14 +51,4 @@ public class Activator extends Plugin {
 		return plugin;
 	}
 
-	public static void log(String message) {
-		getDefault().getLog().log(
-				new Status(IStatus.OK, Activator.getDefault().getBundle().getSymbolicName(), IStatus.OK, message, null));
-	}
-	public static void log(String message, Throwable e) {
-		getDefault().getLog().log(
-				new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), IStatus.OK,
-						message, e));
-	}
-
 }