Bug 303083 - Make cdt.core.native plugin consistent after rename

The org.eclipse.cdt.core.native plugin has been renamed from 
org.eclipse.cdt.core.spawner but that has left a couple inconsistencies
which are fixed with this commit:

1. Rename o.e.cdt.internal.core.spawner package -> natives package
   Note that renaming the package to "native" was not possible since
   "native" is a Java keyword, thus I chose "natives"
2. Rename CSpawnerPlugin -> CNativePlugin, update win32 fragment
3. Fix PLUGIN_ID for proper logging with IStatus
4. Fix MANIFEST.MF export-package;split declaration
5. Add "version" spec on "export-package" for pty and spawner packages
6. Rename "utils" source folder to "src" as this is standard practice
7. Remove "spawner" from the list of Javadoc plugins in cdt.core

Change-Id: Ie5d1112d3f2da120dd5b1446cb6a137382226f0f
Signed-off-by: Martin Oberhuber <martin.oberhuber@windriver.com>
Reviewed-on: https://git.eclipse.org/r/27346
Tested-by: Hudson CI
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>

19 files changed, 33 insertions, 33 deletions

diff --git a/core/org.eclipse.cdt.core.native/.classpath b/core/org.eclipse.cdt.core.native/.classpath
index c743d53e564..3bc247511f0 100644
--- a/core/org.eclipse.cdt.core.native/.classpath
+++ b/core/org.eclipse.cdt.core.native/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="utils"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
index a244d4f5d6b..9419d11da78 100644
--- a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 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-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core.spawner=split;mandatory=org.eclipse.cdt.core.spawner,
- org.eclipse.cdt.utils;org.eclipse.cdt.core.spawner=split;mandatory=org.eclipse.cdt.core.spawner,
- org.eclipse.cdt.utils.pty,
- org.eclipse.cdt.utils.spawner
+Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core.native=split;mandatory=org.eclipse.cdt.core.native,
+ org.eclipse.cdt.utils;org.eclipse.cdt.core.native=split;mandatory=org.eclipse.cdt.core.native,
+ org.eclipse.cdt.utils.pty;version="5.7",
+ org.eclipse.cdt.utils.spawner;version="5.7"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/core/org.eclipse.cdt.core.native/build.properties b/core/org.eclipse.cdt.core.native/build.properties
index 45d3b3aeced..382729f35b0 100644
--- a/core/org.eclipse.cdt.core.native/build.properties
+++ b/core/org.eclipse.cdt.core.native/build.properties
@@ -17,7 +17,7 @@ src.includes = about.html
 javadoc.packages = org.eclipse.cdt.utils.*,\
                    org.eclipse.cdt.utils.pty.*,\
                    org.eclipse.cdt.utils.spawner.*
-source.. = utils/
+source.. = src/
 
 jre.compilation.profile=JavaSE-1.7
 javacSource=1.7
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessInfo.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/core/IProcessInfo.java
index f2592a4714a..f2592a4714a 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessInfo.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/core/IProcessInfo.java
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessList.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/core/IProcessList.java
index fcc2897345a..fcc2897345a 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/core/IProcessList.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/core/IProcessList.java
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/internal/core/natives/CNativePlugin.java
index 98a7b2a223e..98eb24cf92e 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/CSpawnerPlugin.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/internal/core/natives/CNativePlugin.java
@@ -9,35 +9,36 @@
  *     IBM Corporation - initial API and implementation
  *     Martin Oberhuber (Wind River) - [303083] Split out from CCorePlugin
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.spawner;
+package org.eclipse.cdt.internal.core.natives;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 
 /**
- * CSpawnerPlugin is the life-cycle owner of the plug-in.
+ * CNativePlugin is the life-cycle owner of the plug-in, and also holds
+ * utility methods for logging.
  *
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
-public class CSpawnerPlugin extends Plugin {
+public class CNativePlugin extends Plugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.cdt.core.spawner"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.cdt.core.native"; //$NON-NLS-1$
 
-	private static CSpawnerPlugin fgPlugin;
+	private static CNativePlugin fgPlugin;
 
 	// NON-API
 
 	/**
 	 * @noreference This constructor is not intended to be referenced by clients.
 	 */
