Bug 303083 - Rename spawner bundle to 'native'

Native more accurately reflects what we've put there. They're native
utilities that can be reused by other Eclipse bundles to access
native services.

Also fixed up the cdt 4.4 target which had fixed version numbers for
some of the dependencies and used RSE out of the Luna repo instead
of their latest milestones.

Change-Id: I259aa9e92212409378679a8c61bf2fffd05c67a2
Reviewed-on: https://git.eclipse.org/r/27304
Tested-by: Hudson CI
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>

59 files changed, 82 insertions, 80 deletions

diff --git a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
index df8b1f42fcf..4c7ffed1295 100644
--- a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.aix
 Bundle-SymbolicName: org.eclipse.cdt.core.aix; singleton:=true
 Bundle-Version: 5.4.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-PlatformFilter: (osgi.os=aix)
diff --git a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
index e7e68426db1..392022587fe 100644
--- a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: %fragmentName.linux.ia64
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.ia64;singleton:=true
 Bundle-Version: 5.2.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
index 2ed85d936f6..bcba2c76725 100644
--- a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: %fragmentName.linux.ppc
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.ppc;singleton:=true
 Bundle-Version: 5.2.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=ppc))
diff --git a/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF
index f66a7d3ba33..ef0fbdbd5ab 100644
--- a/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.ppc64/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin

 Bundle-Name: %fragmentName.linux.ppc64

 Bundle-Version: 5.2.0.qualifier

-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"

+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"

 Bundle-Vendor: %providerName

 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=ppc64))

diff --git a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
index 386a692d990..c849eb950db 100644
--- a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: %fragmentName.linux.x86
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86;singleton:=true
 Bundle-Version: 5.3.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86))
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
index 718de1d4b6a..e2dab572f61 100644
--- a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: %fragmentName.linux.x86_64
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86_64;singleton:=true
 Bundle-Version: 5.3.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64))
diff --git a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
index a54b5d531a1..e32e8088c9a 100644
--- a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.linux
 Bundle-SymbolicName: org.eclipse.cdt.core.linux; singleton:=true
 Bundle-Version: 5.3.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Eclipse-PlatformFilter: (osgi.os=linux)
diff --git a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
index f2b20e81cdd..8eae3f91ce4 100644
--- a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.macosx
 Bundle-SymbolicName: org.eclipse.cdt.core.macosx; singleton:=true
 Bundle-Version: 5.3.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-PlatformFilter: (osgi.os=macosx)
diff --git a/core/org.eclipse.cdt.core.spawner/.classpath b/core/org.eclipse.cdt.core.native/.classpath
index c743d53e564..c743d53e564 100644
--- a/core/org.eclipse.cdt.core.spawner/.classpath
+++ b/core/org.eclipse.cdt.core.native/.classpath
diff --git a/core/org.eclipse.cdt.core.spawner/.cvsignore b/core/org.eclipse.cdt.core.native/.cvsignore
index ba077a4031a..ba077a4031a 100644
--- a/core/org.eclipse.cdt.core.spawner/.cvsignore
+++ b/core/org.eclipse.cdt.core.native/.cvsignore
diff --git a/core/org.eclipse.cdt.core.spawner/.project b/core/org.eclipse.cdt.core.native/.project
index ef59af8c889..16748cc2a7f 100644
--- a/core/org.eclipse.cdt.core.spawner/.project
+++ b/core/org.eclipse.cdt.core.native/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.cdt.core.spawner</name>
+	<name>org.eclipse.cdt.core.native</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs
index 4de53820811..4de53820811 100644
--- a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.core.prefs
+++ b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs
diff --git a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.ui.prefs
index b6ac6d0fe0b..b6ac6d0fe0b 100644
--- a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.jdt.ui.prefs
+++ b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.ui.prefs
diff --git a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.pde.api.tools.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.pde.api.tools.prefs
index 3c9c7aa0c1b..3c9c7aa0c1b 100644
--- a/core/org.eclipse.cdt.core.spawner/.settings/org.eclipse.pde.api.tools.prefs
+++ b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/core/org.eclipse.cdt.core.spawner/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
index 1326a9839cc..a244d4f5d6b 100644
--- a/core/org.eclipse.cdt.core.spawner/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.cdt.core.spawner; singleton:=true
+Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true
 Bundle-Version: 5.7.0.qualifier
 Bundle-Activator: org.eclipse.cdt.internal.core.spawner.CSpawnerPlugin
 Bundle-Vendor: %providerName
