summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ross2012-10-05 11:08:22 (EDT)
committer Thomas Watson2012-10-17 16:41:30 (EDT)
commit2bfd4c08f3fb44d9aa62f08200666621c75f7fe9 (patch)
tree8bbf006eb48ff69e2f042cbeb4a54389c6cc16b0
parent91efe94cf72994141fc164ad9bf083bdafdc9212 (diff)
downloadrt.equinox.framework-2bfd4c08f3fb44d9aa62f08200666621c75f7fe9.zip
rt.equinox.framework-2bfd4c08f3fb44d9aa62f08200666621c75f7fe9.tar.gz
rt.equinox.framework-2bfd4c08f3fb44d9aa62f08200666621c75f7fe9.tar.bz2
Bug 391275 - New system bundle ID constant.
Framework package now exported at version 1.8. This is necessary to allow the new framework to run against the CT.
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java14
2 files changed, 13 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 8818c67..cd9e197 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Export-Package: org.eclipse.core.runtime.adaptor;x-friends:="org.eclipse.core.ru
org.eclipse.osgi.storage.url.reference;x-internal:=true,
org.eclipse.osgi.storagemanager;version="1.0",
org.eclipse.osgi.util;version="1.1",
- org.osgi.framework;version="1.7",
+ org.osgi.framework;version="1.8",
org.osgi.framework.hooks.bundle;version="1.1",
org.osgi.framework.hooks.resolver;version="1.0",
org.osgi.framework.hooks.service;version="1.1",
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java
index 6d07a4c..d31896e 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java
@@ -48,6 +48,14 @@ public interface Constants {
String SYSTEM_BUNDLE_SYMBOLICNAME = "system.bundle";
/**
+ * Identifier of the OSGi <i>system bundle </i>, which is defined to be
+ * {@code 0}.
+ *
+ * @since 1.8
+ */
+ long SYSTEM_BUNDLE_ID = 0L;
+
+ /**
* Manifest header identifying the bundle's category.
* <p>
* The header value may be retrieved from the {@code Dictionary} object
@@ -387,7 +395,8 @@ public interface Constants {
* like:
*
* <pre>
- * Bundle-SymbolicName: com.acme.module.test; fragment-attachment:=&quot;resolve-time&quot;
+ * Bundle-SymbolicName: com.acme.module.test;
+ * fragment-attachment:=&quot;resolve-time&quot;
* </pre>
*
* @see #FRAGMENT_ATTACHMENT_DIRECTIVE
@@ -543,7 +552,8 @@ public interface Constants {
* like:
*
* <pre>
- * Import-Package: org.osgi.framework; bundle-symbolic-name=&quot;com.acme.module.test&quot;
+ * Import-Package: org.osgi.framework;
+ * bundle-symbolic-name=&quot;com.acme.module.test&quot;
* </pre>
*
* @see #IMPORT_PACKAGE