Upgrade to Eclipse 3.0. Includes:

- upgrade plugin.xml files
- use PDE containers
- apply Eclipse 3.0 porting items, in particular openEditor and gotoMarker
- remove TestWorkbenches from test plugins

build/org.eclipse.cdt.make.core/.classpath

@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <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"/>
 </classpath>

build/org.eclipse.cdt.make.core/.project

@@ -3,15 +3,7 @@
 	<name>org.eclipse.cdt.make.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

build/org.eclipse.cdt.make.core/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.make.core"
    name="%pluginName"

build/org.eclipse.cdt.make.ui/.classpath

@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
-    <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"/>
 </classpath>

build/org.eclipse.cdt.make.ui/.project

@@ -4,16 +4,8 @@
 	<comment></comment>
 	<projects>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.make.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

build/org.eclipse.cdt.make.ui/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.make.ui"
    name="%pluginName"
@@ -12,6 +13,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.cdt.core"/>

build/org.eclipse.cdt.managedbuilder.core/.classpath

@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

build/org.eclipse.cdt.managedbuilder.core/.project

@@ -3,15 +3,7 @@
 	<name>org.eclipse.cdt.managedbuilder.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

build/org.eclipse.cdt.managedbuilder.core/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.managedbuilder.core"
    name="%pluginName"

build/org.eclipse.cdt.managedbuilder.ui/.classpath

@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
-    <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"/>
 </classpath>

build/org.eclipse.cdt.managedbuilder.ui/.project

@@ -4,16 +4,8 @@
 	<comment></comment>
 	<projects>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.managedbuilder.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

build/org.eclipse.cdt.managedbuilder.ui/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.managedbuilder.ui"
    name="%pluginName"
@@ -12,6 +13,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.cdt.core"/>

core/org.eclipse.cdt.core.aix/.classpath

@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.team.core"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.core.aix/.project

@@ -3,16 +3,7 @@
 	<name>org.eclipse.cdt.core.aix</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.team.core</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core.aix/fragment.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <fragment
    id="org.eclipse.cdt.core.aix"
    name="%fragmentName"

core/org.eclipse.cdt.core.linux/.classpath

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<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>

core/org.eclipse.cdt.core.linux/.project

@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.linux</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core.linux/fragment.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <fragment
    id="org.eclipse.cdt.core.linux"
    name="%fragmentName"

core/org.eclipse.cdt.core.qnx/.classpath

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.core.qnx/.project

@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.qnx</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core.qnx/fragment.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <fragment
    id="org.eclipse.cdt.core.qnx"
    name="%fragmentName"

core/org.eclipse.cdt.core.solaris/.classpath

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.core.solaris/.project

@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.solaris</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core.solaris/fragment.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <fragment
    id="org.eclipse.cdt.core.solaris"
    name="%fragmentName"

core/org.eclipse.cdt.core.tests/.classpath

@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="build/"/>
+	<classpathentry kind="src" path="build"/>
-    <classpathentry kind="src" path="failures/"/>
+	<classpathentry kind="src" path="failures"/>
-    <classpathentry kind="src" path="model/"/>
+	<classpathentry kind="src" path="model"/>
-    <classpathentry kind="src" path="parser/"/>
+	<classpathentry kind="src" path="parser"/>
-    <classpathentry kind="src" path="resources/"/>
+	<classpathentry kind="src" path="resources"/>
-    <classpathentry kind="src" path="suite/"/>
+	<classpathentry kind="src" path="suite"/>
-    <classpathentry kind="src" path="indexer/"/>
+	<classpathentry kind="src" path="indexer"/>
-    <classpathentry kind="src" path="search/"/>
+	<classpathentry kind="src" path="search"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.core.tests/.project

@@ -3,21 +3,10 @@
 	<name>org.eclipse.cdt.core.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.make.core</project>
 		<project>org.eclipse.cdt.managedbuilder.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.junit</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core.tests/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
@@ -11,6 +12,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>

core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java

