diff options
| author | Thomas Watson | 2016-02-02 03:42:51 +0000 |
|---|---|---|
| committer | Thomas Watson | 2017-06-16 12:38:08 +0000 |
| commit | ad0a1c7723fd796be14047262db64e50a0c06e9b (patch) | |
| tree | 334df37e67f7fa616a7dcc2eeacf04e2f21fbce2 /bundles/org.eclipse.osgi/supplement | |
| parent | 4b92523affc9cf6cf76f42e138d7ee41bf316b35 (diff) | |
| download | rt.equinox.framework-ad0a1c7723fd796be14047262db64e50a0c06e9b.tar.gz rt.equinox.framework-ad0a1c7723fd796be14047262db64e50a0c06e9b.tar.xz rt.equinox.framework-ad0a1c7723fd796be14047262db64e50a0c06e9b.zip | |
Bug 486941 - [osgi R7] Framework extensions may require capabilities
from host or other attached fragments
Change-Id: I0b893396db9f0644c6f7e578f26a7971e45e7448
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/supplement')
2 files changed, 2 insertions, 6 deletions
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties index dc3660828..a6e5ed09a 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/ExternalMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2013 IBM Corporation and others. +# Copyright (c) 2003, 2016 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -139,10 +139,8 @@ ModuleResolutionReport_UsesConstraintError=Bundle was not resolved because of a ModuleResolver_RecursiveError=Detected a recursive resolve operation. ModuleResolver_SingletonDisabledError=Could not resolve mandatory modules because another singleton was selected or the module was disabled: -OSGiManifestBuilderFactory_ExtensionImportError=Extension bundles cannot import packages. OSGiManifestBuilderFactory_ExtensionNativeError=Extension bundles cannot have native code. OSGiManifestBuilderFactory_ExtensionReqBundleError=Extension bundles cannot require bundles. -OSGiManifestBuilderFactory_ExtensionReqCapError=Extension bundles cannot require capabilities outside of the osgi.ee namespace: {0}. OSGiManifestBuilderFactory_InvalidManifestError=Invalid Manifest header "{0}": {1} SystemModule_LockError=Could not lock the system bundle state for shutdown. diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java index fffc117e0..814cfe35d 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/messages/Msg.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2013 IBM Corporation and others. + * Copyright (c) 2004, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -147,10 +147,8 @@ public class Msg extends NLS { public static String ModuleResolver_RecursiveError; public static String ModuleResolver_SingletonDisabledError; - public static String OSGiManifestBuilderFactory_ExtensionImportError; public static String OSGiManifestBuilderFactory_ExtensionNativeError; public static String OSGiManifestBuilderFactory_ExtensionReqBundleError; - public static String OSGiManifestBuilderFactory_ExtensionReqCapError; public static String OSGiManifestBuilderFactory_InvalidManifestError; public static String BundleContextImpl_LoadActivatorError; |