diff --git a/core/org.eclipse.cdt.core.spawner/about.html b/core/org.eclipse.cdt.core.native/about.html
index d7c511887d6..d7c511887d6 100644
--- a/core/org.eclipse.cdt.core.spawner/about.html
+++ b/core/org.eclipse.cdt.core.native/about.html
diff --git a/core/org.eclipse.cdt.core.spawner/build.properties b/core/org.eclipse.cdt.core.native/build.properties
index 5af01c019b1..45d3b3aeced 100644
--- a/core/org.eclipse.cdt.core.spawner/build.properties
+++ b/core/org.eclipse.cdt.core.native/build.properties
@@ -9,8 +9,7 @@
 #     IBM Corporation - initial API and implementation
 #     Martin Oberhuber (Wind River) - [303083] Split out the Spawner
 ###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
+bin.includes = plugin.properties,\
                about.html,\
                .,\
                META-INF/
diff --git a/core/org.eclipse.cdt.core.native/plugin.properties b/core/org.eclipse.cdt.core.native/plugin.properties
new file mode 100755
index 00000000000..83aa6b38dc3
--- /dev/null
+++ b/core/org.eclipse.cdt.core.native/plugin.properties
@@ -0,0 +1,28 @@
+###############################################################################
+# Copyright (c) 2003, 2014 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Anton Leherbauer (Wind River Systems)
+#     Martin Oberhuber (Wind River) - [303083] Split out the Spawner
+###############################################################################
+pluginName=C/C++ Development Tools Core Native Utilities
+providerName=Eclipse CDT
+
+fragmentName.aix = C/C++ Development Tools Core Native Utilities for AIX
+fragmentName.linux = C/C++ Development Tools Core Native Utilities for Linux
+fragmentName.linux.ia64 = C/C++ Development Tools Core Native Utilities for Linux (ia64)
+fragmentName.linux.ppc = C/C++ Development Tools Core Native Utilities for Linux (ppc)
+fragmentName.linux.ppc64 = C/C++ Development Tools Core Native Utilities for Linux (ppc64)
+fragmentName.linux.x86 = C/C++ Development Tools Core Native Utilities for Linux (x86)
+fragmentName.linux.x86_64 = C/C++ Development Tools Core Native Utilities for Linux (x86_64)
+fragmentName.qnx = C/C++ Development Tools Core Native Utilities for QNX
+fragmentName.solaris = C/C++ Development Tools Core Native Utilities for Solaris
+fragmentName.win32 = C/C++ Development Tools Core Native Utilities for Windows
+fragmentName.win32.x86 = C/C++ Development Tools Core Native Utilities for Windows (x86)
+fragmentName.win32.x86_64 = C/C++ Development Tools Core Native Utilities for Windows (x86_64)
+fragmentName.macosx = C/C++ Development Tools Core Native Utilities for MacOS X
diff --git a/core/org.eclipse.cdt.core.spawner/pom.xml b/core/org.eclipse.cdt.core.native/pom.xml
index a7c80e8c25c..162fa17b5e0 100644
--- a/core/org.eclipse.cdt.core.spawner/pom.xml
+++ b/core/org.eclipse.cdt.core.native/pom.xml
@@ -12,6 +12,6 @@
   </parent>
 
   <version>5.7.0-SNAPSHOT</version>
-  <artifactId>org.eclipse.cdt.core.spawner</artifactId>
+  <artifactId>org.eclipse.cdt.core.native</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessInfo.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessInfo.java
index f2592a4714a..f2592a4714a 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessInfo.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessInfo.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessList.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessList.java
index fcc2897345a..fcc2897345a 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/core/IProcessList.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessList.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java
index 98a7b2a223e..98a7b2a223e 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/Messages.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/Messages.java
index 14b71b7d73c..14b71b7d73c 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/Messages.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/Messages.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/messages.properties b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/messages.properties
index e1ab7f1ac42..e1ab7f1ac42 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/internal/core/spawner/messages.properties
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/messages.properties
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/WindowsRegistry.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/WindowsRegistry.java
index cc216e2095b..cc216e2095b 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/WindowsRegistry.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/WindowsRegistry.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTY.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTY.java
index f61fc8d29a2..f61fc8d29a2 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTY.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTY.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java
index c2506a006d2..c2506a006d2 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java
index f6096e5a443..f6096e5a443 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
index 39c94d806e9..39c94d806e9 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java
index 66c0a176cc8..66c0a176cc8 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/Spawner.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/Spawner.java
index e4e69a8ebff..e4e69a8ebff 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/Spawner.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/Spawner.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java
index dfdbe060e8e..dfdbe060e8e 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java
diff --git a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java
index e3c8014f6c8..e3c8014f6c8 100644
--- a/core/org.eclipse.cdt.core.spawner/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java
+++ b/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java
diff --git a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
index 1efa4d4ea9d..095b95aa734 100644
--- a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.cdt.core.qnx; singleton:=true
 Bundle-Version: 5.2.0.qualifier
 Bundle-ClassPath: cdt_qnx.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
