[322761] Plugins have 2 activators

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

2 files changed, 1 insertions, 70 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
index b34e9b7a78..346bd2d5dc 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.dawn.examples.acore;version="1.0.0",
  org.eclipse.emf.cdo.dawn.examples.acore.impl;version="1.0.0",
- org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.0",
- org.eclipse.emf.cdo.internal.dawn.examples.acore.bundle;version="1.0.0"
+ org.eclipse.emf.cdo.dawn.examples.acore.util;version="1.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/internal/dawn/examples/acore/bundle/Activator.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/internal/dawn/examples/acore/bundle/Activator.java
deleted file mode 100644
index 0923b271cf..0000000000
--- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore/src/org/eclipse/emf/cdo/internal/dawn/examples/acore/bundle/Activator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany).
- * 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.internal.dawn.examples.acore.bundle;
-
-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.emf.cdo.dawn.examples.acore";
-
-  // 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;
-  }
-
-}