-	public CSpawnerPlugin() {
+	public CNativePlugin() {
 		super();
 		fgPlugin = this;
 	}
 
-	public static CSpawnerPlugin getDefault() {
+	public static CNativePlugin getDefault() {
 		return fgPlugin;
 	}
 
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/Messages.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/internal/core/natives/Messages.java
index 14b71b7d73c..ae5b834be9e 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/Messages.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/internal/core/natives/Messages.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Martin Oberhuber (Wind River) - [303083] Split out the Spawner
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.spawner;
+package org.eclipse.cdt.internal.core.natives;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.core.spawner.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.core.natives.messages"; //$NON-NLS-1$
 	public static String Util_exception_cannotCreatePty;
 	public static String Util_exception_cannotSetTerminalSize;
 	public static String Util_error_cannotRun;
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/messages.properties b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/internal/core/natives/messages.properties
index e1ab7f1ac42..e1ab7f1ac42 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/internal/core/spawner/messages.properties
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/internal/core/natives/messages.properties
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/WindowsRegistry.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/WindowsRegistry.java
index cc216e2095b..cc216e2095b 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/WindowsRegistry.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/WindowsRegistry.java
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTY.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java
index f61fc8d29a2..abef9e9e54f 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTY.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java
@@ -14,8 +14,8 @@ package org.eclipse.cdt.utils.pty;
 
 import java.io.IOException;
 
-import org.eclipse.cdt.internal.core.spawner.CSpawnerPlugin;
-import org.eclipse.cdt.internal.core.spawner.Messages;
+import org.eclipse.cdt.internal.core.natives.CNativePlugin;
+import org.eclipse.cdt.internal.core.natives.Messages;
 import org.eclipse.cdt.utils.spawner.Spawner;
 import org.eclipse.core.runtime.Platform;
 
@@ -212,7 +212,7 @@ public class PTY {
 		} catch (UnsatisfiedLinkError ule) {
 			if (!setTerminalSizeErrorAlreadyLogged) {
 				setTerminalSizeErrorAlreadyLogged = true;
-				CSpawnerPlugin.log(Messages.Util_exception_cannotSetTerminalSize, ule);
+				CNativePlugin.log(Messages.Util_exception_cannotSetTerminalSize, ule);
 			}
 		}
 	}
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYInputStream.java
index c2506a006d2..2c4abffa73e 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYInputStream.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYInputStream.java
@@ -16,7 +16,6 @@ package org.eclipse.cdt.utils.pty;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.eclipse.cdt.internal.core.spawner.Messages;
 import org.eclipse.cdt.utils.pty.PTY.MasterFD;
 
 class PTYInputStream extends InputStream {
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java
index f6096e5a443..f6096e5a443 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/pty/PTYOutputStream.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
index 39c94d806e9..39c94d806e9 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/EnvironmentReader.java
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
index 66c0a176cc8..7784db6b527 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
@@ -15,8 +15,8 @@ package org.eclipse.cdt.utils.spawner;
 import java.io.File;
 import java.io.IOException;
 
-import org.eclipse.cdt.internal.core.spawner.CSpawnerPlugin;
-import org.eclipse.cdt.internal.core.spawner.Messages;
+import org.eclipse.cdt.internal.core.natives.CNativePlugin;
+import org.eclipse.cdt.internal.core.natives.Messages;
 import org.eclipse.cdt.utils.pty.PTY;
 
 /**
@@ -44,7 +44,7 @@ public class ProcessFactory {
 		} catch (SecurityException e) {
 			e.printStackTrace();
 		} catch (UnsatisfiedLinkError e) {
-			CSpawnerPlugin.log(e.getMessage());
+			CNativePlugin.log(e.getMessage());
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/Spawner.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/Spawner.java
index e4e69a8ebff..c0149136d2d 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/Spawner.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/Spawner.java
@@ -19,8 +19,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.StringTokenizer;
 
-import org.eclipse.cdt.internal.core.spawner.CSpawnerPlugin;
-import org.eclipse.cdt.internal.core.spawner.Messages;
+import org.eclipse.cdt.internal.core.natives.CNativePlugin;
+import org.eclipse.cdt.internal.core.natives.Messages;
 import org.eclipse.cdt.utils.pty.PTY;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.osgi.util.NLS;
@@ -451,9 +451,9 @@ public class Spawner extends Process {
 		try {
 			System.loadLibrary("spawner"); //$NON-NLS-1$
 		} catch (SecurityException e) {
-			CSpawnerPlugin.log(e);
+			CNativePlugin.log(e);
 		} catch (UnsatisfiedLinkError e) {
-			CSpawnerPlugin.log(e);
+			CNativePlugin.log(e);
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java
index dfdbe060e8e..fd96e424263 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/SpawnerInputStream.java
@@ -15,7 +15,7 @@ package org.eclipse.cdt.utils.spawner;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.eclipse.cdt.internal.core.spawner.Messages;
+import org.eclipse.cdt.internal.core.natives.Messages;
 
 class SpawnerInputStream extends InputStream {
 	private int fd;
diff --git a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java
index e3c8014f6c8..e3c8014f6c8 100644
--- a/core/org.eclipse.cdt.core.native/utils/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/SpawnerOutputStream.java
diff --git a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
index 77946a1ad01..fabd130fd5a 100644
--- a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
+++ b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 
 import org.eclipse.cdt.core.IProcessInfo;
 import org.eclipse.cdt.core.IProcessList;
-import org.eclipse.cdt.internal.core.spawner.CSpawnerPlugin;
+import org.eclipse.cdt.internal.core.natives.CNativePlugin;
 import org.eclipse.cdt.utils.spawner.ProcessFactory;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
@@ -43,7 +43,7 @@ public class ProcessList implements IProcessList {
 		Process p = null;
 		String command = null;
 		InputStream in = null;
-		Bundle bundle = Platform.getBundle(CSpawnerPlugin.PLUGIN_ID);
+		Bundle bundle = Platform.getBundle(CNativePlugin.PLUGIN_ID);
 		IProcessInfo[] procInfos = NOPROCESS;
 
 		try {
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 64dbe7a4fcb..dbbe7f7419e 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-#  Copyright (c) 2003, 2009 IBM Corporation and others.
+#  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
@@ -7,6 +7,7 @@
 # 
 #  Contributors:
 #     IBM Corporation - initial API and implementation
+#     Martin Oberhuber (Wind River) - [303083] Split out the Spawner
 ###############################################################################
 bin.includes = plugin.xml,\
                plugin.properties,\
@@ -22,8 +23,7 @@ javadoc.packages = org.eclipse.cdt.core.*,\
                    org.eclipse.cdt.core.resources.*,\
                    org.eclipse.cdt.core.templateengine.*,\
                    org.eclipse.cdt.utils.*,\
-                   org.eclipse.cdt.utils.elf.*,\
-                   org.eclipse.cdt.utils.spawner.*
+                   org.eclipse.cdt.utils.elf.*
 source.. = src/,\
            model/,\
            parser/,\