index 51f5bdafe43..d9c3782d7c4 100644
--- a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.solaris
 Bundle-SymbolicName: org.eclipse.cdt.core.solaris; singleton:=true
 Bundle-Version: 5.3.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-PlatformFilter: (&(osgi.os=solaris)(osgi.arch=sparc))
diff --git a/core/org.eclipse.cdt.core.spawner/plugin.properties b/core/org.eclipse.cdt.core.spawner/plugin.properties
deleted file mode 100755
index 1570b3e73e4..00000000000
--- a/core/org.eclipse.cdt.core.spawner/plugin.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2014 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Anton Leherbauer (Wind River Systems)
-#     Martin Oberhuber (Wind River) - [303083] Split out the Spawner
-###############################################################################
-pluginName=C/C++ Development Tools Core Spawner
-providerName=Eclipse CDT
-
-fragmentName.aix = C/C++ Development Tools Core for AIX
-fragmentName.linux = C/C++ Development Tools Core for Linux
-fragmentName.linux.ia64 = C/C++ Development Tools Core for Linux (ia64)
-fragmentName.linux.ppc = C/C++ Development Tools Core for Linux (ppc)
-fragmentName.linux.ppc64 = C/C++ Development Tools Core for Linux (ppc64)
-fragmentName.linux.x86 = C/C++ Development Tools Core for Linux (x86)
-fragmentName.linux.x86_64 = C/C++ Development Tools Core for Linux (x86_64)
-fragmentName.qnx = C/C++ Development Tools Core for QNX
-fragmentName.solaris = C/C++ Development Tools Core for Solaris
-fragmentName.win32 = C/C++ Development Tools Core for Windows
-fragmentName.win32.x86 = C/C++ Development Tools Core for Windows (x86)
-fragmentName.win32.x86_64 = C/C++ Development Tools Core for Windows (x86_64)
-fragmentName.macosx = C/C++ Development Tools Core for MacOS X
diff --git a/core/org.eclipse.cdt.core.spawner/plugin.xml b/core/org.eclipse.cdt.core.spawner/plugin.xml
deleted file mode 100644
index 231f9acc87e..00000000000
--- a/core/org.eclipse.cdt.core.spawner/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-<!-- Empty dummy plugin.xml just to allow fragment.xml files to contribute -->
-</plugin>
diff --git a/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF
index 77937da0ea3..5c67778733c 100644
--- a/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.win32.x86/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.win32.x86
 Bundle-SymbolicName: org.eclipse.cdt.core.win32.x86;singleton:=true
 Bundle-Version: 5.3.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86))
 Eclipse-BundleShape: dir
diff --git a/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF
index 3c5d3bc502f..e001a79fd88 100644
--- a/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.win32.x86_64
 Bundle-SymbolicName: org.eclipse.cdt.core.win32.x86_64;singleton:=true
 Bundle-Version: 5.3.0.qualifier
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86_64))
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
index 23c6c93474c..9e7e9f4c028 100644
--- a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %fragmentName.win32
 Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true
 Bundle-Version: 5.4.0.qualifier
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)"
+Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Eclipse-PlatformFilter: (osgi.os=win32)
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 34c052c3b3a..c6eb843c1d2 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -111,7 +111,7 @@ Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core=split;mandatory=org.ec
  org.eclipse.cdt.utils.som.parser,
  org.eclipse.cdt.utils.xcoff,
  org.eclipse.cdt.utils.xcoff.parser
-Require-Bundle: org.eclipse.cdt.core.spawner;bundle-version="[5.7.0,6.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)";visibility:=reexport,
  org.eclipse.core.contenttype;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)",
diff --git a/pom.xml b/pom.xml
index d31efdd1fae..61af1df530b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,7 @@
 	</licenses>
 
 	<modules>
-		<module>releng/org.eclipse.cdt</module>
-		<module>core/org.eclipse.cdt.core</module>
-		<module>core/org.eclipse.cdt.core.spawner</module>
+		<module>core/org.eclipse.cdt.core.native</module>
 		<module>core/org.eclipse.cdt.core.linux</module>
 		<module>core/org.eclipse.cdt.core.linux.x86</module>
 		<module>core/org.eclipse.cdt.core.linux.x86_64</module>
