Clean up non-nls tags.

14 files changed, 36 insertions, 36 deletions

diff --git a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java
index ea9bfeaab..a8d79f29d 100644
--- a/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java
+++ b/bundles/org.eclipse.osgi/console/src/org/eclipse/osgi/framework/internal/core/FrameworkCommandProvider.java
@@ -429,9 +429,9 @@ public class FrameworkCommandProvider implements CommandProvider, SynchronousBun
 		String option = intp.nextArgument();
 		String filteredName = null;
 		int stateFilter = -1;
-		if (option != null && option.equals("-s")) {
+		if (option != null && option.equals("-s")) { //$NON-NLS-1$
 			String searchedState = intp.nextArgument();
-			StringTokenizer tokens = new StringTokenizer(searchedState, ",");
+			StringTokenizer tokens = new StringTokenizer(searchedState, ","); //$NON-NLS-1$
 			while (tokens.hasMoreElements()) {
 				String desiredState = (String) tokens.nextElement();
 				Field match = null;
@@ -441,10 +441,10 @@ public class FrameworkCommandProvider implements CommandProvider, SynchronousBun
 						stateFilter = 0;
 					stateFilter |= match.getInt(match);
 				} catch (NoSuchFieldException e) {
-					intp.println(ConsoleMsg.CONSOLE_INVALID_INPUT + ": " + desiredState);
+					intp.println(ConsoleMsg.CONSOLE_INVALID_INPUT + ": " + desiredState); //$NON-NLS-1$
 					return null;
 				} catch (IllegalAccessException e) {
-					intp.println(ConsoleMsg.CONSOLE_INVALID_INPUT + ": " + desiredState);
+					intp.println(ConsoleMsg.CONSOLE_INVALID_INPUT + ": " + desiredState); //$NON-NLS-1$
 					return null;
 				}
 			}
diff --git a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java
index c0795eab1..1862500b8 100644
--- a/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java
+++ b/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/framework/adaptor/FilePath.java
@@ -170,7 +170,7 @@ public class FilePath {
 					original = original.substring(uncPrefixEnd, original.length());
 				} else
 					// not a valid UNC
-					throw new IllegalArgumentException("Not a valid UNC: " + original); //TODO add message
+					throw new IllegalArgumentException("Not a valid UNC: " + original); //$NON-NLS-1$
 			}
 		}
 		// device names letters and UNCs properly stripped off
diff --git a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeBase.java b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeBase.java
index 7d5d76852..192222015 100644
--- a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeBase.java
+++ b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeBase.java
@@ -100,7 +100,7 @@ public abstract class CompositeBase extends BundleHost implements CompositeResol
 	}
 
 	public void update() throws BundleException {
-		throw new BundleException("Cannot update composite bundles", BundleException.INVALID_OPERATION);
+		throw new BundleException("Cannot update composite bundles", BundleException.INVALID_OPERATION); //$NON-NLS-1$
 	}
 
 	public void update(InputStream in) throws BundleException {
@@ -109,6 +109,6 @@ public abstract class CompositeBase extends BundleHost implements CompositeResol
 		} catch (IOException e) {
 			// ignore
 		}
-		throw new BundleException("Cannot update composite bundles", BundleException.INVALID_OPERATION);
+		throw new BundleException("Cannot update composite bundles", BundleException.INVALID_OPERATION); //$NON-NLS-1$
 	}
 }
