diff options
| author | Thomas Watson | 2008-08-25 21:57:27 +0000 |
|---|---|---|
| committer | Thomas Watson | 2008-08-25 21:57:27 +0000 |
| commit | 760312e5842c5fe958a4eafac1d4c51e72535438 (patch) | |
| tree | e89912d5ad97a5445c95d9702b0144e447a8ce3e /bundles/org.eclipse.osgi/eclipseAdaptor | |
| parent | c91c1e2b24e40f28ed163c1c298fbc2b6972a63a (diff) | |
| download | rt.equinox.framework-760312e5842c5fe958a4eafac1d4c51e72535438.tar.gz rt.equinox.framework-760312e5842c5fe958a4eafac1d4c51e72535438.tar.xz rt.equinox.framework-760312e5842c5fe958a4eafac1d4c51e72535438.zip | |
Bug 244624 Implement new BundleException typesv20080825-1800
Diffstat (limited to 'bundles/org.eclipse.osgi/eclipseAdaptor')
2 files changed, 1 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java index 5bdde0877..48566e956 100644 --- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java +++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java @@ -156,9 +156,6 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator { } public void addProperties(Properties properties) { - // default to not verify EE at install time - if (properties.getProperty(Constants.ECLIPSE_EE_INSTALL_VERIFY) == null) - properties.put(Constants.ECLIPSE_EE_INSTALL_VERIFY, "false"); //$NON-NLS-1$ // default to enable compatibility boot delegation if (properties.getProperty(Constants.OSGI_COMPATIBILITY_BOOTDELEGATION) == null) properties.put(Constants.OSGI_COMPATIBILITY_BOOTDELEGATION, "true"); //$NON-NLS-1$ 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 bdabca7e2..bb750190f 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 @@ -408,7 +408,7 @@ public final class EclipseStorageHook implements StorageHook, HookConfigurator { generatedManifest = converter.convertManifest(bundledata.getBundleFile().getBaseFile(), true, null, true, null); } catch (PluginConversionException pce) { String message = NLS.bind(EclipseAdaptorMsg.ECLIPSE_CONVERTER_ERROR_CONVERTING, bundledata.getBundleFile().getBaseFile()); - throw new BundleException(message, pce); + throw new BundleException(message, BundleException.MANIFEST_ERROR, pce); } //Now we know the symbolicId and the version of the bundle, we check to see if don't have a manifest for it already |