@@ -56,6 +54,11 @@
 		<module>core/org.eclipse.cdt.core.macosx</module>
 		<module>core/org.eclipse.cdt.core.aix</module>
 		<module>core/org.eclipse.cdt.core.solaris</module>
+		<module>releng/org.eclipse.cdt.native-feature</module>
+		<module>releng/org.eclipse.cdt.native.source-feature</module>
+
+		<module>releng/org.eclipse.cdt</module>
+		<module>core/org.eclipse.cdt.core</module>
 		<module>codan/org.eclipse.cdt.codan.core</module>
 		<module>codan/org.eclipse.cdt.codan.ui</module>
 		<module>codan/org.eclipse.cdt.codan.core.cxx</module>
@@ -74,8 +77,6 @@
 		<module>dsf/org.eclipse.cdt.dsf.ui</module>
 		<module>releng/org.eclipse.cdt.platform-feature</module>
 		<module>releng/org.eclipse.cdt.platform.source-feature</module>
-		<module>releng/org.eclipse.cdt.spawner-feature</module>
-		<module>releng/org.eclipse.cdt.spawner.source-feature</module>
 
 		<module>build/org.eclipse.cdt.managedbuilder.gnu.ui</module>
 		<module>build/org.eclipse.cdt.gnu.build-feature</module>
diff --git a/releng/org.eclipse.cdt.spawner-feature/.project b/releng/org.eclipse.cdt.native-feature/.project
index 615480cbc81..a5e7312a076 100644
--- a/releng/org.eclipse.cdt.spawner-feature/.project
+++ b/releng/org.eclipse.cdt.native-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.cdt.spawner-feature</name>

+	<name>org.eclipse.cdt.native-feature</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/releng/org.eclipse.cdt.spawner-feature/build.properties b/releng/org.eclipse.cdt.native-feature/build.properties
index df907fd1934..df907fd1934 100644
--- a/releng/org.eclipse.cdt.spawner-feature/build.properties
+++ b/releng/org.eclipse.cdt.native-feature/build.properties
diff --git a/releng/org.eclipse.cdt.spawner-feature/eclipse_update_120.jpg b/releng/org.eclipse.cdt.native-feature/eclipse_update_120.jpg
index bfdf708ad61..bfdf708ad61 100644
--- a/releng/org.eclipse.cdt.spawner-feature/eclipse_update_120.jpg
+++ b/releng/org.eclipse.cdt.native-feature/eclipse_update_120.jpg
diff --git a/releng/org.eclipse.cdt.spawner-feature/feature.properties b/releng/org.eclipse.cdt.native-feature/feature.properties
index 218edd443dd..99b92a5f37c 100644
--- a/releng/org.eclipse.cdt.spawner-feature/feature.properties
+++ b/releng/org.eclipse.cdt.native-feature/feature.properties
@@ -16,7 +16,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=C/C++ Development Platform Spawner
+featureName=C/C++ Development Tooling Native Utilities
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
diff --git a/releng/org.eclipse.cdt.spawner-feature/feature.xml b/releng/org.eclipse.cdt.native-feature/feature.xml
index c0aeea792eb..531a4049acd 100644
--- a/releng/org.eclipse.cdt.spawner-feature/feature.xml
+++ b/releng/org.eclipse.cdt.native-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.cdt.spawner"
+      id="org.eclipse.cdt.native"
       label="%featureName"
       version="8.4.0.qualifier"
       provider-name="%providerName"
@@ -20,7 +20,7 @@
    </license>
 
    <plugin
-         id="org.eclipse.cdt.core.spawner"
+         id="org.eclipse.cdt.core.native"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/org.eclipse.cdt.spawner-feature/pom.xml b/releng/org.eclipse.cdt.native-feature/pom.xml
index 14d89585955..1668b96a2e4 100644
--- a/releng/org.eclipse.cdt.spawner-feature/pom.xml
+++ b/releng/org.eclipse.cdt.native-feature/pom.xml
@@ -12,6 +12,6 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<artifactId>org.eclipse.cdt.spawner</artifactId>
+	<artifactId>org.eclipse.cdt.native</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt.spawner.source-feature/.project b/releng/org.eclipse.cdt.native.source-feature/.project
index 19d328ca6a3..51da0be829c 100644
--- a/releng/org.eclipse.cdt.spawner.source-feature/.project
+++ b/releng/org.eclipse.cdt.native.source-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.cdt.spawner.source-feature</name>

