diff --git a/build/org.eclipse.cdt.make.core/.classpath b/build/org.eclipse.cdt.make.core/.classpath
index 0aeb87a163a..065ac06e197 100644
--- a/build/org.eclipse.cdt.make.core/.classpath
+++ b/build/org.eclipse.cdt.make.core/.classpath
@@ -1,15 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/build/org.eclipse.cdt.make.core/.project b/build/org.eclipse.cdt.make.core/.project
index 01c697756df..8a04c072ab5 100644
--- a/build/org.eclipse.cdt.make.core/.project
+++ b/build/org.eclipse.cdt.make.core/.project
@@ -3,15 +3,7 @@
org.eclipse.cdt.make.core
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.cdt.core.linux
- org.eclipse.cdt.core.qnx
- org.eclipse.cdt.core.solaris
- org.eclipse.cdt.core.win32
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index d0d4ca08a20..77f57f4f6f8 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/build/org.eclipse.cdt.make.ui/.project b/build/org.eclipse.cdt.make.ui/.project
index 36dd5636da8..1b1d4a96461 100644
--- a/build/org.eclipse.cdt.make.ui/.project
+++ b/build/org.eclipse.cdt.make.ui/.project
@@ -4,16 +4,8 @@
org.eclipse.cdt.core
- org.eclipse.cdt.core.linux
- org.eclipse.cdt.core.qnx
- org.eclipse.cdt.core.solaris
- org.eclipse.cdt.core.win32
org.eclipse.cdt.make.core
org.eclipse.cdt.ui
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.ui
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index cf411450d64..ee5c4156e81 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core/.classpath b/build/org.eclipse.cdt.managedbuilder.core/.classpath
index 37a7e5c72df..065ac06e197 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/.classpath
+++ b/build/org.eclipse.cdt.managedbuilder.core/.classpath
@@ -1,15 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core/.project b/build/org.eclipse.cdt.managedbuilder.core/.project
index fe252f677b2..35661dd74df 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/.project
+++ b/build/org.eclipse.cdt.managedbuilder.core/.project
@@ -3,15 +3,7 @@
org.eclipse.cdt.managedbuilder.core
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.cdt.core.linux
- org.eclipse.cdt.core.qnx
- org.eclipse.cdt.core.solaris
- org.eclipse.cdt.core.win32
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index aa65e7256d2..e7ad4a393c1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.project b/build/org.eclipse.cdt.managedbuilder.ui/.project
index 9091b32f7a0..859042cc435 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/.project
+++ b/build/org.eclipse.cdt.managedbuilder.ui/.project
@@ -4,16 +4,8 @@
org.eclipse.cdt.core
- org.eclipse.cdt.core.linux
- org.eclipse.cdt.core.qnx
- org.eclipse.cdt.core.solaris
- org.eclipse.cdt.core.win32
org.eclipse.cdt.managedbuilder.core
org.eclipse.cdt.ui
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.ui
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index c9a1bdd752f..e9041e41a2f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.aix/.classpath b/core/org.eclipse.cdt.core.aix/.classpath
index 2f498f50b33..065ac06e197 100644
--- a/core/org.eclipse.cdt.core.aix/.classpath
+++ b/core/org.eclipse.cdt.core.aix/.classpath
@@ -1,16 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.aix/.project b/core/org.eclipse.cdt.core.aix/.project
index 8c2ed1f29a4..8edd1404d74 100644
--- a/core/org.eclipse.cdt.core.aix/.project
+++ b/core/org.eclipse.cdt.core.aix/.project
@@ -3,16 +3,7 @@
org.eclipse.cdt.core.aix
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.search
- org.eclipse.team.core
- org.eclipse.ui
diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml
index 040152b7c9f..9824916abbf 100644
--- a/core/org.eclipse.cdt.core.aix/fragment.xml
+++ b/core/org.eclipse.cdt.core.aix/fragment.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.linux/.project b/core/org.eclipse.cdt.core.linux/.project
index fe06d602a6d..43f20bda72b 100644
--- a/core/org.eclipse.cdt.core.linux/.project
+++ b/core/org.eclipse.cdt.core.linux/.project
@@ -3,14 +3,7 @@
org.eclipse.cdt.core.linux
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.search
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index 08cc3ea37d2..989c14ab6e7 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.qnx/.project b/core/org.eclipse.cdt.core.qnx/.project
index 7e3a64e9bd3..9aa2652590a 100644
--- a/core/org.eclipse.cdt.core.qnx/.project
+++ b/core/org.eclipse.cdt.core.qnx/.project
@@ -3,14 +3,7 @@
org.eclipse.cdt.core.qnx
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.search
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index b6feb38bb44..11745e6d5dd 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.solaris/.project b/core/org.eclipse.cdt.core.solaris/.project
index 7b718d54ba7..d02ba7f9f05 100644
--- a/core/org.eclipse.cdt.core.solaris/.project
+++ b/core/org.eclipse.cdt.core.solaris/.project
@@ -3,14 +3,7 @@
org.eclipse.cdt.core.solaris
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.search
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index 3ea0df9dfef..495da0f7b5e 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.tests/.project b/core/org.eclipse.cdt.core.tests/.project
index 85e78223521..873e177f7c8 100644
--- a/core/org.eclipse.cdt.core.tests/.project
+++ b/core/org.eclipse.cdt.core.tests/.project
@@ -3,21 +3,10 @@
org.eclipse.cdt.core.tests
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.cdt.core.linux
- org.eclipse.cdt.core.qnx
- org.eclipse.cdt.core.solaris
- org.eclipse.cdt.core.win32
org.eclipse.cdt.make.core
org.eclipse.cdt.managedbuilder.core
org.eclipse.cdt.ui
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.swt
- org.eclipse.ui
- org.junit
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index cccbd12232e..fe0fd3442e1 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java
deleted file mode 100644
index 0222d528e3d..00000000000
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java
+++ /dev/null
@@ -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;
-
- }
-
-
-}
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.core.win32/.classpath b/core/org.eclipse.cdt.core.win32/.classpath
index d2b793e8a1f..065ac06e197 100644
--- a/core/org.eclipse.cdt.core.win32/.classpath
+++ b/core/org.eclipse.cdt.core.win32/.classpath
@@ -1,14 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/core/org.eclipse.cdt.core.win32/.project b/core/org.eclipse.cdt.core.win32/.project
index c0dc3c4eb89..0c2dc05e8ad 100644
--- a/core/org.eclipse.cdt.core.win32/.project
+++ b/core/org.eclipse.cdt.core.win32/.project
@@ -3,14 +3,7 @@
org.eclipse.cdt.core.win32
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.search
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index 8af9d240a15..d56f46969d6 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.core/.project b/core/org.eclipse.cdt.core/.project
index ba2680f0072..95eceb11fac 100644
--- a/core/org.eclipse.cdt.core/.project
+++ b/core/org.eclipse.cdt.core/.project
@@ -3,14 +3,6 @@
org.eclipse.cdt.core
- org.apache.xerces
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.search
- org.eclipse.team.core
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 8c73a6e619c..f31224caffb 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.ui.tests/.project b/core/org.eclipse.cdt.ui.tests/.project
index 3f4f6406025..de367d9e4cb 100644
--- a/core/org.eclipse.cdt.ui.tests/.project
+++ b/core/org.eclipse.cdt.ui.tests/.project
@@ -3,14 +3,8 @@
org.eclipse.cdt.ui.tests
- org.apache.xerces
+ org.eclipse.cdt.core
org.eclipse.cdt.ui
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.swt
- org.eclipse.ui
- org.junit
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index e1f3ce42b85..054005b77fa 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java
deleted file mode 100644
index 0222d528e3d..00000000000
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java
+++ /dev/null
@@ -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;
-
- }
-
-
-}
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/.classpath b/core/org.eclipse.cdt.ui/.classpath
index 0bcc542d2a9..d585f114592 100644
--- a/core/org.eclipse.cdt.ui/.classpath
+++ b/core/org.eclipse.cdt.ui/.classpath
@@ -1,17 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/core/org.eclipse.cdt.ui/.project b/core/org.eclipse.cdt.ui/.project
index 3b1e639d37a..04403a7b87c 100644
--- a/core/org.eclipse.cdt.ui/.project
+++ b/core/org.eclipse.cdt.ui/.project
@@ -3,16 +3,7 @@
org.eclipse.cdt.ui
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.compare
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.debug.ui
- org.eclipse.search
- org.eclipse.ui
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index d1df4c836e5..a17ff02d33d 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
@@ -336,7 +342,7 @@
+ point="org.eclipse.ui.ide.projectNatureImages">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.core/.project b/debug/org.eclipse.cdt.debug.core/.project
index 730404d6973..a0751078e2e 100644
--- a/debug/org.eclipse.cdt.debug.core/.project
+++ b/debug/org.eclipse.cdt.debug.core/.project
@@ -3,12 +3,7 @@
org.eclipse.cdt.debug.core
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 8db11ec524e..786994fe9c3 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.mi.core/.project b/debug/org.eclipse.cdt.debug.mi.core/.project
index 7434461909b..016309439c3 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/.project
+++ b/debug/org.eclipse.cdt.debug.mi.core/.project
@@ -5,10 +5,6 @@
org.eclipse.cdt.core
org.eclipse.cdt.debug.core
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index 45ac5cfec97..b33467db189 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.project b/debug/org.eclipse.cdt.debug.mi.ui/.project
index 97bee48cc25..ee92c3d5275 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/.project
+++ b/debug/org.eclipse.cdt.debug.mi.ui/.project
@@ -8,12 +8,6 @@
org.eclipse.cdt.debug.ui
org.eclipse.cdt.launch
org.eclipse.cdt.ui
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.debug.ui
- org.eclipse.ui
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 4dbd7e2a110..48d01ffcda7 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.classpath b/debug/org.eclipse.cdt.debug.ui.tests/.classpath
index f106e2d20bd..d16b7548c1d 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/.classpath
+++ b/debug/org.eclipse.cdt.debug.ui.tests/.classpath
@@ -1,22 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.project b/debug/org.eclipse.cdt.debug.ui.tests/.project
index 891a6c4d5f5..bec51f088aa 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/.project
+++ b/debug/org.eclipse.cdt.debug.ui.tests/.project
@@ -3,21 +3,9 @@
org.eclipse.cdt.debug.ui.tests
- org.apache.xerces
org.eclipse.cdt.core
- org.eclipse.cdt.core.linux
- org.eclipse.cdt.core.qnx
- org.eclipse.cdt.core.solaris
- org.eclipse.cdt.core.win32
org.eclipse.cdt.debug.core
org.eclipse.cdt.debug.mi.core
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.swt
- org.eclipse.ui
- org.eclipse.update.core
- org.junit
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index f97864993cb..525a8a55b67 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.ui/.classpath b/debug/org.eclipse.cdt.debug.ui/.classpath
index 712ef3d8f53..065ac06e197 100644
--- a/debug/org.eclipse.cdt.debug.ui/.classpath
+++ b/debug/org.eclipse.cdt.debug.ui/.classpath
@@ -1,16 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/debug/org.eclipse.cdt.debug.ui/.project b/debug/org.eclipse.cdt.debug.ui/.project
index f5ffeabe9d4..9786a16312f 100644
--- a/debug/org.eclipse.cdt.debug.ui/.project
+++ b/debug/org.eclipse.cdt.debug.ui/.project
@@ -3,16 +3,9 @@
org.eclipse.cdt.debug.ui
- org.apache.xerces
org.eclipse.cdt.core
org.eclipse.cdt.debug.core
org.eclipse.cdt.ui
- org.eclipse.core.boot
- org.eclipse.core.resources
- org.eclipse.core.runtime
- org.eclipse.debug.core
- org.eclipse.debug.ui
- org.eclipse.ui
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 58ce745ff35..d4a02b348b9 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/doc/org.eclipse.cdt.doc.user/.project b/doc/org.eclipse.cdt.doc.user/.project
index d137829266b..6fffba66603 100644
--- a/doc/org.eclipse.cdt.doc.user/.project
+++ b/doc/org.eclipse.cdt.doc.user/.project
@@ -5,7 +5,18 @@
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+ org.eclipse.pde.PluginNature
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index e52cb71e732..2c44b5689af 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -1,4 +1,5 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 9d61e8bbe75..5cb787fc227 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -1,4 +1,5 @@
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt-feature/.project b/releng/org.eclipse.cdt-feature/.project
index d5b49216e39..514cc100664 100644
--- a/releng/org.eclipse.cdt-feature/.project
+++ b/releng/org.eclipse.cdt-feature/.project
@@ -10,8 +10,19 @@
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
org.eclipse.pde.FeatureNature
+ org.eclipse.pde.PluginNature
diff --git a/releng/org.eclipse.cdt-feature/plugin.xml b/releng/org.eclipse.cdt-feature/plugin.xml
new file mode 100644
index 00000000000..38beabb52f2
--- /dev/null
+++ b/releng/org.eclipse.cdt-feature/plugin.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.testing-feature/.project b/releng/org.eclipse.cdt.testing-feature/.project
index 4699c7217c6..63f3a231d39 100644
--- a/releng/org.eclipse.cdt.testing-feature/.project
+++ b/releng/org.eclipse.cdt.testing-feature/.project
@@ -5,7 +5,18 @@
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+ org.eclipse.pde.PluginNature
diff --git a/releng/org.eclipse.cdt.testing-feature/plugin.xml b/releng/org.eclipse.cdt.testing-feature/plugin.xml
new file mode 100644
index 00000000000..7f9a5d27890
--- /dev/null
+++ b/releng/org.eclipse.cdt.testing-feature/plugin.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.testing/.project b/releng/org.eclipse.cdt.testing/.project
index c31e57e455c..162151c68c5 100644
--- a/releng/org.eclipse.cdt.testing/.project
+++ b/releng/org.eclipse.cdt.testing/.project
@@ -5,7 +5,18 @@
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+ org.eclipse.pde.PluginNature
diff --git a/releng/org.eclipse.cdt.testing/plugin.xml b/releng/org.eclipse.cdt.testing/plugin.xml
index f4a973bd113..0b524685bb0 100644
--- a/releng/org.eclipse.cdt.testing/plugin.xml
+++ b/releng/org.eclipse.cdt.testing/plugin.xml
@@ -1,4 +1,5 @@
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+ org.eclipse.pde.PluginNature
diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml
index 839d4fee9e5..6bd4a83e39b 100644
--- a/releng/org.eclipse.cdt/plugin.xml
+++ b/releng/org.eclipse.cdt/plugin.xml
@@ -1,4 +1,5 @@
+