diff options
| author | Thomas Watson | 2014-11-03 19:30:20 +0000 |
|---|---|---|
| committer | Thomas Watson | 2014-11-03 19:30:20 +0000 |
| commit | 21d913517810a9608e3dd5533f20103b365ba8b3 (patch) | |
| tree | 5a339c92a57a168c95f4537482a396e784ec0648 | |
| parent | 9c39affbd127c10e3db2c24a7789e67ceca6f7b6 (diff) | |
| download | rt.equinox.framework-21d913517810a9608e3dd5533f20103b365ba8b3.tar.gz rt.equinox.framework-21d913517810a9608e3dd5533f20103b365ba8b3.tar.xz rt.equinox.framework-21d913517810a9608e3dd5533f20103b365ba8b3.zip | |
Bug 449484 - Add configuration property to allow bundles to provideI20141104-0800
osgi.ee and osgi.native capabilities
- rename constant var to
EquinoxConfiguration.PROP_ALLOW_RESTRICTED_PROVIDES
Change-Id: I7642e8c4ca27e574d9e7e2e24f3b5f06afb0f0f3
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java index 98ee3a663..2925071f5 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java @@ -189,7 +189,7 @@ public class EquinoxConfiguration implements EnvironmentInfo { public static final String PROP_STATE_SAVE_DELAY_INTERVAL = "eclipse.stateSaveDelayInterval"; //$NON-NLS-1$ public static final String PROP_MODULE_LOCK_TIMEOUT = "osgi.module.lock.timeout"; //$NON-NLS-1$ - public static final String PROP_TOLERATE_PROVIDE = "osgi.equinox.allow.restricted.provides"; //$NON-NLS-1$ + public static final String PROP_ALLOW_RESTRICTED_PROVIDES = "osgi.equinox.allow.restricted.provides"; //$NON-NLS-1$ private final static Collection<String> populateInitConfig = Arrays.asList(PROP_OSGI_ARCH, PROP_OSGI_OS, PROP_OSGI_WS, PROP_OSGI_NL, FRAMEWORK_OS_NAME, FRAMEWORK_OS_VERSION, FRAMEWORK_PROCESSOR, FRAMEWORK_LANGUAGE); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index b5ae66154..2ac257455 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -96,7 +96,7 @@ public class Storage { mruList = new MRUBundleFileList(getBundleFileLimit(container.getConfiguration())); equinoxContainer = container; extensionInstaller = new FrameworkExtensionInstaller(container.getConfiguration()); - allowRestrictedProvides = Boolean.parseBoolean(container.getConfiguration().getConfiguration(EquinoxConfiguration.PROP_TOLERATE_PROVIDE)); + allowRestrictedProvides = Boolean.parseBoolean(container.getConfiguration().getConfiguration(EquinoxConfiguration.PROP_ALLOW_RESTRICTED_PROVIDES)); // we need to set the install path as soon as possible so we can determine // the absolute location of install relative URLs |