+	<name>org.eclipse.cdt.native.source-feature</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/releng/org.eclipse.cdt.spawner.source-feature/build.properties b/releng/org.eclipse.cdt.native.source-feature/build.properties
index df907fd1934..df907fd1934 100644
--- a/releng/org.eclipse.cdt.spawner.source-feature/build.properties
+++ b/releng/org.eclipse.cdt.native.source-feature/build.properties
diff --git a/releng/org.eclipse.cdt.spawner.source-feature/eclipse_update_120.jpg b/releng/org.eclipse.cdt.native.source-feature/eclipse_update_120.jpg
index bfdf708ad61..bfdf708ad61 100644
--- a/releng/org.eclipse.cdt.spawner.source-feature/eclipse_update_120.jpg
+++ b/releng/org.eclipse.cdt.native.source-feature/eclipse_update_120.jpg
diff --git a/releng/org.eclipse.cdt.spawner.source-feature/feature.properties b/releng/org.eclipse.cdt.native.source-feature/feature.properties
index ab87e680e06..ea8ec6c7ff8 100644
--- a/releng/org.eclipse.cdt.spawner.source-feature/feature.properties
+++ b/releng/org.eclipse.cdt.native.source-feature/feature.properties
@@ -16,7 +16,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=C/C++ Development Platform Spawner Source
+featureName=C/C++ Development Tooling Native Utilities Source
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
diff --git a/releng/org.eclipse.cdt.spawner.source-feature/feature.xml b/releng/org.eclipse.cdt.native.source-feature/feature.xml
index d0ec36b8d14..5569405fafe 100644
--- a/releng/org.eclipse.cdt.spawner.source-feature/feature.xml
+++ b/releng/org.eclipse.cdt.native.source-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.cdt.spawner.source"
+      id="org.eclipse.cdt.native.source"
       label="%featureName"
       version="8.4.0.qualifier"
       provider-name="%providerName"
@@ -20,7 +20,7 @@
    </license>
 
    <plugin
-         id="org.eclipse.cdt.core.spawner.source"
+         id="org.eclipse.cdt.core.native.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/org.eclipse.cdt.spawner.source-feature/pom.xml b/releng/org.eclipse.cdt.native.source-feature/pom.xml
index 891372090ff..2eb533a2184 100644
--- a/releng/org.eclipse.cdt.spawner.source-feature/pom.xml
+++ b/releng/org.eclipse.cdt.native.source-feature/pom.xml
@@ -12,6 +12,6 @@
 	</parent>
 
 	<groupId>org.eclipse.cdt.features</groupId>
-	<artifactId>org.eclipse.cdt.spawner.source</artifactId>
+	<artifactId>org.eclipse.cdt.native.source</artifactId>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 58251fd22e6..79ca9a70cd2 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -20,7 +20,7 @@
    </license>
 
    <includes
-         id="org.eclipse.cdt.spawner"
+         id="org.eclipse.cdt.native"
          version="0.0.0"/>
 
    <plugin
diff --git a/releng/org.eclipse.cdt.platform.source-feature/feature.xml b/releng/org.eclipse.cdt.platform.source-feature/feature.xml
index 5bcfece232a..f42a42c63b4 100644
--- a/releng/org.eclipse.cdt.platform.source-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform.source-feature/feature.xml
@@ -19,6 +19,10 @@
       %license
    </license>
 
+   <includes
+         id="org.eclipse.cdt.native.source"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.cdt.core.source"
          download-size="0"
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 0ceadb381bb..d749574812f 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -24,10 +24,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.cdt.spawner.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.cdt.gnu.build.source"
          version="0.0.0"/>
 
diff --git a/releng/org.eclipse.cdt.target/.project b/releng/org.eclipse.cdt.target/.project
index 9ce1d2fc6d7..5003445e922 100644
--- a/releng/org.eclipse.cdt.target/.project
+++ b/releng/org.eclipse.cdt.target/.project
@@ -8,4 +8,11 @@
 	</buildSpec>
 	<natures>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>parent-pom.xml</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/pom.xml</locationURI>
+		</link>
+	</linkedResources>
 </projectDescription>
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.4.target b/releng/org.eclipse.cdt.target/cdt-e4.4.target
index 2a125dd97f7..581d3dd26a5 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.4.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.4.target
@@ -2,16 +2,16 @@
 <?pde version="3.8"?><target name="cdt_e4.4" sequenceNumber="15">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="8.1.11.201307080411"/>
+<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-<unit id="net.sourceforge.lpg.lpgjavaruntime" version="1.1.0.v201004271650"/>
-<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
-<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="org.apache.log4j.source" version="0.0.0"/>
+<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
+<unit id="org.junit" version="0.0.0"/>
+<unit id="org.junit.source" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -21,7 +21,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rse.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/luna/"/>
+<repository location="http://download.eclipse.org/tm/updates/3.6milestones/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>