[574049] Improve the detection of OSGi for determining the package

registry implementation

22 files changed, 45 insertions, 27 deletions

diff --git a/features/org.eclipse.emf-feature/feature.xml b/features/org.eclipse.emf-feature/feature.xml
index 1c21ac518..3f47dcb7c 100644
--- a/features/org.eclipse.emf-feature/feature.xml
+++ b/features/org.eclipse.emf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf"
       label="%featureName"
-      version="2.26.0.qualifier"
+      version="2.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf-feature/pom.xml b/features/org.eclipse.emf-feature/pom.xml
index 43a9dc30a..5d31d4221 100644
--- a/features/org.eclipse.emf-feature/pom.xml
+++ b/features/org.eclipse.emf-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf</artifactId>
-  <version>2.26.0-SNAPSHOT</version>
+  <version>2.27.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.all-feature/feature.xml b/features/org.eclipse.emf.all-feature/feature.xml
index e6679280a..909291312 100644
--- a/features/org.eclipse.emf.all-feature/feature.xml
+++ b/features/org.eclipse.emf.all-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.all"
       label="%featureName"
-      version="2.26.0.qualifier"
+      version="2.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.all-feature/pom.xml b/features/org.eclipse.emf.all-feature/pom.xml
index 5604d405d..81b81b35f 100644
--- a/features/org.eclipse.emf.all-feature/pom.xml
+++ b/features/org.eclipse.emf.all-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.all</artifactId>
-  <version>2.26.0-SNAPSHOT</version>
+  <version>2.27.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.base-feature/feature.xml b/features/org.eclipse.emf.base-feature/feature.xml
index 1c23bc1a3..08c19a8f5 100644
--- a/features/org.eclipse.emf.base-feature/feature.xml
+++ b/features/org.eclipse.emf.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.base"
       label="%featureName"
-      version="2.26.0.qualifier"
+      version="2.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.base-feature/pom.xml b/features/org.eclipse.emf.base-feature/pom.xml
index a60ac226b..3dc6ed978 100644
--- a/features/org.eclipse.emf.base-feature/pom.xml
+++ b/features/org.eclipse.emf.base-feature/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.base</artifactId>
-  <version>2.26.0-SNAPSHOT</version>
+  <version>2.27.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.common-feature/feature.xml b/features/org.eclipse.emf.common-feature/feature.xml
index adfe1daf6..d511cd711 100644
--- a/features/org.eclipse.emf.common-feature/feature.xml
+++ b/features/org.eclipse.emf.common-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.common"
       label="%featureName"
-      version="2.22.0.qualifier"
+      version="2.23.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.common-feature/pom.xml b/features/org.eclipse.emf.common-feature/pom.xml
index af4d06142..39610269a 100644
--- a/features/org.eclipse.emf.common-feature/pom.xml
+++ b/features/org.eclipse.emf.common-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.common</artifactId>
-  <version>2.22.0-SNAPSHOT</version>
+  <version>2.23.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.ecore-feature/feature.xml b/features/org.eclipse.emf.ecore-feature/feature.xml
index fd8c8e0b9..7abe8eb97 100644
--- a/features/org.eclipse.emf.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecore"
       label="%featureName"
-      version="2.24.0.qualifier"
+      version="2.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.ecore-feature/pom.xml b/features/org.eclipse.emf.ecore-feature/pom.xml
index 2d6448ed9..1d0165c53 100644
--- a/features/org.eclipse.emf.ecore-feature/pom.xml
+++ b/features/org.eclipse.emf.ecore-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.ecore</artifactId>
-  <version>2.24.0-SNAPSHOT</version>
+  <version>2.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.rap-feature/feature.xml b/features/org.eclipse.emf.rap-feature/feature.xml
index 243e7c17e..3fab18b73 100755
--- a/features/org.eclipse.emf.rap-feature/feature.xml
+++ b/features/org.eclipse.emf.rap-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.rap"
       label="%featureName"
-      version="2.26.0.qualifier"
+      version="2.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.rap-feature/pom.xml b/features/org.eclipse.emf.rap-feature/pom.xml
index d6418036d..080e066dc 100644
--- a/features/org.eclipse.emf.rap-feature/pom.xml
+++ b/features/org.eclipse.emf.rap-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.rap</artifactId>
-  <version>2.26.0-SNAPSHOT</version>
+  <version>2.27.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.rap.sdk-feature/feature.xml b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
index 8aaa9a79e..23e218ece 100755
--- a/features/org.eclipse.emf.rap.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.rap.sdk"
       label="%featureName"
