Bug 564239 - Use ds annotation for BundleGroupComponent

Cleanup to make move to new home easier

Change-Id: Ib7981e704e3aac6754770066dbe4f04019c80979
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

update/org.eclipse.update.configurator/META-INF/MANIFEST.MF

diff --git a/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF b/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF
index 7f6d54a..1a86406 100644
--- a/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF
+++ b/update/org.eclipse.update.configurator/META-INF/MANIFEST.MF
@@ -11,12 +11,13 @@
  org.eclipse.update.internal.configurator.branding;x-friends:="org.eclipse.update.core"
 Eclipse-LazyStart: true
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.osgi;bundle-version="[3.2.0,4.0.0)"
+ org.eclipse.osgi;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.osgi.services;bundle-version="3.9.0";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.xml.parsers,
  org.w3c.dom,
  org.xml.sax,
  org.xml.sax.helpers
-Service-Component: OSGI-INF/bundleGroup.xml
+Service-Component:  OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.update.configurator

update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml

diff --git a/update/org.eclipse.update.configurator/OSGI-INF/bundleGroup.xml b/update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml
similarity index 81%
rename from update/org.eclipse.update.configurator/OSGI-INF/bundleGroup.xml
rename to update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml
index 2cd3717..ef4b7b2 100644
--- a/update/org.eclipse.update.configurator/OSGI-INF/bundleGroup.xml
+++ b/update/org.eclipse.update.configurator/OSGI-INF/org.eclipse.update.internal.configurator.BundleGroupComponent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="false" name="org.eclipse.update.configurator.bundlegroup">
-   <implementation class="org.eclipse.update.internal.configurator.BundleGroupComponent"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.update.internal.configurator.BundleGroupComponent">
    <service>
       <provide interface="org.eclipse.core.runtime.IBundleGroupProvider"/>
    </service>
-</scr:component>
+   <implementation class="org.eclipse.update.internal.configurator.BundleGroupComponent"/>
+</scr:component>
\ No newline at end of file

update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java

diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
index 9a44ccc..c445319 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/BundleGroupComponent.java
@@ -15,12 +15,14 @@
 
 import org.eclipse.core.runtime.IBundleGroup;
 import org.eclipse.core.runtime.IBundleGroupProvider;
+import org.osgi.service.component.annotations.Component;
 
 /**
  * Declarative services component that provides an implementation of
  * {@link IBundleGroupProvider}. This allows the bundle group provider to be
  * made available in the service registry before this bundle has started.
  */
+@Component
 public class BundleGroupComponent implements IBundleGroupProvider {
 
 	@Override