[322761] Plugins have 2 activators

https://bugs.eclipse.org/bugs/show_bug.cgi?id=322761

3 files changed, 48 insertions, 71 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
index f8f18e8a06..55e56a4fc5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %providerName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.tests
 Bundle-Version: 0.2.0.qualifier
-Bundle-Activator: org.eclipse.emf.cdo.dawn.tests.Activator
+Bundle-Activator: org.eclipse.emf.cdo.dawn.tests.bundle.OM$Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.cdo.tests;bundle-version="3.0.0",
  org.eclipse.gmf;bundle-version="[1.2.0,2.0.0)",
@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.workspace;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.gmf.runtime.emf.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.cdo.dawn.ui;bundle-version="[0.2.100,1.0.0)",
+ org.eclipse.emf.cdo.dawn.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.cdo.ui;bundle-version="4.0.0",
- org.eclipse.emf.cdo.dawn.util;bundle-version="[0.2.100,1.0.0)",
+ org.eclipse.emf.cdo.dawn.util;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.swtbot.eclipse.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.swtbot.eclipse.finder;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.swtbot.eclipse.gef.finder;bundle-version="[2.0.0,3.0.0)",
@@ -36,6 +36,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.emf.cdo.dawn.tests;version="0.2.0",
  org.eclipse.emf.cdo.dawn.tests.bugzillas;version="0.2.0",
+ org.eclipse.emf.cdo.dawn.tests.bundle;version="0.2.0",
  org.eclipse.emf.cdo.dawn.tests.common;version="0.2.0",
  org.eclipse.emf.cdo.dawn.tests.ui;version="0.2.0",
  org.eclipse.emf.cdo.dawn.tests.ui.util;version="0.2.0"
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/Activator.java
deleted file mode 100644
index 47cdb3a0ee..0000000000
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/Activator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.tests;
-
-import org.eclipse.core.runtime.Plugin;
-
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Martin Fluegge
- */
-public class Activator extends Plugin
-{
-
-  // The plug-in ID
-  public static final String PLUGIN_ID = "org.eclipse.emf.cdo.dawn.tests"; //$NON-NLS-1$
-
-  // The shared instance
-  private static Activator plugin;
-
-  /**
-   * The constructor
-   */
-  public Activator()
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-   */
-  @Override
-  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)
-   */
-  @Override
-  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/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java
new file mode 100644
index 0000000000..e35a5f26e1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.tests.bundle;
+
+import org.eclipse.net4j.util.om.OMBundle;
+import org.eclipse.net4j.util.om.OMPlatform;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+
+/**
+ * The <em>Operations & Maintenance</em> class of this bundle.
+ * 
+ * @author Martin Fluegge
+ */
+public abstract class OM
+{
+  public static final String BUNDLE_ID = "org.eclipse.emf.cdo.dawn.tests"; //$NON-NLS-1$
+
+  public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
+
+  public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
+
+  public static final OMLogger LOG = BUNDLE.logger();
+
+  /**
+   * @author Martin Fluegge
+   */
+  public static final class Activator extends OSGiActivator
+  {
+    public Activator()
+    {
+      super(BUNDLE);
+    }
+  }
+}