osgi migration + PDE container classpath

12 files changed, 18 insertions, 29 deletions

diff --git a/org.eclipse.core.variables/.classpath b/org.eclipse.core.variables/.classpath
index 1d9c0b193..065ac06e1 100644
--- a/org.eclipse.core.variables/.classpath
+++ b/org.eclipse.core.variables/.classpath
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.core.variables/.project b/org.eclipse.core.variables/.project
index 4d5f62c31..e64abaf42 100644
--- a/org.eclipse.core.variables/.project
+++ b/org.eclipse.core.variables/.project
@@ -5,6 +5,7 @@
 	<projects>
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.runtime</project>
+		<project>org.eclipse.core.runtime.compatibility</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.eclipse.core.variables/plugin.xml b/org.eclipse.core.variables/plugin.xml
index f5afa611d..59c9bb433 100644
--- a/org.eclipse.core.variables/plugin.xml
+++ b/org.eclipse.core.variables/plugin.xml
@@ -13,6 +13,9 @@
          <packages prefixes="org.eclipse.core.variables,org.eclipse.core.internal.variables"/>
       </library>
    </runtime>
+   <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+   </requires>
 
    <extension-point id="valueVariables" name="%valueVariablesExtensionPointName" schema="schema/valueVariables.exsd"/>
    <extension-point id="dynamicVariables" name="%dynamicVariablesExtensionPointName" schema="schema/dynamicVariables.exsd"/>
diff --git a/org.eclipse.debug.core/.classpath b/org.eclipse.debug.core/.classpath
index db121f0ec..03bbb4390 100644
--- a/org.eclipse.debug.core/.classpath
+++ b/org.eclipse.debug.core/.classpath
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="core/"/>
-	<classpathentry kind="src" path="/org.eclipse.core.resources"/>
-	<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-	<classpathentry kind="src" path="/org.eclipse.core.boot"/>
-	<classpathentry kind="src" path="/org.eclipse.core.variables"/>
+	<classpathentry kind="src" path="core"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.debug.core/.project b/org.eclipse.debug.core/.project
index 81ea7d8c4..e9b31379a 100644
--- a/org.eclipse.debug.core/.project
+++ b/org.eclipse.debug.core/.project
@@ -6,6 +6,7 @@
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>
 		<project>org.eclipse.core.runtime</project>
+		<project>org.eclipse.core.runtime.compatibility</project>
 		<project>org.eclipse.core.variables</project>
 	</projects>
 	<buildSpec>
diff --git a/org.eclipse.debug.core/plugin.xml b/org.eclipse.debug.core/plugin.xml
index ea8e51bce..630b98844 100644
--- a/org.eclipse.debug.core/plugin.xml
+++ b/org.eclipse.debug.core/plugin.xml
@@ -16,6 +16,7 @@
    <requires>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.variables"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/org.eclipse.debug.ui/.classpath b/org.eclipse.debug.ui/.classpath
index 88983197a..34566f502 100644
--- a/org.eclipse.debug.ui/.classpath
+++ b/org.eclipse.debug.ui/.classpath
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="ui"/>
-	<classpathentry kind="src" path="/org.eclipse.core.resources"/>
-	<classpathentry kind="src" path="/org.eclipse.core.variables"/>
-	<classpathentry kind="src" path="/org.eclipse.ui"/>
-	<classpathentry kind="src" path="/org.eclipse.ui.console"/>
-	<classpathentry kind="src" path="/org.eclipse.help"/>
-	<classpathentry kind="src" path="/org.eclipse.debug.core"/>
-	<classpathentry kind="src" path="/org.eclipse.jface.text"/>
-	<classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/>
-	<classpathentry kind="src" path="/org.eclipse.ui.ide"/>
-	<classpathentry kind="src" path="/org.eclipse.ui.editors"/>
-	<classpathentry kind="src" path="/org.eclipse.core.boot"/>
-	<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.debug.ui/.project b/org.eclipse.debug.ui/.project
index 4efd391de..ef2c7ec7b 100644
--- a/org.eclipse.debug.ui/.project
+++ b/org.eclipse.debug.ui/.project
@@ -6,6 +6,7 @@
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>
 		<project>org.eclipse.core.runtime</project>
+		<project>org.eclipse.core.runtime.compatibility</project>
 		<project>org.eclipse.core.variables</project>
 		<project>org.eclipse.debug.core</project>
 		<project>org.eclipse.help</project>
diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
index c8df205ff..ad8e49299 100644
--- a/org.eclipse.debug.ui/plugin.xml
+++ b/org.eclipse.debug.ui/plugin.xml
@@ -24,6 +24,7 @@
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
 
 
diff --git a/org.eclipse.ui.console/.classpath b/org.eclipse.ui.console/.classpath
index cd1463d1b..065ac06e1 100644
--- a/org.eclipse.ui.console/.classpath
+++ b/org.eclipse.ui.console/.classpath
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="/org.eclipse.core.resources"/>
-	<classpathentry kind="src" path="/org.eclipse.ui"/>
-	<classpathentry kind="src" path="/org.eclipse.jface.text"/>
-	<classpathentry kind="src" path="/org.eclipse.help"/>
-	<classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/>
-	<classpathentry kind="src" path="/org.eclipse.core.boot"/>
-	<classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ui.console/.project b/org.eclipse.ui.console/.project
index 1c96d339a..576f45853 100644
--- a/org.eclipse.ui.console/.project
+++ b/org.eclipse.ui.console/.project
@@ -6,6 +6,7 @@
 		<project>org.eclipse.core.boot</project>
 		<project>org.eclipse.core.resources</project>
 		<project>org.eclipse.core.runtime</project>
+		<project>org.eclipse.core.runtime.compatibility</project>
 		<project>org.eclipse.help</project>
 		<project>org.eclipse.jface.text</project>
 		<project>org.eclipse.ui</project>
diff --git a/org.eclipse.ui.console/plugin.xml b/org.eclipse.ui.console/plugin.xml
index 89f16d5ca..3bf58b53f 100644
--- a/org.eclipse.ui.console/plugin.xml
+++ b/org.eclipse.ui.console/plugin.xml
@@ -19,6 +19,7 @@
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>