diff --git a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeConfigurator.java b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeConfigurator.java
index b317ece24..c7dad4dc6 100644
--- a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeConfigurator.java
+++ b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeConfigurator.java
@@ -117,7 +117,7 @@ public class CompositeConfigurator implements HookConfigurator, AdaptorHook, Cla
 			CompositeHelper.setCompositePermissions(location, systemContext);
 			return result;
 		} catch (IOException e) {
-			throw new BundleException("Error creating composite bundle", e);
+			throw new BundleException("Error creating composite bundle", e); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeHelper.java b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeHelper.java
index 52f38a758..021369e8e 100644
--- a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeHelper.java
+++ b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeHelper.java
@@ -203,7 +203,7 @@ public class CompositeHelper {
 		ServiceReference ref = systemContext.getServiceReference(PermissionAdmin.class.getName());
 		PermissionAdmin permAdmin = (PermissionAdmin) (ref == null ? null : systemContext.getService(ref));
 		if (permAdmin == null)
-			throw new RuntimeException("No Permission Admin service is available");
+			throw new RuntimeException("No Permission Admin service is available"); //$NON-NLS-1$
 		try {
 			permAdmin.setPermissions(bundleLocation, COMPOSITE_PERMISSIONS);
 		} finally {
@@ -215,7 +215,7 @@ public class CompositeHelper {
 		ServiceReference ref = systemContext.getServiceReference(PlatformAdmin.class.getName());
 		PlatformAdmin pa = (PlatformAdmin) (ref == null ? null : systemContext.getService(ref));
 		if (pa == null)
-			throw new RuntimeException("No Platform Admin service is available.");
+			throw new RuntimeException("No Platform Admin service is available."); //$NON-NLS-1$
 		try {
 			State state = pa.getState(false);
 			BundleDescription desc = state.getBundle(bundle.getBundleId());
@@ -228,7 +228,7 @@ public class CompositeHelper {
 	static void setDisabled(boolean disable, BundleDescription bundle) {
 		State state = bundle.getContainingState();
 		if (disable) {
-			state.addDisabledInfo(new DisabledInfo(COMPOSITE_POLICY, "Composite companion bundle is not resolved.", bundle));
+			state.addDisabledInfo(new DisabledInfo(COMPOSITE_POLICY, "Composite companion bundle is not resolved.", bundle)); //$NON-NLS-1$
 		} else {
 			DisabledInfo toRemove = state.getDisabledInfo(bundle, COMPOSITE_POLICY);
 			if (toRemove != null)
@@ -238,14 +238,14 @@ public class CompositeHelper {
 
 	static void validateCompositeManifest(Map compositeManifest) throws BundleException {
 		if (compositeManifest == null)
-			throw new BundleException("The composite manifest cannot be null.", BundleException.MANIFEST_ERROR);
+			throw new BundleException("The composite manifest cannot be null.", BundleException.MANIFEST_ERROR); //$NON-NLS-1$
 		// check for symbolic name
 		if (compositeManifest.get(Constants.BUNDLE_SYMBOLICNAME) == null)
-			throw new BundleException("The composite manifest must contain a Bundle-SymbolicName header.", BundleException.MANIFEST_ERROR);
+			throw new BundleException("The composite manifest must contain a Bundle-SymbolicName header.", BundleException.MANIFEST_ERROR); //$NON-NLS-1$
 		// check for invalid manifests headers
 		for (int i = 0; i < INVALID_COMPOSITE_HEADERS.length; i++)
 			if (compositeManifest.get(INVALID_COMPOSITE_HEADERS[i]) != null)
-				throw new BundleException("The composite manifest must not contain the header " + INVALID_COMPOSITE_HEADERS[i], BundleException.MANIFEST_ERROR);
+				throw new BundleException("The composite manifest must not contain the header " + INVALID_COMPOSITE_HEADERS[i], BundleException.MANIFEST_ERROR); //$NON-NLS-1$
 		// validate manifest version
 		String manifestVersion = (String) compositeManifest.get(Constants.BUNDLE_MANIFESTVERSION);
 		if (manifestVersion == null) {
@@ -254,9 +254,9 @@ public class CompositeHelper {
 			try {
 				Integer parsed = Integer.valueOf(manifestVersion);
 				if (parsed.intValue() > 2 || parsed.intValue() < 2)
-					throw new BundleException("Invalid Bundle-ManifestVersion: " + manifestVersion);
+					throw new BundleException("Invalid Bundle-ManifestVersion: " + manifestVersion); //$NON-NLS-1$
 			} catch (NumberFormatException e) {
-				throw new BundleException("Invalid Bundle-ManifestVersion: " + manifestVersion);
+				throw new BundleException("Invalid Bundle-ManifestVersion: " + manifestVersion); //$NON-NLS-1$
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java
index 1303be9b4..9716442f4 100644
--- a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java
+++ b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java
@@ -49,7 +49,7 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
 		try {
 			props.load(childConfig.openStream());
 		} catch (IOException e) {
-			throw new BundleException("Could not load child configuration", e);
+			throw new BundleException("Could not load child configuration", e); //$NON-NLS-1$
 		}
 		props.put(Constants.FRAMEWORK_STORAGE, compositeStorage.getAbsolutePath());
 		// save the parent framework so the parent companion bundle can find it
@@ -71,7 +71,7 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
 			InputStream surrogateContent = CompositeHelper.getSurrogateInput(thisData.getManifest(), null, null);
 			surrogate = companionContext.installBundle(thisData.getLocation(), surrogateContent);
 		} catch (IOException e) {
-			throw new BundleException("Error installing parent companion composite bundle", e);
+			throw new BundleException("Error installing parent companion composite bundle", e); //$NON-NLS-1$
 		}
 		// disable the surrogate initially since we know we have not resolved the composite yet.
 		CompositeHelper.setDisabled(true, surrogate, companionContext);
@@ -85,7 +85,7 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
 		try {
 			surrogateContent = CompositeHelper.getSurrogateInput(thisData.getManifest(), child, matchingExports);
 		} catch (IOException e) {
-			throw new BundleException("Error updating surrogate bundle.", e);
+			throw new BundleException("Error updating surrogate bundle.", e); //$NON-NLS-1$
 		}
 		CompositeModule surrogateComposite = (CompositeModule) getSurrogateBundle();
 		surrogateComposite.updateContent(surrogateContent);
@@ -110,7 +110,7 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
 		try {
 			return findSurrogateBundle();
 		} catch (BundleException e) {
-			throw new RuntimeException("Error intializing child framework", e);
+			throw new RuntimeException("Error intializing child framework", e); //$NON-NLS-1$
 		}
 	}
 
@@ -131,7 +131,7 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
 			// update the content with the new manifest
 			updateContent(CompositeHelper.getCompositeInput(frameworkConfig, compositeManifest));
 		} catch (IOException e) {
-			throw new BundleException("Error updating composite.", e);
+			throw new BundleException("Error updating composite.", e); //$NON-NLS-1$
 		}
 	}
 
@@ -186,17 +186,17 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
 			FrameworkEvent stopped = companionFramework.waitForStop(30000);
 			switch (stopped.getType()) {
 				case FrameworkEvent.ERROR :
-					throw new BundleException("Error stopping the child framework.", stopped.getThrowable());
+					throw new BundleException("Error stopping the child framework.", stopped.getThrowable()); //$NON-NLS-1$
 				case FrameworkEvent.INFO :
-					throw new BundleException("Timed out waiting for the child framework to stop.");
+					throw new BundleException("Timed out waiting for the child framework to stop."); //$NON-NLS-1$
 				case FrameworkEvent.STOPPED :
 					// normal stop, just return
 					return;
 				default :
-					throw new BundleException("Unexpected code returned when stopping the child framework:" + stopped.getType());
+					throw new BundleException("Unexpected code returned when stopping the child framework:" + stopped.getType()); //$NON-NLS-1$
 			}
 		} catch (InterruptedException e) {
-			throw new BundleException("Error stopping child framework", e);
+			throw new BundleException("Error stopping child framework", e); //$NON-NLS-1$
 		}
 	}
 
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
index 1c4b9c40a..2a4a5226e 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
@@ -299,7 +299,7 @@ public class BundleHost extends AbstractBundle {
 			setStatus(Constants.BUNDLE_STARTED, true);
 			setStatus(Constants.BUNDLE_ACTIVATION_POLICY, (options & START_ACTIVATION_POLICY) != 0);
 			if (Debug.DEBUG && Debug.MONITOR_ACTIVATION)
-				new Exception("A persistent start has been called on bundle: " + getBundleData()).printStackTrace();
+				new Exception("A persistent start has been called on bundle: " + getBundleData()).printStackTrace(); //$NON-NLS-1$
 		}
 		if (!framework.active || (state & ACTIVE) != 0)
 			return;
@@ -455,7 +455,7 @@ public class BundleHost extends AbstractBundle {
 			setStatus(Constants.BUNDLE_STARTED, false);
 			setStatus(Constants.BUNDLE_ACTIVATION_POLICY, false);
 			if (Debug.DEBUG && Debug.MONITOR_ACTIVATION)
-				new Exception("A persistent start has been called on bundle: " + getBundleData()).printStackTrace();
+				new Exception("A persistent start has been called on bundle: " + getBundleData()).printStackTrace(); //$NON-NLS-1$
 		}
 		if (framework.active) {
 			if ((state & (STOPPING | RESOLVED | INSTALLED)) != 0) {
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
index 11346c8d5..fbca8fb48 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
@@ -367,8 +367,8 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
 			// set the value of the framework language property
 			properties.put(Constants.FRAMEWORK_LANGUAGE, Locale.getDefault().getLanguage());
 		// set the support properties for fragments and require-bundle (bug 173090)
-		properties.put(Constants.SUPPORTS_FRAMEWORK_FRAGMENT, "true");
-		properties.put(Constants.SUPPORTS_FRAMEWORK_REQUIREBUNDLE, "true");
+		properties.put(Constants.SUPPORTS_FRAMEWORK_FRAGMENT, "true"); //$NON-NLS-1$
+		properties.put(Constants.SUPPORTS_FRAMEWORK_REQUIREBUNDLE, "true"); //$NON-NLS-1$
 	}
 
 	private int parseVersionInt(String value) {
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java
index b3fe241e2..e31922a32 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/EquinoxSecurityManager.java
@@ -144,7 +144,7 @@ public class EquinoxSecurityManager extends SecurityManager {
 				}
 				if (!grant)
 					// did not find a condition to grant the permission for this domain
-					throw new SecurityException("Conditions not satisfied");
+					throw new SecurityException("Conditions not satisfied"); //$NON-NLS-1$
 				// continue to next domain
 			}
 
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
index 6cb87c17f..ee00c1dbb 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/permadmin/SecurityAdmin.java
@@ -320,13 +320,13 @@ public final class SecurityAdmin implements PermissionAdmin, ConditionalPermissi
 			for (int i = 0; i < newRows.length; i++) {
 				Object rowObj = rows.get(i);
 				if (!(rowObj instanceof ConditionalPermissionInfoBase))
-					throw new IllegalStateException("Invalid type \"" + rowObj.getClass().getName() + "\" at row: " + i);
+					throw new IllegalStateException("Invalid type \"" + rowObj.getClass().getName() + "\" at row: " + i); //$NON-NLS-1$//$NON-NLS-2$
 				ConditionalPermissionInfoBase infoBaseRow = (ConditionalPermissionInfoBase) rowObj;
 				String name = infoBaseRow.getName();
 				if (name == null)
 					name = generateName();
 				if (names.contains(name))
-					throw new IllegalStateException("Duplicate name \"" + name + "\" at row: " + i);
+					throw new IllegalStateException("Duplicate name \"" + name + "\" at row: " + i); //$NON-NLS-1$//$NON-NLS-2$
 				newRows[i] = new SecurityRow(this, name, infoBaseRow.getConditionInfos(), infoBaseRow.getPermissionInfos(), infoBaseRow.getGrantDecision());
 			}
 			condAdminTable = new SecurityTable(this, newRows);
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/launch/Equinox.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/launch/Equinox.java
index 753979b07..d4e317f1b 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/launch/Equinox.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/launch/Equinox.java
@@ -28,7 +28,7 @@ import org.osgi.framework.launch.Framework;
  * @since 3.5
  */
 public class Equinox implements Framework {
-	private static final String implName = "org.eclipse.osgi.framework.internal.core.EquinoxLauncher";
+	private static final String implName = "org.eclipse.osgi.framework.internal.core.EquinoxLauncher"; //$NON-NLS-1$
 	/**@GuardedBy this*/
 	private Framework impl;
 	private final boolean useSeparateCL;
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
index 231e10554..58d93b051 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
@@ -1064,7 +1064,7 @@ public class BaseStorage implements SynchronousBundleListener {
 		File[] files = null;
 		try {
 			String[] paths = bundleData.getClassPath();
-			if (DevClassPathHelper.inDevelopmentMode()) { //$NON-NLS-1$
+			if (DevClassPathHelper.inDevelopmentMode()) {
 				String[] devPaths = DevClassPathHelper.getDevClassPath(bundleData.getSymbolicName());
 				String[] origPaths = paths;
 
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
index 4a76e9680..282eab702 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
@@ -274,7 +274,7 @@ public final class EclipseStorageHook implements StorageHook, HookConfigurator {
 		if (allElements == null)
 			return;
 		// the single value for this type is lazy
-		if (!Constants.ACTIVATION_LAZY.equalsIgnoreCase(allElements[0].getValue())) //$NON-NLS-1$
+		if (!Constants.ACTIVATION_LAZY.equalsIgnoreCase(allElements[0].getValue()))
 			return;
 		storageHook.flags |= FLAG_LAZY_START;
 		// look for any include or exclude attrs
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
index d369399c9..f6552ba4e 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
@@ -30,7 +30,7 @@ public abstract class StateImpl implements State {
 	private static final String OSGI_WS = "osgi.ws"; //$NON-NLS-1$
 	private static final String OSGI_NL = "osgi.nl"; //$NON-NLS-1$
 	private static final String OSGI_ARCH = "osgi.arch"; //$NON-NLS-1$
-	public static final String[] PROPS = {OSGI_OS, OSGI_WS, OSGI_NL, OSGI_ARCH, Constants.FRAMEWORK_SYSTEMPACKAGES, Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, Constants.OSGI_RESOLVER_MODE, Constants.FRAMEWORK_EXECUTIONENVIRONMENT, "osgi.resolveOptional", "osgi.genericAliases", Constants.FRAMEWORK_OS_NAME, Constants.FRAMEWORK_OS_VERSION, Constants.FRAMEWORK_PROCESSOR, Constants.FRAMEWORK_LANGUAGE, Constants.STATE_SYSTEM_BUNDLE}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	public static final String[] PROPS = {OSGI_OS, OSGI_WS, OSGI_NL, OSGI_ARCH, Constants.FRAMEWORK_SYSTEMPACKAGES, Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, Constants.OSGI_RESOLVER_MODE, Constants.FRAMEWORK_EXECUTIONENVIRONMENT, "osgi.resolveOptional", "osgi.genericAliases", Constants.FRAMEWORK_OS_NAME, Constants.FRAMEWORK_OS_VERSION, Constants.FRAMEWORK_PROCESSOR, Constants.FRAMEWORK_LANGUAGE, Constants.STATE_SYSTEM_BUNDLE}; //$NON-NLS-1$ //$NON-NLS-2$
 	private static final DisabledInfo[] EMPTY_DISABLEDINFOS = new DisabledInfo[0];
 
 	transient private Resolver resolver;