Rename EclipseEnvironmentInfo to EquinoxConfiguration

7 files changed, 79 insertions, 79 deletions

diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java
index 117214fc1..e1e909502 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/EnvironmentInfoTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osgi.tests.eclipseadaptor;
 
-import org.eclipse.osgi.internal.framework.EclipseEnvironmentInfo;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
 
 import junit.framework.*;
 import org.eclipse.osgi.service.environment.Constants;
@@ -26,73 +26,73 @@ public class EnvironmentInfoTest extends TestCase {
 	}
 
 	public void testAIX() {
-		assertEquals("1.0", Constants.OS_AIX, EclipseEnvironmentInfo.guessOS("AIX"));
-		assertEquals("1.1", Constants.OS_AIX, EclipseEnvironmentInfo.guessOS("aix"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("aix xyz"));
-		assertEquals("2.0", Constants.WS_MOTIF, EclipseEnvironmentInfo.guessWS(Constants.OS_AIX));
+		assertEquals("1.0", Constants.OS_AIX, EquinoxConfiguration.guessOS("AIX"));
+		assertEquals("1.1", Constants.OS_AIX, EquinoxConfiguration.guessOS("aix"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("aix xyz"));
+		assertEquals("2.0", Constants.WS_MOTIF, EquinoxConfiguration.guessWS(Constants.OS_AIX));
 	}
 
 	public void testHPUX() {
-		assertEquals("1.0", Constants.OS_HPUX, EclipseEnvironmentInfo.guessOS("HP-UX"));
-		assertEquals("1.1", Constants.OS_HPUX, EclipseEnvironmentInfo.guessOS("hp-ux"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("hp-ux xyz"));
-		assertEquals("2.0", Constants.WS_MOTIF, EclipseEnvironmentInfo.guessWS(Constants.OS_HPUX));
+		assertEquals("1.0", Constants.OS_HPUX, EquinoxConfiguration.guessOS("HP-UX"));
+		assertEquals("1.1", Constants.OS_HPUX, EquinoxConfiguration.guessOS("hp-ux"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("hp-ux xyz"));
+		assertEquals("2.0", Constants.WS_MOTIF, EquinoxConfiguration.guessWS(Constants.OS_HPUX));
 	}
 
 	public void testLinux() {
-		assertEquals("1.0", Constants.OS_LINUX, EclipseEnvironmentInfo.guessOS("Linux"));
-		assertEquals("1.1", Constants.OS_LINUX, EclipseEnvironmentInfo.guessOS("linux"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("linux xyz"));
-		assertEquals("2.0", Constants.WS_GTK, EclipseEnvironmentInfo.guessWS(Constants.OS_LINUX));
+		assertEquals("1.0", Constants.OS_LINUX, EquinoxConfiguration.guessOS("Linux"));
+		assertEquals("1.1", Constants.OS_LINUX, EquinoxConfiguration.guessOS("linux"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("linux xyz"));
+		assertEquals("2.0", Constants.WS_GTK, EquinoxConfiguration.guessWS(Constants.OS_LINUX));
 	}
 
 	public void testMacOSX() {
-		assertEquals("1.0", Constants.OS_MACOSX, EclipseEnvironmentInfo.guessOS("Mac OS"));
-		assertEquals("1.1", Constants.OS_MACOSX, EclipseEnvironmentInfo.guessOS("Mac OS X"));
-		assertEquals("1.2", Constants.OS_MACOSX, EclipseEnvironmentInfo.guessOS("mac os x"));
-		assertEquals("2.0", Constants.WS_COCOA, EclipseEnvironmentInfo.guessWS(Constants.OS_MACOSX));
+		assertEquals("1.0", Constants.OS_MACOSX, EquinoxConfiguration.guessOS("Mac OS"));
+		assertEquals("1.1", Constants.OS_MACOSX, EquinoxConfiguration.guessOS("Mac OS X"));
+		assertEquals("1.2", Constants.OS_MACOSX, EquinoxConfiguration.guessOS("mac os x"));
+		assertEquals("2.0", Constants.WS_COCOA, EquinoxConfiguration.guessWS(Constants.OS_MACOSX));
 	}
 
 	public void testQNX() {
-		assertEquals("1.0", Constants.OS_QNX, EclipseEnvironmentInfo.guessOS("QNX"));
-		assertEquals("1.1", Constants.OS_QNX, EclipseEnvironmentInfo.guessOS("qnx"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("qnx xyz"));
-		assertEquals("2.0", Constants.WS_PHOTON, EclipseEnvironmentInfo.guessWS(Constants.OS_QNX));
+		assertEquals("1.0", Constants.OS_QNX, EquinoxConfiguration.guessOS("QNX"));
+		assertEquals("1.1", Constants.OS_QNX, EquinoxConfiguration.guessOS("qnx"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("qnx xyz"));
+		assertEquals("2.0", Constants.WS_PHOTON, EquinoxConfiguration.guessWS(Constants.OS_QNX));
 	}
 
 	public void testSolaris() {
-		assertEquals("1.0", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("Solaris"));
-		assertEquals("1.1", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("solaris"));
-		assertEquals("1.2", Constants.OS_SOLARIS, EclipseEnvironmentInfo.guessOS("SunOS"));
-		assertEquals("1.3", Constants.OS_SOLARIS, EclipseEnvironmentInfo.guessOS("sunos"));
-		assertEquals("1.4", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("solaris xyz"));
-		assertEquals("1.4", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("sunos xyz"));
-		assertEquals("2.0", Constants.WS_GTK, EclipseEnvironmentInfo.guessWS(Constants.OS_SOLARIS));
+		assertEquals("1.0", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("Solaris"));
+		assertEquals("1.1", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("solaris"));
+		assertEquals("1.2", Constants.OS_SOLARIS, EquinoxConfiguration.guessOS("SunOS"));
+		assertEquals("1.3", Constants.OS_SOLARIS, EquinoxConfiguration.guessOS("sunos"));
+		assertEquals("1.4", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("solaris xyz"));
+		assertEquals("1.4", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("sunos xyz"));
+		assertEquals("2.0", Constants.WS_GTK, EquinoxConfiguration.guessWS(Constants.OS_SOLARIS));
 	}
 
 	public void testWindows() {
-		assertEquals("1.0", Constants.OS_WIN32, EclipseEnvironmentInfo.guessOS("Windows XP"));
-		assertEquals("1.1", Constants.OS_WIN32, EclipseEnvironmentInfo.guessOS("Windows 98"));
-		assertEquals("1.2", Constants.OS_WIN32, EclipseEnvironmentInfo.guessOS("Windows 2000"));
-		assertEquals("1.3", Constants.OS_WIN32, EclipseEnvironmentInfo.guessOS("Windows NT"));
-		assertEquals("1.4", Constants.OS_WIN32, EclipseEnvironmentInfo.guessOS("Windows 95"));
-		assertEquals("2.0", Constants.WS_WIN32, EclipseEnvironmentInfo.guessWS(Constants.OS_WIN32));
+		assertEquals("1.0", Constants.OS_WIN32, EquinoxConfiguration.guessOS("Windows XP"));
+		assertEquals("1.1", Constants.OS_WIN32, EquinoxConfiguration.guessOS("Windows 98"));
+		assertEquals("1.2", Constants.OS_WIN32, EquinoxConfiguration.guessOS("Windows 2000"));
+		assertEquals("1.3", Constants.OS_WIN32, EquinoxConfiguration.guessOS("Windows NT"));
+		assertEquals("1.4", Constants.OS_WIN32, EquinoxConfiguration.guessOS("Windows 95"));
+		assertEquals("2.0", Constants.WS_WIN32, EquinoxConfiguration.guessWS(Constants.OS_WIN32));
 	}
 
 	public void testISeries() {
-		assertEquals("1.0", Constants.OS_OS400, EclipseEnvironmentInfo.guessOS("OS/400"));
-		assertEquals("1.1", Constants.OS_OS400, EclipseEnvironmentInfo.guessOS("os/400"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("OS/400 xyz"));
-		assertEquals("2.0", Constants.WS_UNKNOWN, EclipseEnvironmentInfo.guessWS(Constants.OS_OS400));
+		assertEquals("1.0", Constants.OS_OS400, EquinoxConfiguration.guessOS("OS/400"));
+		assertEquals("1.1", Constants.OS_OS400, EquinoxConfiguration.guessOS("os/400"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("OS/400 xyz"));
+		assertEquals("2.0", Constants.WS_UNKNOWN, EquinoxConfiguration.guessWS(Constants.OS_OS400));
 	}
 
 	public void testZSeries() {
-		assertEquals("1.0", Constants.OS_OS390, EclipseEnvironmentInfo.guessOS("OS/390"));
-		assertEquals("1.1", Constants.OS_OS390, EclipseEnvironmentInfo.guessOS("os/390"));
-		assertEquals("1.1", Constants.OS_ZOS, EclipseEnvironmentInfo.guessOS("z/os"));
-		assertEquals("1.1", Constants.OS_ZOS, EclipseEnvironmentInfo.guessOS("Z/OS"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("OS/400 xyz"));
-		assertEquals("1.2", Constants.OS_UNKNOWN, EclipseEnvironmentInfo.guessOS("z/os xyz"));
-		assertEquals("2.0", Constants.WS_UNKNOWN, EclipseEnvironmentInfo.guessWS(Constants.OS_OS390));
+		assertEquals("1.0", Constants.OS_OS390, EquinoxConfiguration.guessOS("OS/390"));
+		assertEquals("1.1", Constants.OS_OS390, EquinoxConfiguration.guessOS("os/390"));
+		assertEquals("1.1", Constants.OS_ZOS, EquinoxConfiguration.guessOS("z/os"));
+		assertEquals("1.1", Constants.OS_ZOS, EquinoxConfiguration.guessOS("Z/OS"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("OS/400 xyz"));
+		assertEquals("1.2", Constants.OS_UNKNOWN, EquinoxConfiguration.guessOS("z/os xyz"));
+		assertEquals("2.0", Constants.WS_UNKNOWN, EquinoxConfiguration.guessWS(Constants.OS_OS390));
 	}
 }
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
index 65e80479f..d20f2ce38 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.core.runtime.adaptor;
 
-import org.eclipse.osgi.internal.framework.EclipseEnvironmentInfo;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
 
 import org.eclipse.osgi.internal.location.EquinoxLocations;
 
@@ -744,10 +744,10 @@ public class EclipseStarter {
 	}
 
 	private static String[] processCommandLine(String[] args) throws Exception {
-		EclipseEnvironmentInfo.setAllArgs(args);
+		EquinoxConfiguration.setAllArgs(args);
 		if (args.length == 0) {
-			EclipseEnvironmentInfo.setFrameworkArgs(args);
-			EclipseEnvironmentInfo.setAllArgs(args);
+			EquinoxConfiguration.setFrameworkArgs(args);
+			EquinoxConfiguration.setAllArgs(args);
 			return args;
 		}
 		int[] configArgs = new int[args.length];
@@ -897,8 +897,8 @@ public class EclipseStarter {
 
 		// remove all the arguments consumed by this argument parsing
 		if (configArgIndex == 0) {
-			EclipseEnvironmentInfo.setFrameworkArgs(new String[0]);
-			EclipseEnvironmentInfo.setAppArgs(args);
+			EquinoxConfiguration.setFrameworkArgs(new String[0]);
+			EquinoxConfiguration.setAppArgs(args);
 			return args;
 		}
 		String[] appArgs = new String[args.length - configArgIndex];
@@ -913,8 +913,8 @@ public class EclipseStarter {
 			} else
 				appArgs[j++] = args[i];
 		}
-		EclipseEnvironmentInfo.setFrameworkArgs(frameworkArgs);
-		EclipseEnvironmentInfo.setAppArgs(appArgs);
+		EquinoxConfiguration.setFrameworkArgs(frameworkArgs);
+		EquinoxConfiguration.setAppArgs(appArgs);
 		return appArgs;
 	}
 
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
index 0929c4a1a..d5c71aa0e 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.core.runtime.internal.adaptor;
 
-import org.eclipse.osgi.internal.framework.EclipseEnvironmentInfo;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
 
 import org.eclipse.osgi.internal.location.EquinoxLocations;
 
@@ -93,7 +93,7 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
 		urlProperties.put("protocol", new String[] {"bundleentry", "bundleresource"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		registrations.add(context.registerService(URLConverter.class.getName(), new URLConverterImpl(), urlProperties));
 
-		registrations.add(AdaptorUtil.register(org.eclipse.osgi.service.environment.EnvironmentInfo.class.getName(), EclipseEnvironmentInfo.getDefault(), context));
+		registrations.add(AdaptorUtil.register(org.eclipse.osgi.service.environment.EnvironmentInfo.class.getName(), EquinoxConfiguration.getDefault(), context));
 		registrations.add(AdaptorUtil.register(PlatformAdmin.class.getName(), adaptor.getPlatformAdmin(), context));
 		PluginConverter converter = PluginConverterImpl.getDefault();
 		if (converter == null)
@@ -217,7 +217,7 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
 	public void initialize(BaseAdaptor initAdaptor) {
 		this.adaptor = initAdaptor;
 		// EnvironmentInfo has to be initialized first to compute defaults for system context (see bug 88925)
-		EclipseEnvironmentInfo.getDefault();
+		EquinoxConfiguration.getDefault();
 		setDebugOptions();
 	}
 
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java
index 8bdafcf1f..151ddd42f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.core.runtime.internal.adaptor;
 
-import org.eclipse.osgi.internal.framework.EclipseEnvironmentInfo;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
 
 import java.io.File;
 import java.security.ProtectionDomain;
@@ -31,7 +31,7 @@ import org.eclipse.osgi.internal.baseadaptor.BaseClassLoadingHook;
 import org.eclipse.osgi.internal.baseadaptor.BaseStorageHook;
 
 public class EclipseClassLoadingHook implements ClassLoadingHook, HookConfigurator {
-	private static String[] NL_JAR_VARIANTS = buildNLJarVariants(EclipseEnvironmentInfo.getDefault().getNL());
+	private static String[] NL_JAR_VARIANTS = buildNLJarVariants(EquinoxConfiguration.getDefault().getNL());
 	private static boolean DEFINE_PACKAGES;
 	private final static boolean DEFINE_PACKAGE_ATTRIBUTES = !"noattributes".equals(FrameworkProperties.getProperty("osgi.classloader.define.packages")); //$NON-NLS-1$ //$NON-NLS-2$
 	private static String[] LIB_VARIANTS = buildLibraryVariants();
@@ -48,7 +48,7 @@ public class EclipseClassLoadingHook implements ClassLoadingHook, HookConfigurat
 
 	private static String[] buildLibraryVariants() {
 		List<String> result = new ArrayList<String>();
-		EclipseEnvironmentInfo info = EclipseEnvironmentInfo.getDefault();
+		EquinoxConfiguration info = EquinoxConfiguration.getDefault();
 		result.add("ws/" + info.getWS() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
 		result.add("os/" + info.getOS() + "/" + info.getOSArch() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		result.add("os/" + info.getOS() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -149,9 +149,9 @@ public class EclipseClassLoadingHook implements ClassLoadingHook, HookConfigurat
 
 	private boolean addInternalClassPath(String var, ArrayList<ClasspathEntry> cpEntries, String cp, ClasspathManager hostloader, BaseData sourcedata, ProtectionDomain sourcedomain) {
 		if (var.equals("ws")) //$NON-NLS-1$
-			return ClasspathManager.addClassPathEntry(cpEntries, "ws/" + EclipseEnvironmentInfo.getDefault().getWS() + cp.substring(4), hostloader, sourcedata, sourcedomain); //$NON-NLS-1$
+			return ClasspathManager.addClassPathEntry(cpEntries, "ws/" + EquinoxConfiguration.getDefault().getWS() + cp.substring(4), hostloader, sourcedata, sourcedomain); //$NON-NLS-1$
 		if (var.equals("os")) //$NON-NLS-1$
-			return ClasspathManager.addClassPathEntry(cpEntries, "os/" + EclipseEnvironmentInfo.getDefault().getOS() + cp.substring(4), hostloader, sourcedata, sourcedomain); //$NON-NLS-1$ 
+			return ClasspathManager.addClassPathEntry(cpEntries, "os/" + EquinoxConfiguration.getDefault().getOS() + cp.substring(4), hostloader, sourcedata, sourcedomain); //$NON-NLS-1$ 
 		if (var.equals("nl")) { //$NON-NLS-1$
 			cp = cp.substring(4);
 			for (int i = 0; i < NL_JAR_VARIANTS.length; i++)
@@ -212,7 +212,7 @@ public class EclipseClassLoadingHook implements ClassLoadingHook, HookConfigurat
 				if (libFile == null)
 					return null;
 				// see bug 88697 - HP requires libraries to have executable permissions
-				if (org.eclipse.osgi.service.environment.Constants.OS_HPUX.equals(EclipseEnvironmentInfo.getDefault().getOS())) {
+				if (org.eclipse.osgi.service.environment.Constants.OS_HPUX.equals(EquinoxConfiguration.getDefault().getOS())) {
 					try {
 						// use the string array method in case there is a space in the path
 						Runtime.getRuntime().exec(new String[] {"chmod", "755", libFile.getAbsolutePath()}).waitFor(); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogWriter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogWriter.java
index 04b6f4cae..ef06350c2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogWriter.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogWriter.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.core.runtime.internal.adaptor;
 
-import org.eclipse.osgi.internal.framework.EclipseEnvironmentInfo;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
 
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
@@ -209,15 +209,15 @@ public class EclipseLogWriter implements SynchronousLogListener, LogFilter {
 			// then just skip over them.
 		}
 		// The Bootloader has some information that we might be interested in.
-		write("BootLoader constants: OS=" + EclipseEnvironmentInfo.getDefault().getOS()); //$NON-NLS-1$
-		write(", ARCH=" + EclipseEnvironmentInfo.getDefault().getOSArch()); //$NON-NLS-1$
-		write(", WS=" + EclipseEnvironmentInfo.getDefault().getWS()); //$NON-NLS-1$
-		writeln(", NL=" + EclipseEnvironmentInfo.getDefault().getNL()); //$NON-NLS-1$
+		write("BootLoader constants: OS=" + EquinoxConfiguration.getDefault().getOS()); //$NON-NLS-1$
+		write(", ARCH=" + EquinoxConfiguration.getDefault().getOSArch()); //$NON-NLS-1$
+		write(", WS=" + EquinoxConfiguration.getDefault().getWS()); //$NON-NLS-1$
+		writeln(", NL=" + EquinoxConfiguration.getDefault().getNL()); //$NON-NLS-1$
 		// Add the command-line arguments used to invoke the platform 
 		// XXX: this includes runtime-private arguments - should we do that?
 		if (includeCommandLine) {
-			writeArgs("Framework arguments: ", EclipseEnvironmentInfo.getDefault().getNonFrameworkArgs()); //$NON-NLS-1$
-			writeArgs("Command-line arguments: ", EclipseEnvironmentInfo.getDefault().getCommandLineArgs()); //$NON-NLS-1$
+			writeArgs("Framework arguments: ", EquinoxConfiguration.getDefault().getNonFrameworkArgs()); //$NON-NLS-1$
+			writeArgs("Command-line arguments: ", EquinoxConfiguration.getDefault().getCommandLineArgs()); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EclipseEnvironmentInfo.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
index 7b1efffa0..e46cb859f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EclipseEnvironmentInfo.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java
@@ -21,8 +21,8 @@ import org.eclipse.osgi.util.NLS;
 /**
  * Internal class.
  */
-public class EclipseEnvironmentInfo implements EnvironmentInfo {
-	private static EclipseEnvironmentInfo singleton;
+public class EquinoxConfiguration implements EnvironmentInfo {
+	private static EquinoxConfiguration singleton;
 	private static String nl;
 	private static String os;
 	private static String ws;
@@ -50,14 +50,14 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo {
 	// this internally to be x86_64.
 	private static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$
 
-	private EclipseEnvironmentInfo() {
+	private EquinoxConfiguration() {
 		super();
 		setupSystemContext();
 	}
 
-	public static EclipseEnvironmentInfo getDefault() {
+	public static EquinoxConfiguration getDefault() {
 		if (singleton == null)
-			singleton = new EclipseEnvironmentInfo();
+			singleton = new EquinoxConfiguration();
 		return singleton;
 	}
 
@@ -175,17 +175,17 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo {
 
 	public static void setAllArgs(String[] allArgs) {
 		// do not check if this is set already to allow arguments to change when multiple applications are launched
-		EclipseEnvironmentInfo.allArgs = allArgs;
+		EquinoxConfiguration.allArgs = allArgs;
 	}
 
 	public static void setAppArgs(String[] appArgs) {
 		// do not check if this is set already to allow arguments to change when multiple applications are launched
-		EclipseEnvironmentInfo.appArgs = appArgs;
+		EquinoxConfiguration.appArgs = appArgs;
 	}
 
 	public static void setFrameworkArgs(String[] frameworkArgs) {
 		// do not check if this is set already to allow arguments to change when multiple applications are launched
-		EclipseEnvironmentInfo.frameworkArgs = frameworkArgs;
+		EquinoxConfiguration.frameworkArgs = frameworkArgs;
 	}
 
 	public static String guessWS(String osName) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
index 2091663ca..09a8ab996 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osgi.internal.location;
 
-import org.eclipse.osgi.internal.framework.EclipseEnvironmentInfo;
+import org.eclipse.osgi.internal.framework.EquinoxConfiguration;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -167,7 +167,7 @@ public class EquinoxLocations {
 		File launcherDir = new File(launcherFile.getParent());
 		// check for mac os; the os check is copied from EclipseEnvironmentInfo.
 		String macosx = org.eclipse.osgi.service.environment.Constants.OS_MACOSX;
-		if (macosx.equals(EclipseEnvironmentInfo.getDefault().getOS()))
+		if (macosx.equals(EquinoxConfiguration.getDefault().getOS()))
 			launcherDir = getMacOSEclipsoeHomeLocation(launcherDir);
 		return (launcherDir.exists() && launcherDir.isDirectory()) ? launcherDir.getAbsolutePath() : null;
 	}