Merge branch 'master' into twatson/containerMerge

59 files changed, 194 insertions, 140 deletions

diff --git a/bundles/org.eclipse.equinox.executable/build.properties b/bundles/org.eclipse.equinox.executable/build.properties
index f8fd12b9f..fb2c57076 100644
--- a/bundles/org.eclipse.equinox.executable/build.properties
+++ b/bundles/org.eclipse.equinox.executable/build.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 #custom = true
 p2.group.id = org.eclipse.equinox.executable
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
 customBuildCallbacks=customBuildCallbacks.xml
 bin.includes = bin/,\
                feature.xml,\
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
index 29348fc56..25fa99a57 100644
--- a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
+++ b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
@@ -30,7 +30,6 @@
 #include "NgWinBMPFileFormat.h"
 #endif
 #include <mach-o/dyld.h>
-#include <pthread.h>
 
 #define startupJarName "startup.jar"
 #define LAUNCHER "-launcher"
@@ -81,15 +80,6 @@ static const char* jvmLibs[] = { "libjvm.dylib", "libjvm.jnilib", "libjvm.so", N
 /* Define the window system arguments for the various Java VMs. */
 static char*  argVM_JAVA[] = { "-XstartOnFirstThread", NULL };
 
-/* thread stuff */
-typedef struct {
-	_TCHAR * libPath;
-	_TCHAR ** vmArgs;
-	_TCHAR ** progArgs;
-	_TCHAR * jarFile;
-	JavaResults* result;
-} StartVMArgs;
-
 #ifdef COCOA
 static NSWindow* window = nil;
 @interface KeyWindow : NSWindow { }
@@ -163,10 +153,6 @@ static NSWindow* window = nil;
 @end
 #endif
 
-static CFRunLoopRef loopRef = NULL;
-static void * startThread(void * init); 
-static void runEventLoop(CFRunLoopRef ref);
-static void dummyCallback(void * info) {}
 #ifndef COCOA
 static CFMutableArrayRef files;
 static EventHandlerRef appHandler;
@@ -477,6 +463,43 @@ char** getArgVM( char* vm )
 	return result;
 }
 
