Bug 458427 - [cm] Equinox ConfigAdmin requires OSGi R6, does not run in
Concierge
diff --git a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
index 87a705c..90e4f4f 100644
--- a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-SymbolicName: org.eclipse.equinox.cm
Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.eclipse.equinox.internal.cm.Activator
-Import-Package: org.osgi.framework;version="1.8.0",
+Import-Package: org.osgi.framework;version="1.7.0",
org.osgi.service.cm;version="[1.5,1.6)",
org.osgi.service.log;version="1.3.0",
org.osgi.service.event;version="1.0"; resolution:=optional,
diff --git a/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java b/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java
index 0edeaab..1976378 100644
--- a/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java
+++ b/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2013 Cognos Incorporated, IBM Corporation
+ * Copyright (c) 2006, 2014 Cognos Incorporated, IBM Corporation
* 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
@@ -23,7 +23,7 @@
public class Activator implements BundleActivator {
private static final String EVENT_ADMIN_CLASS = "org.osgi.service.event.EventAdmin"; //$NON-NLS-1$
private LogTracker logTracker;
- private ServiceRegistration<ConfigurationAdmin> registration;
+ private ServiceRegistration<?> registration;
private ConfigurationAdminFactory factory;
private ConfigurationEventAdapter eventAdapter;
private static BundleContext bundleContext;
@@ -50,7 +50,7 @@
factory = new ConfigurationAdminFactory(context, logTracker);
factory.start();
context.addBundleListener(factory);
- registration = context.registerService(ConfigurationAdmin.class, factory, null);
+ registration = context.registerService(ConfigurationAdmin.class.getName(), factory, null);
}
public void stop(BundleContext context) throws Exception {