@@ -1,79 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.cdt.testplugin;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.ui.internal.Workbench;
-
-public class TestWorkbench extends Workbench {
-
-	/**
-	 * Run an event loop for the workbench.
-	 */
-	protected void runEventLoop() {
-		// Dispatch all events.
-		Display display = Display.getCurrent();
-		while (true) {
-			try {
-				if (!display.readAndDispatch())
-					break;
-			} catch (Throwable e) {
-				break;
-			}
-		}
-		IPath location= CTestPlugin.getWorkspace().getRoot().getLocation();
-		System.out.println("Workspace-location: " + location.toString());
-				
-		
-		try {
-			String[] args= getCommandLineArgs();
-			if (args.length > 0) {
-				Test test= getTest(args[0]);
-				TestRunner.run(test);
-			} else {
-				System.out.println("TestWorkbench: Argument must be class name");
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		
-		// Close the workbench.
-		close();
-	}
-	
-	public Test getTest(String className) throws Exception {
-		Class testClass= getClass().getClassLoader().loadClass(className);
-
-		Method suiteMethod= null;
-		try {
-			suiteMethod= testClass.getMethod(TestRunner.SUITE_METHODNAME, new Class[0]);
-	 	} catch (Exception e) {
-	 		// try to extract a test suite automatically	
-			return new TestSuite(testClass);
-		}
-		try {
-			return (Test) suiteMethod.invoke(null, new Class[0]); // static method
-		} catch (InvocationTargetException e) {
-			System.out.println("Failed to invoke suite():" + e.getTargetException().toString());
-		} catch (IllegalAccessException e) {
-			System.out.println("Failed to invoke suite():" + e.toString());
-		}
-		return null; 
-
-	}
-	
-	
-}

core/org.eclipse.cdt.core.win32/.classpath

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<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>

core/org.eclipse.cdt.core.win32/.project

@@ -3,14 +3,7 @@
 	<name>org.eclipse.cdt.core.win32</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core.win32/fragment.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <fragment
    id="org.eclipse.cdt.core.win32"
    name="%fragmentName"

core/org.eclipse.cdt.core/.classpath

@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="build/"/>
+	<classpathentry kind="src" path="build"/>
-    <classpathentry kind="src" path="index/"/>
+	<classpathentry kind="src" path="index"/>
-    <classpathentry kind="src" path="model/"/>
+	<classpathentry kind="src" path="model"/>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="utils/"/>
+	<classpathentry kind="src" path="utils"/>
-    <classpathentry kind="src" path="search/"/>
+	<classpathentry kind="src" path="search"/>
-    <classpathentry kind="src" path="dependency/"/>
+	<classpathentry kind="src" path="dependency"/>
 	<classpathentry kind="src" path="parser"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.team.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.core/.project

@@ -3,14 +3,6 @@
 	<name>org.eclipse.cdt.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.team.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.core/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.core"
    name="%pluginName"

core/org.eclipse.cdt.ui.tests/.classpath

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="ui/"/>
+	<classpathentry kind="src" path="ui"/>
-    <classpathentry kind="src" path="core/"/>
+	<classpathentry kind="src" path="core"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.ui.tests/.project

@@ -3,14 +3,8 @@
 	<name>org.eclipse.cdt.ui.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
+		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.junit</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.ui.tests/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.ui.tests"
    name="org.eclipse.cdt.ui.tests"
@@ -11,6 +12,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>

core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java

@@ -1,79 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.cdt.testplugin;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.ui.internal.Workbench;
-
-public class TestWorkbench extends Workbench {
-
-	/**
-	 * Run an event loop for the workbench.
-	 */
-	protected void runEventLoop() {
-		// Dispatch all events.
-		Display display = Display.getCurrent();
-		while (true) {
-			try {
-				if (!display.readAndDispatch())
-					break;
-			} catch (Throwable e) {
-				break;
-			}
-		}
-		IPath location= CTestPlugin.getWorkspace().getRoot().getLocation();
-		System.out.println("Workspace-location: " + location.toString());
-				
-		
-		try {
-			String[] args= getCommandLineArgs();
-			if (args.length > 0) {
-				Test test= getTest(args[0]);
-				TestRunner.run(test);
-			} else {
-				System.out.println("TestWorkbench: Argument must be class name");
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		
-		// Close the workbench.
-		close();
-	}
-	
-	public Test getTest(String className) throws Exception {
-		Class testClass= getClass().getClassLoader().loadClass(className);
-
-		Method suiteMethod= null;
-		try {
-			suiteMethod= testClass.getMethod(TestRunner.SUITE_METHODNAME, new Class[0]);
-	 	} catch (Exception e) {
-	 		// try to extract a test suite automatically	
-			return new TestSuite(testClass);
-		}
-		try {
-			return (Test) suiteMethod.invoke(null, new Class[0]); // static method
-		} catch (InvocationTargetException e) {
-			System.out.println("Failed to invoke suite():" + e.getTargetException().toString());
-		} catch (IllegalAccessException e) {
-			System.out.println("Failed to invoke suite():" + e.toString());
-		}
-		return null; 
-
-	}
-	
-	
-}

core/org.eclipse.cdt.ui/.classpath

@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="utils.ui/"/>
+	<classpathentry kind="src" path="utils.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

core/org.eclipse.cdt.ui/.project

@@ -3,16 +3,7 @@
 	<name>org.eclipse.cdt.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.search</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

core/org.eclipse.cdt.ui/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.ui"
    name="%pluginName"
@@ -12,6 +13,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.apache.xerces"/>
@@ -336,7 +342,7 @@
       </actionSet>
    </extension>
    <extension
-         point="org.eclipse.ui.projectNatureImages">
+         point="org.eclipse.ui.ide.projectNatureImages">
       <image
             icon="icons/full/ovr16/c_ovr.gif"
             natureId="org.eclipse.cdt.core.cnature"

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/GotoMarkerAction.java

@@ -27,6 +27,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry;
 import org.eclipse.search.ui.SearchUI;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.ide.IDE;
 
 /**
  * @author aniefer
@@ -74,7 +75,7 @@ public class GotoMarkerAction extends Action {
 			//boo
 		}
 		if( editor != null ){
-			editor.gotoMarker( marker );
+			IDE.gotoMarker(editor, marker);
 		}
 	}
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java

@@ -32,6 +32,7 @@ import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.texteditor.ITextEditor;
 
@@ -109,7 +110,7 @@ public class EditorUtility {
 		if (file != null) {
 			IWorkbenchPage p= CUIPlugin.getActivePage();
 			if (p != null) {
-				IEditorPart editorPart= p.openEditor(file, null, activate);
+				IEditorPart editorPart = IDE.openEditor(p, file, activate);
 				initializeHighlightRange(editorPart);
 				return editorPart;
 			}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java

@@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.internal.WorkbenchMessages;
 import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.PathVariableSelectionDialog;
+import org.eclipse.ui.internal.ide.dialogs.PathVariableSelectionDialog;
 
 /**
  */
@@ -358,7 +358,7 @@ public class LinkToFileGroup extends StringButtonDialogField {
 		if (linkTargetField == null || linkTargetField.isDisposed())
 			return createStatus(IStatus.OK, "");	//$NON-NLS-1$
 	
-		IWorkspace workspace = WorkbenchPlugin.getPluginWorkspace();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		String linkTargetName = linkTargetField.getText();
 		IPath path = new Path(linkTargetName);
 	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java

@@ -42,6 +42,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
@@ -189,7 +190,7 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I
 				try {
 					IWorkbenchPage page = dw.getActivePage();
 					if (page != null)
-						page.openEditor(file);
+						IDE.openEditor(page, file, true);
 				} catch (PartInitException e) {
 					MessageDialog.openError(dw.getShell(),
 						CUIPlugin.getResourceString(OP_ERROR), e.getMessage());

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java

@@ -37,6 +37,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
@@ -165,7 +166,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
 				try {
 					IWorkbenchPage page = dw.getActivePage();
 					if (page != null)
-						page.openEditor(file);
+						IDE.openEditor(page, file, true);
 				} catch (PartInitException e) {
 					MessageDialog.openError(dw.getShell(),
 						CUIPlugin.getResourceString(OP_ERROR), e.getMessage());

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java

@@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
 /**
@@ -113,7 +114,7 @@ public class NewClassWizard extends BasicNewResourceWizard implements INewWizard
 				display.asyncExec(new Runnable() {
 					public void run() {
 						try {
-							activePage.openEditor(resource);
+							IDE.openEditor(activePage, resource, true);
 						} catch (PartInitException e) {
 							CUIPlugin.getDefault().log(e);
 						}

debug/org.eclipse.cdt.debug.core/.classpath

@@ -2,12 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="schema"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

debug/org.eclipse.cdt.debug.core/.project

@@ -3,12 +3,7 @@
 	<name>org.eclipse.cdt.debug.core</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

debug/org.eclipse.cdt.debug.core/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.debug.core"
    name="%pluginName"

debug/org.eclipse.cdt.debug.mi.core/.classpath

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

debug/org.eclipse.cdt.debug.mi.core/.project

@@ -5,10 +5,6 @@
 	<projects>
 		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.debug.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

debug/org.eclipse.cdt.debug.mi.core/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.debug.mi.core"
    name="%pluginName"

debug/org.eclipse.cdt.debug.mi.ui/.classpath

@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.mi.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.launch"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

debug/org.eclipse.cdt.debug.mi.ui/.project

@@ -8,12 +8,6 @@
 		<project>org.eclipse.cdt.debug.ui</project>
 		<project>org.eclipse.cdt.launch</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

debug/org.eclipse.cdt.debug.mi.ui/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.debug.mi.ui"
    name="%pluginName"
@@ -12,6 +13,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.cdt.debug.mi.core"/>

debug/org.eclipse.cdt.debug.ui.tests/.classpath

@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="core/"/>
+	<classpathentry kind="src" path="core"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.mi.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

debug/org.eclipse.cdt.debug.ui.tests/.project

@@ -3,21 +3,9 @@
 	<name>org.eclipse.cdt.debug.ui.tests</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
-		<project>org.eclipse.cdt.core.linux</project>
-		<project>org.eclipse.cdt.core.qnx</project>
-		<project>org.eclipse.cdt.core.solaris</project>
-		<project>org.eclipse.cdt.core.win32</project>
 		<project>org.eclipse.cdt.debug.core</project>
 		<project>org.eclipse.cdt.debug.mi.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.update.core</project>
-		<project>org.junit</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

debug/org.eclipse.cdt.debug.ui.tests/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.debug.ui.tests"
    name="org.eclipse.cdt.debug.ui.tests"
@@ -11,6 +12,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.eclipse.core.boot"/>
       <import plugin="org.eclipse.core.resources"/>

debug/org.eclipse.cdt.debug.ui/.classpath

@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

debug/org.eclipse.cdt.debug.ui/.project

@@ -3,16 +3,9 @@
 	<name>org.eclipse.cdt.debug.ui</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.xerces</project>
 		<project>org.eclipse.cdt.core</project>
 		<project>org.eclipse.cdt.debug.core</project>
 		<project>org.eclipse.cdt.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

debug/org.eclipse.cdt.debug.ui/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.debug.ui"
    name="%pluginName"
@@ -12,6 +13,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.debug.ui"/>

doc/org.eclipse.cdt.doc.user/.project

@@ -5,7 +5,18 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

doc/org.eclipse.cdt.doc.user/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.doc.user"
    name="C/C++ Development User Guide"

launch/org.eclipse.cdt.launch/.classpath

@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.cdt.debug.ui"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

launch/org.eclipse.cdt.launch/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.launch"
    name="%pluginName"
@@ -12,6 +13,11 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>

releng/org.eclipse.cdt-feature/.project

@@ -10,8 +10,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.FeatureNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

releng/org.eclipse.cdt-feature/plugin.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+   id="org.eclipse.cdt-feature"
+   name="Cdt-feature"
+   version="1.0.0">
+
+   <runtime>
+   </runtime>
+
+</plugin>

releng/org.eclipse.cdt.testing-feature/.project

@@ -5,7 +5,18 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

releng/org.eclipse.cdt.testing-feature/plugin.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+   id="org.eclipse.cdt.testing-feature"
+   name="Testing-feature"
+   version="1.0.0">
+
+   <runtime>
+   </runtime>
+
+</plugin>

releng/org.eclipse.cdt.testing/.project

@@ -5,7 +5,18 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

releng/org.eclipse.cdt.testing/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt.testing"
    name="%pluginName"

releng/org.eclipse.cdt/.project

@@ -5,7 +5,18 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

releng/org.eclipse.cdt/plugin.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="org.eclipse.cdt"
    name="%pluginName"