+char * getJavaVersion(char* command) {
+	FILE *fp;
+	char buffer[4096];
+	char *version = NULL, *firstChar;
+    int numChars = 0;
+	sprintf(buffer,"%s -version 2>&1", command);
+	fp = popen(buffer, "r");
+	if (fp == NULL) {
+		return NULL;
+	}
+	while (fgets(buffer, sizeof(buffer)-1, fp) != NULL) {
+		if (!version) {
+			firstChar = (char *) (strchr(buffer, '"') + 1);
+			if (firstChar != NULL)
+				numChars = (int)  (strrchr(buffer, '"') - firstChar);
+
+			/* Allocate a buffer and copy the version string into it. */
+			if (numChars > 0)
+			{
+				version = malloc( numChars + 1 );
+				strncpy(version, firstChar, numChars);
+				version[numChars] = '\0';
+			}
+		}
+		if (strstr(buffer, "Java HotSpot(TM)") || strstr(buffer, "OpenJDK")) {
+			isSUN = 1;
+			break;
+		}
+		if (strstr(buffer, "IBM") != NULL) {
+			isSUN = 0;
+			break;
+		}
+	}
+	pclose(fp);
+	return version;
+}
+
 char * getJavaHome() {
 	FILE *fp;
 	char path[4096];
@@ -531,11 +554,14 @@ char * findVMLibrary( char* command ) {
 	if (strstr(cmd, "/JavaVM.framework/") != NULL && (strstr(cmd, "/Current/") != NULL || strstr(cmd, "/A/") != NULL)) {
 		cmd = getJavaHome();
 	}
+	// This is necessary to initialize isSUN
+	getJavaVersion(cmd);
 	result = JAVA_FRAMEWORK;
 	if (strstr(cmd, "/JavaVM.framework/") == NULL) {
 		char * lib = findLib(cmd);
 		if (lib != NULL) {
-			adjustLibraryPath(lib);
+			// This does not seem to be necessary to load the Mac JVM library
+			if (0) adjustLibraryPath(lib);
 			result = lib;
 		}
 	}
@@ -670,69 +696,7 @@ JavaResults* launchJavaVM( _TCHAR* args[] )
 
 JavaResults* startJavaVM( _TCHAR* libPath, _TCHAR* vmArgs[], _TCHAR* progArgs[], _TCHAR* jarFile )
 {
-	if (secondThread == 0) {
-		/* Set an environment variable that tells the AWT (if started) we started the JVM on the main thread. */
-		char firstThreadEnvVariable[80];
-		sprintf(firstThreadEnvVariable, "JAVA_STARTED_ON_FIRST_THREAD_%d", getpid());
-		setenv(firstThreadEnvVariable, "1", 1);
-		return startJavaJNI(libPath, vmArgs, progArgs, jarFile);
-	}
-
-	/* else, --launcher.secondThread was specified, create a new thread and run the 
-	 * vm on it.  This main thread will run the CFRunLoop 
-	 */
-	pthread_t thread;
-	struct rlimit limit = {0, 0};
-	int stackSize = 0;
-	if (getrlimit(RLIMIT_STACK, &limit) == 0) {
-		if (limit.rlim_cur != 0) {
-			stackSize = limit.rlim_cur;
-		}
-	}
-	
-	/* initialize thread attributes */
-	pthread_attr_t attributes;
-	pthread_attr_init(&attributes);
-	pthread_attr_setscope(&attributes, PTHREAD_SCOPE_SYSTEM);
-	pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
-	if (stackSize != 0)
-		pthread_attr_setstacksize(&attributes, stackSize);
-	
-	/* arguments to start the vm */
-	StartVMArgs args;
-	args.libPath = libPath;
-	args.vmArgs = vmArgs;
-	args.progArgs = progArgs;
-	args.jarFile = jarFile;
-	args.result = 0;
-	
-	loopRef = CFRunLoopGetCurrent();
-	
-	/* create the thread */
-	pthread_create( &thread, &attributes, &startThread, &args);
-	pthread_attr_destroy(&attributes);
-		
-	runEventLoop(loopRef);
-	
-	return args.result;
-}
-
-void * startThread(void * init) {
-	StartVMArgs *args = (StartVMArgs *) init;
-	args->result = startJavaJNI(args->libPath, args->vmArgs, args->progArgs, args->jarFile);
-	return NULL;
-}
-
-void runEventLoop(CFRunLoopRef ref) {
-	CFRunLoopSourceContext sourceContext = { .version = 0, .info = NULL, .retain = NULL, .release = NULL,
-											 .copyDescription = NULL, .equal = NULL, .hash = NULL, 
-											 .schedule = NULL, .cancel = NULL, .perform = &dummyCallback };
-	
-	CFRunLoopSourceRef sourceRef = CFRunLoopSourceCreate(NULL, 0, &sourceContext);
-	CFRunLoopAddSource(ref, sourceRef,  kCFRunLoopCommonModes);
-	
-	CFRunLoopRun();
-	CFRelease(sourceRef);
+	return startJavaJNI(libPath, vmArgs, progArgs, jarFile);
 }
 
 #ifndef COCOA
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipse.c b/bundles/org.eclipse.equinox.executable/library/eclipse.c
index be01c9ccc..ce48cdc6d 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipse.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c
@@ -150,6 +150,16 @@
 #include <strings.h>
 #endif
 
+#ifdef MACOSX
+
+#ifdef COCOA
+#include <Cocoa/Cocoa.h>
+#else
+#include <Carbon/Carbon.h>
+#endif
+
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -352,6 +362,7 @@ static _TCHAR*  findStartupJar();
 static _TCHAR*  findSplash(_TCHAR* splashArg);
 static _TCHAR** getRelaunchCommand( _TCHAR **vmCommand );
 static const _TCHAR* getVMArch();
+static int      _run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[]);
 
 #ifdef _WIN32
 static void     createConsole();
@@ -367,10 +378,92 @@ JNIEXPORT void setInitialArgs(int argc, _TCHAR** argv, _TCHAR* lib) {
 	eclipseLibrary = lib;
 }
 
+#ifdef MACOSX
+
+#include <pthread.h>
+/* thread stuff */
+typedef struct {
+	int argc;
+	_TCHAR ** argv;
+	_TCHAR ** vmArgs;
+	int result;
+} StartVMArgs;
+
+static void * startThread(void * init) {
+	StartVMArgs *args = (StartVMArgs *) init;
+	args->result = _run(args->argc, args->argv, args->vmArgs);
+	return NULL;
+}
+
+static void dummyCallback(void * info) {}
+#endif
+
 /* this method must match the RunMethod typedef in eclipseMain.c */
 /* vmArgs must be NULL terminated                                */
 JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
 {
+    /* Parse command line arguments (looking for the VM to use). */
+    /* Override configuration file arguments */
+    parseArgs( &argc, argv );
+
+#ifdef MACOSX
+	if (secondThread != 0) {
+	
+		/* --launcher.secondThread was specified, create a new thread and run the 
+		 * vm on it.  This main thread will run the CFRunLoop 
+		 */
+		pthread_t thread;
+		struct rlimit limit = {0, 0};
+		int stackSize = 0;
+		if (getrlimit(RLIMIT_STACK, &limit) == 0) {
+			if (limit.rlim_cur != 0) {
+				stackSize = limit.rlim_cur;
+			}
+		}
+		
+		/* initialize thread attributes */
+		pthread_attr_t attributes;
+		pthread_attr_init(&attributes);
+		pthread_attr_setscope(&attributes, PTHREAD_SCOPE_SYSTEM);
+		pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
+		if (stackSize != 0)
+			pthread_attr_setstacksize(&attributes, stackSize);
+		
+		/* arguments to start the vm */
+		StartVMArgs args;
+		args.argc = argc;
+		args.argv = argv;
+		args.vmArgs = vmArgs;
+		args.result = 0;
+		
+		/* create the thread */
+		pthread_create( &thread, &attributes, &startThread, &args);
+		pthread_attr_destroy(&attributes);
+			
+		CFRunLoopSourceContext sourceContext = {
+			.version = 0, .info = NULL, .retain = NULL, .release = NULL,
+			.copyDescription = NULL, .equal = NULL, .hash = NULL, 
+			.schedule = NULL, .cancel = NULL, .perform = &dummyCallback
+		};
+		CFRunLoopSourceRef sourceRef = CFRunLoopSourceCreate(NULL, 0, &sourceContext);
+		CFRunLoopRef loopRef = CFRunLoopGetCurrent();
+		CFRunLoopAddSource(loopRef, sourceRef, kCFRunLoopCommonModes);
+		CFRunLoopRun();
+		CFRelease(sourceRef);
+		
+		return args.result;
+	}
+	
+	char firstThreadEnvVariable[80];
+	sprintf(firstThreadEnvVariable, "JAVA_STARTED_ON_FIRST_THREAD_%d", getpid());
+	setenv(firstThreadEnvVariable, "1", 1);
+#endif
+
+	return _run(argc, argv, vmArgs);
+}
+
+static int _run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
+{
     _TCHAR**  vmCommand = NULL;
     _TCHAR**  vmCommandArgs = NULL;
     _TCHAR**  progCommandArgs = NULL;
@@ -382,10 +475,6 @@ JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
 	 
 	/* arg[0] should be the full pathname of this program. */
     program = _tcsdup( argv[0] );
-	
-    /* Parse command line arguments (looking for the VM to use). */
-    /* Override configuration file arguments */
-    parseArgs( &argc, argv );
 
 	/* Initialize official program name */
    	officialName = name != NULL ? _tcsdup( name ) : getDefaultOfficialName();
diff --git a/bundles/org.eclipse.equinox.executable/library/make_version.mak b/bundles/org.eclipse.equinox.executable/library/make_version.mak
index 41c9b799c..1a2391d35 100644
--- a/bundles/org.eclipse.equinox.executable/library/make_version.mak
+++ b/bundles/org.eclipse.equinox.executable/library/make_version.mak
@@ -10,5 +10,5 @@
 #*******************************************************************************
 
 maj_ver=1
-min_ver=505
+min_ver=506
 LIB_VERSION = $(maj_ver)$(min_ver)
diff --git a/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
index d6acc5d45..255b14849 100644
--- a/bundles/org.eclipse.equinox.executable/pom.xml
+++ b/bundles/org.eclipse.equinox.executable/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.executable</artifactId>
   <version>3.6.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties
index 31d6b5ced..512c06657 100644
--- a/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.carbon.macosx/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml b/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml
index b018fab11..59798c2e7 100644
--- a/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.carbon.macosx/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.carbon.macosx</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
index 02163d2cd..1083396ec 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
index 06dc606d6..6c13d8197 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.cocoa.macosx.x86_64</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties
index 8ab53b830..b3ddb9094 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml
index 67f076277..b26ca3623 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.cocoa.macosx</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
index af32010a3..6f79d106c 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
index bfe4eb2bb..da0168311 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
index feca0b955..41bc11f15 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
\ No newline at end of file
+binaryTag=v20130227-2236
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
index 92e1d9d2f..ab2bca992 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.aix.ppc64</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
index 9ad3f8b68..11850f4aa 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml
index 6c2141d30..85c329a68 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.hpux.ia64</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
index e811f5798..fd553b24e 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
index f2fd40d10..0035f0990 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.hpux.ia64_32</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
index e417eb061..2151e7f83 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
index facdf70fa..5845e9a79 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
index 101bfbb8f..d8ea4ef11 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
index 8e606f993..04ca84642 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
index 55ffa6075..b67935fee 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
\ No newline at end of file
+binaryTag=v20130227-2236
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
index 8e70c9ff3..d8389c66c 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
index 9d41dca4c..967f64e64 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
\ No newline at end of file
+binaryTag=v20130227-2236
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
index e88b5e80b..47c164708 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390x</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
index fd699b1ed..9998e06ee 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
index 65d08f35c..d8bc94314 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
index 9cc227f98..bf53fff7d 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
index 020a15682..d25e28d5d 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
index 16cdbb1db..7334c1ac3 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
index 9de9fe4a0..578041d98 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.solaris.sparc</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
index 7aaebd77d..777f9d0d8 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
index c8e546e5b..010077b39 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
index 048646444..befc754c4 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
@@ -16,4 +16,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false               
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
index 19b7fab31..220c7225d 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.motif.aix.ppc</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties
index 65910bdba..2408a1a1d 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
index dadb632b9..dfcbbe2d0 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.motif.hpux.ia64_32</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
index ac02476d1..1dc22e0ed 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
index c81f4eb0e..a5617b389 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.motif.linux.x86</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties
index 060af8ced..1dc8cd36d 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
index 91fa28f2b..2b25f1a08 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.motif.solaris.sparc</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
index e6e31281a..bc8236cf3 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
@@ -14,4 +14,4 @@ bin.includes = META-INF/,\
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20130213-1029
\ No newline at end of file
+binaryTag=v20130227-2236
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
index 1f6fea1e1..e8c620768 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.win32.win32.ia64</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
index 4c919e8b5..71e182998 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
@@ -14,4 +14,4 @@ bin.includes = META-INF/,\
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20130213-1029
\ No newline at end of file
+binaryTag=v20130227-2236
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
index 2e92534b6..d3e17a36a 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
index a4632c110..cb6448f6a 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
@@ -14,4 +14,4 @@ bin.includes = META-INF/,\
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
index e0fdfbb31..6f51a6c44 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.win32.win32.x86_64</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties
index c95ab4558..daf0c130e 100644
--- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties
@@ -15,4 +15,4 @@ bin.includes = META-INF/,\
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20130213-1029
+binaryTag=v20130227-2236
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
index d3cd8055a..de109b3a2 100644
--- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../launcher-binary-parent</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher.wpf.win32.x86</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.launcher/pom.xml b/bundles/org.eclipse.equinox.launcher/pom.xml
index e2ddc4981..443ba421f 100644
--- a/bundles/org.eclipse.equinox.launcher/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.launcher</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.osgi.services/pom.xml b/bundles/org.eclipse.osgi.services/pom.xml
index 324e39369..3fea16b23 100644
--- a/bundles/org.eclipse.osgi.services/pom.xml
+++ b/bundles/org.eclipse.osgi.services/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.services</artifactId>
   <version>3.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml
index 73e71a414..ee0968365 100644
--- a/bundles/org.eclipse.osgi.tests/pom.xml
+++ b/bundles/org.eclipse.osgi.tests/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.tests</artifactId>
   <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.osgi.util/pom.xml b/bundles/org.eclipse.osgi.util/pom.xml
index 4d46d53eb..5b48fe429 100644
--- a/bundles/org.eclipse.osgi.util/pom.xml
+++ b/bundles/org.eclipse.osgi.util/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.util</artifactId>
   <version>3.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases
index 0aff94e32..e317d61a2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/osname.aliases
@@ -42,5 +42,6 @@ WindowsVista WinVista "Windows Vista" Win32 # Microsoft
 Windows2008 "Windows 2008" "Windows Server 2008" Win2008 Win32 # Microsoft
 WindowsServer2008 "Windows 2008" "Windows Server 2008" Win2008 Win32 # Microsoft
 WindowsServer2008R2 "Windows 2008 R2" "Windows Server 2008 R2" Win2008R2 Win32 # Microsoft
+WindowsServer2012 "Windows 2012" "Windows Server 2012" Win2012 Win32 # Microsoft
 Windows7 "Windows 7" Win7 Win32 # Microsoft
 Windows8 "Windows 8" Win8 Win32 # Microsoft
\ No newline at end of file
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
index bf86fdc99..39fa49cca 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java
@@ -327,7 +327,7 @@ public class BundleLoader implements ModuleLoader {
 			result = source.loadClass(name);
 			if (result != null)
 				return result;
-			throw new ClassNotFoundException(name);
+			throw new ClassNotFoundException(name + " cannot be found by " + this); //$NON-NLS-1$
 		}
 		// 4) search the required bundles
 		source = findRequiredSource(pkgName, null);
@@ -347,7 +347,7 @@ public class BundleLoader implements ModuleLoader {
 				if (result != null)
 					return result;
 				// must throw CNFE if dynamic import source does not have the class
-				throw new ClassNotFoundException(name);
+				throw new ClassNotFoundException(name + " cannot be found by " + this); //$NON-NLS-1$
 			}
 		}
 
@@ -373,7 +373,7 @@ public class BundleLoader implements ModuleLoader {
 			} catch (ClassNotFoundException e) {
 				// we want to generate our own exception below
 			}
-		throw new ClassNotFoundException(name);
+		throw new ClassNotFoundException(name + " cannot be found by " + this); //$NON-NLS-1$
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 1a439455c..823800f6f 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi</artifactId>
   <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index 38c9681e7..42cf0e4b7 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -22,7 +22,7 @@
     <relativePath>../../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.equinox.framework</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.supplement</artifactId>
   <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>