-      version="2.26.0.qualifier"
+      version="2.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.rap.sdk-feature/pom.xml b/features/org.eclipse.emf.rap.sdk-feature/pom.xml
index 23db4968f..da92e1dcb 100644
--- a/features/org.eclipse.emf.rap.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.rap.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.rap.sdk</artifactId>
-  <version>2.26.0-SNAPSHOT</version>
+  <version>2.27.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.sdk-feature/feature.xml b/features/org.eclipse.emf.sdk-feature/feature.xml
index 616cd445c..e76aad93f 100644
--- a/features/org.eclipse.emf.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.sdk"
       label="%featureName"
-      version="2.26.0.qualifier"
+      version="2.27.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.sdk-feature/pom.xml b/features/org.eclipse.emf.sdk-feature/pom.xml
index cd00cfb13..cf7852690 100644
--- a/features/org.eclipse.emf.sdk-feature/pom.xml
+++ b/features/org.eclipse.emf.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.sdk</artifactId>
-  <version>2.26.0-SNAPSHOT</version>
+  <version>2.27.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
index a5aba8886..4edda7f34 100644
--- a/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.common;singleton:=true
-Bundle-Version: 2.22.0.qualifier
+Bundle-Version: 2.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.common.CommonPlugin$Implementation$Activator
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.common/pom.xml b/plugins/org.eclipse.emf.common/pom.xml
index 483ecab9f..fb734194a 100644
--- a/plugins/org.eclipse.emf.common/pom.xml
+++ b/plugins/org.eclipse.emf.common/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.common</artifactId>
-  <version>2.22.0-SNAPSHOT</version>
+  <version>2.23.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java
index a3e71f07b..e85619569 100644
--- a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java
+++ b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java
@@ -21,21 +21,21 @@ import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 import java.util.jar.Manifest;
 
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-
 import org.eclipse.emf.common.util.DelegatingResourceLocator;
 import org.eclipse.emf.common.util.Logger;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.WrappedException;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
 
 
 /**
@@ -57,6 +57,24 @@ import org.eclipse.emf.common.util.WrappedException;
  */
 public abstract class EMFPlugin extends DelegatingResourceLocator implements ResourceLocator, Logger
 {
+  /**
+   * @since 2.27
+   */
+  public static final boolean IS_OSGI_RUNNING;
+  static
+  {
+    boolean result = false;
+    try
+    {
+      result = FrameworkUtil.getBundle(EMFPlugin.class) != null;
+    }
+    catch (Throwable exception)
+    {
+      // Assume that we aren't running.
+    }
+    IS_OSGI_RUNNING = result;
+  }
+
   public static final boolean IS_ECLIPSE_RUNNING;
   static
   {
diff --git a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
index 809532254..10dc68669 100644
--- a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecore;singleton:=true
-Bundle-Version: 2.24.0.qualifier
+Bundle-Version: 2.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation$Activator
 Bundle-Vendor: %providerName
@@ -22,7 +22,7 @@ Export-Package: org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.xml.type.internal,
  org.eclipse.emf.ecore.xml.type.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.common;bundle-version="[2.22.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.common;bundle-version="[2.23.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional
 Import-Package: javax.crypto,
  javax.crypto.spec,
diff --git a/plugins/org.eclipse.emf.ecore/pom.xml b/plugins/org.eclipse.emf.ecore/pom.xml
index 6066ecb67..39340caa0 100644
--- a/plugins/org.eclipse.emf.ecore/pom.xml
+++ b/plugins/org.eclipse.emf.ecore/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.ecore</artifactId>
-  <version>2.24.0-SNAPSHOT</version>
+  <version>2.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageRegistryImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageRegistryImpl.java
index d58afbf07..c2ce4e628 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EPackageRegistryImpl.java
@@ -52,7 +52,7 @@ public class EPackageRegistryImpl extends HashMap<String, Object> implements EPa
         {
           return EcorePlugin.getDefaultRegistryImplementation();
         }
-        else if (!EMFPlugin.IS_ECLIPSE_RUNNING)
+        else if (!EMFPlugin.IS_OSGI_RUNNING)
         {
           try
           {