Bug 416047 - Provide-Capability manifest headers for provided services
Added the Provide-Capability header for the ConfigurationAdmin
implementation. Also added p2.inf files for o.e.equinox.cm,
o.e.equinox.http.servlet and o.e.equinox.metatype to be able to specify
p2 metadata to be used by the p2 resolver.
Change-Id: I5739b4a8414457223b78cd8a93bcd4f31bb45d08
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>
diff --git a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
index b5e14a1..e4a5b6d 100644
--- a/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.cm/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.equinox.cm
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.eclipse.equinox.internal.cm.Activator
Import-Package: org.osgi.framework;version="1.7.0",
org.osgi.service.cm;version="[1.5,1.6)",
@@ -12,3 +12,7 @@
org.osgi.service.event;version="1.0"; resolution:=optional,
org.osgi.util.tracker;version="1.3.1"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Provide-Capability:
+ osgi.service;
+ objectClass:List<String>="org.osgi.service.cm.ConfigurationAdmin";
+ uses:="org.osgi.service.cm"
diff --git a/bundles/org.eclipse.equinox.cm/META-INF/p2.inf b/bundles/org.eclipse.equinox.cm/META-INF/p2.inf
new file mode 100644
index 0000000..d761e17
--- /dev/null
+++ b/bundles/org.eclipse.equinox.cm/META-INF/p2.inf
@@ -0,0 +1,2 @@
+provides.0.namespace = osgi.service
+provides.0.name = org.osgi.service.cm.ConfigurationAdmin
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.cm/pom.xml b/bundles/org.eclipse.equinox.cm/pom.xml
index 8dfc826..da4713a 100644
--- a/bundles/org.eclipse.equinox.cm/pom.xml
+++ b/bundles/org.eclipse.equinox.cm/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.cm</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/p2.inf b/bundles/org.eclipse.equinox.http.servlet/META-INF/p2.inf
new file mode 100644
index 0000000..cca0cce
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.servlet/META-INF/p2.inf
@@ -0,0 +1,6 @@
+provides.0.namespace = osgi.implementation
+provides.0.name = osgi.http
+provides.1.namespace = osgi.service
+provides.1.name = org.osgi.service.http.HttpService
+provides.2.namespace = osgi.service
+provides.2.name = org.osgi.service.http.runtime.HttpServiceRuntime
diff --git a/bundles/org.eclipse.equinox.metatype/META-INF/p2.inf b/bundles/org.eclipse.equinox.metatype/META-INF/p2.inf
new file mode 100644
index 0000000..3ce53d5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.metatype/META-INF/p2.inf
@@ -0,0 +1,6 @@
+provides.0.namespace = osgi.implementation
+provides.0.name = osgi.metatype
+provides.1.namespace = osgi.extender
+provides.1.name = osgi.metatype
+provides.2.namespace = osgi.service
+provides.2.name = org.osgi.service.metatype.MetaTypeService
