Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2006-01-25 11:09:12 -0500
committerDJ Houghton2006-01-25 11:09:12 -0500
commitf77b533ceadf5ead53b5260f1563b46b2da3ac39 (patch)
treef7b7083c08492bbc258b96fc958b7d66bbeac21c
parent91e58b0b799e47661e54771d11ca5ccaaaa049e1 (diff)
downloadrt.equinox.bundles-f77b533ceadf5ead53b5260f1563b46b2da3ac39.tar.gz
rt.equinox.bundles-f77b533ceadf5ead53b5260f1563b46b2da3ac39.tar.xz
rt.equinox.bundles-f77b533ceadf5ead53b5260f1563b46b2da3ac39.zip
Bug 112954 - Support for dynamic extensions
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java3
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java4
2 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java
index 130990d9..03583754 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java
@@ -27,12 +27,13 @@ public interface IRegistryConstants {
public static final String PROP_CHECK_CONFIG = "osgi.checkConfiguration"; //$NON-NLS-1$
public static final String PROP_NO_REGISTRY_CACHE = "eclipse.noRegistryCache"; //$NON-NLS-1$
public static final String PROP_DEFAULT_REGISTRY = "eclipse.createRegistry"; //$NON-NLS-1$
+ public static final String PROP_REGISTRY_NULL_USER_TOKEN = "eclipse.registry.nulltoken"; //$NON-NLS-1$
// OSGI system properties
public static final String PROP_NL = "osgi.nl"; //$NON-NLS-1$
public static final String PROP_OS = "osgi.os"; //$NON-NLS-1$
public static final String PROP_WS = "osgi.ws"; //$NON-NLS-1$
-
+
/**
* Specific error code supplied to the Status objects
*/
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java
index 853a6875..db74720b 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java
@@ -98,6 +98,10 @@ public class Activator implements BundleActivator {
if (property != null && property.equalsIgnoreCase("false")) //$NON-NLS-1$
return;
+ // check to see if we need to use null as a userToken
+ if ("true".equals(bundleContext.getProperty(IRegistryConstants.PROP_REGISTRY_NULL_USER_TOKEN))) //$NON-NLS-1$
+ userRegistryKey = null;
+
Location configuration = OSGIUtils.getDefault().getConfigurationLocation();
File theStorageDir = new File(configuration.getURL().getPath() + '/' + STORAGE_DIR);
EquinoxRegistryStrategy registryStrategy = new EquinoxRegistryStrategy(theStorageDir, configuration.isReadOnly(), masterRegistryKey);

Back to the top