Replace dependency to core.runtime in demo bundles
The problem with the org.eclipse.core.runtime bundle is that it
depends on org.eclipse.osgi and cannot be used outside of the
Equinox environment. To make our demos work in other environments,
we have to use the org.eclipse.equinox.common bundles that exports
the org.eclipse.core.runtime package.
A package import of org.eclipse.core.runtime would be preferable
but lead to obscure problems when testing with virgo nano (split
packages?). Since the jface bundle also requires equinox.common,
exchanging Require-Bundle: org.eclipse.core.runtime with
Require-Bundle: org.eclipse.equinox.common should be safe.
Also remove unneeded dependency to core.runtime in demo.databinding.
diff --git a/examples/org.eclipse.rap.demo.controls/.classpath b/examples/org.eclipse.rap.demo.controls/.classpath
index 5e4c1fe..f930cb7 100644
--- a/examples/org.eclipse.rap.demo.controls/.classpath
+++ b/examples/org.eclipse.rap.demo.controls/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF
index d36f29c..fa554b5 100644
--- a/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF
@@ -6,10 +6,11 @@
Bundle-Version: 2.2.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet.http;version="[2.3.0,4.0.0)"
+Import-Package: javax.servlet.http;version="[2.3.0,4.0.0)",
+ org.eclipse.core.runtime.jobs
Export-Package: org.eclipse.rap.demo.controls;version="2.2.0",
org.eclipse.rap.demo.controls.internal;version="2.2.0";x-internal:=true
Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.2.0,3.0.0)",
org.eclipse.rap.jface;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="3.8.0"
+ org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
Service-Component: OSGI-INF/contribution.xml
diff --git a/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF
index db3b5f0..c2ae96a 100644
--- a/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@
Bundle-SymbolicName: org.eclipse.rap.demo.databinding;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rap.jface.databinding;bundle-version="[2.2.0,3.0.0)",
+Require-Bundle: org.eclipse.rap.jface.databinding;bundle-version="[2.2.0,3.0.0)",
org.eclipse.core.databinding,
org.eclipse.core.databinding.beans,
org.eclipse.rap.ui;bundle-version="[2.2.0,3.0.0)"
diff --git a/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF
index 2d1930e..e03c0b9 100644
--- a/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
Bundle-Vendor: Eclipse.org - RAP
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.rap.rwt;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.rap.jface;bundle-version="[2.2.0,3.0.0)"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.rap.jface;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
Export-Package: org.eclipse.rap.examples.pages;version="2.2.0",
org.eclipse.rap.examples.pages.internal;version="2.2.0";x-internal:=true
Bundle-Activator: org.eclipse.rap.examples.pages.internal.Activator
