diff options
40 files changed, 1699 insertions, 1697 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java index 8703b6a99..3acc47ed9 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.resource; +import org.osgi.framework.resource.*; + import java.util.*; import java.util.Map.Entry; import junit.framework.*; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java index 743da8091..c0715aa5e 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.resource; +import org.osgi.framework.resource.ResourceConstants; + import java.util.*; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java index 3b078829b..5410a59af 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.osgi.tests.services.resolver; +import org.osgi.framework.resource.ResourceConstants; + import java.io.File; import java.io.IOException; import java.net.URL; @@ -20,7 +22,6 @@ import org.eclipse.osgi.framework.util.Headers; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; -import org.osgi.framework.wiring.ResourceConstants; public class OSGiCapabilityTest extends AbstractStateTest { private static final String MANIFEST_ROOT = "test_files/genericCapability/"; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java index 014a90912..485f0eefc 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java @@ -22,6 +22,7 @@ import org.eclipse.osgi.internal.resolver.StateObjectFactoryImpl; import org.eclipse.osgi.service.resolver.*; import org.eclipse.osgi.tests.OSGiTestsActivator; import org.osgi.framework.*; +import org.osgi.framework.resource.ResourceConstants; import org.osgi.framework.wiring.*; public class StateResolverTest extends AbstractStateTest { diff --git a/bundles/org.eclipse.osgi/.settings/.api_filters b/bundles/org.eclipse.osgi/.settings/.api_filters index 57d8c9271..af6340943 100644 --- a/bundles/org.eclipse.osgi/.settings/.api_filters +++ b/bundles/org.eclipse.osgi/.settings/.api_filters @@ -1,1310 +1,1248 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.osgi" version="2"> -<resource path="core/framework/org/eclipse/osgi/framework/internal/protocol/URLStreamHandlerFactoryProxyFor15.java" type="org.eclipse.osgi.framework.internal.protocol.URLStreamHandlerFactoryProxyFor15"> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.osgi.framework.internal.protocol.URLStreamHandlerFactoryProxyFor15.openConnection(URL, Proxy)"/> -<message_argument value="Proxy"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -</resource> -<resource path="core/framework/org/eclipse/osgi/launch/Equinox.java" type="org.eclipse.osgi.launch.Equinox"> -<filter id="1143996420"> -<message_arguments> -<message_argument value="adapt(Class<A>)"/> -</message_arguments> -</filter> -<filter id="1143996420"> -<message_arguments> -<message_argument value="compareTo(Bundle)"/> -</message_arguments> -</filter> -<filter id="1143996420"> -<message_arguments> -<message_argument value="getDataFile(String)"/> -</message_arguments> -</filter> -</resource> -<resource path="eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java" type="org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorHook$ParsingService"> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorHook.ParsingService.createService()"/> -<message_argument value="DocumentBuilderFactory"/> -<message_argument value="newInstance()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorHook.ParsingService.createService()"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="newInstance()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -</resource> -<resource path="eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java" type="org.eclipse.core.runtime.internal.adaptor.PluginParser"> -<filter comment="Code is protected when running on a limited environment" id="579862564"> -<message_arguments> -<message_argument value="PluginParser"/> -<message_argument value="DefaultHandler"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="630194212"> -<message_arguments> -<message_argument value="PluginParser.locator"/> -<message_argument value="Locator"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="630194212"> -<message_arguments> -<message_argument value="PluginParser.xmlTracker"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.acquireXMLParsing(BundleContext)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.error(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.fatalError(SAXParseException)"/> -<message_argument value="SAXException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.fatalError(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleExtensionPointState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleExtensionState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleInitialState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleLibraryExportState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleLibraryState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handlePluginState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleRequiresImportState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleRequiresState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleRuntimeState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseLibraryAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginRequiresImport(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseRequiresAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.processingInstruction(String, String)"/> -<message_argument value="SAXException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.setDocumentLocator(Locator)"/> -<message_argument value="Locator"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.startElement(String, String, String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.warning(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647000098"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.PluginParser(FrameworkAdaptor, BundleContext, Version)"/> -<message_argument value="DefaultHandler()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.acquireXMLParsing(BundleContext)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="newInstance()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleLibraryState(String, Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getValue(String, String)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="getColumnNumber()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="getLineNumber()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="getMessage()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> -<message_argument value="SAXParseException"/> -<message_argument value="getSystemId()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getLength()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getLocalName(int)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getValue(int)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseLibraryAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getValue(String, String)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXParser"/> -<message_argument value="parse(InputStream, DefaultHandler)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="newSAXParser()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="setFeature(String, boolean)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="setNamespaceAware(boolean)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> -<message_argument value="SAXParserFactory"/> -<message_argument value="setValidating(boolean)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getLength()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getLocalName(int)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getValue(int)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginRequiresImport(Attributes)"/> -<message_argument value="Attributes"/> -<message_argument value="getValue(String, String)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -</resource> -<resource path="eclipseAdaptor/src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java" type="org.eclipse.equinox.log.internal.ExtendedLogEntryImpl"> -<filter comment="Code is protected by reflection check." id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.equinox.log.internal.ExtendedLogEntryImpl.getId(Thread)"/> -<message_argument value="Thread"/> -<message_argument value="getId()"/> -<message_argument value="J2SE-1.4"/> -</message_arguments> -</filter> -<filter comment="protected by reflection method check." id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.equinox.log.internal.ExtendedLogEntryImpl.getId(Thread)"/> -<message_argument value="Thread"/> -<message_argument value="getId()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/AdaptPermission.java" type="org.osgi.framework.AdaptPermission"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.AdaptPermission"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/AdminPermission.java" type="org.osgi.framework.AdminPermission"> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="WEAVE"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/Bundle.java" type="org.osgi.framework.Bundle"> -<filter id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.Bundle"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="adapt(Class<A>)"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="getDataFile(String)"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/BundleContext.java" type="org.osgi.framework.BundleContext"> -<filter comment="ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.BundleContext"/> -</message_arguments> -</filter> -<filter comment="ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="getBundle(String)"/> -</message_arguments> -</filter> -<filter comment="ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="getServiceReference(Class<S>)"/> -</message_arguments> -</filter> -<filter comment="ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="getServiceReferences(Class<S>, String)"/> -</message_arguments> -</filter> -<filter comment="ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="registerService(Class<S>, S, Dictionary<String,?>)"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/BundleEvent.java" type="org.osgi.framework.BundleEvent"> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="BundleEvent(int, Bundle, Bundle)"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="getOrigin()"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/BundleException.java" type="org.osgi.framework.BundleException"> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="READ_ERROR"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API." id="1141899266"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="REJECTED_BY_HOOK"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/BundleReference.java" type="org.osgi.framework.BundleReference"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.BundleReference"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/CapabilityPermission.java" type="org.osgi.framework.CapabilityPermission"> -<filter comment="Ignore OSGi APIs." id="1108344834"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="org.osgi.framework.CapabilityPermission"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/Constants.java" type="org.osgi.framework.Constants"> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="EFFECTIVE_ACTIVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="EFFECTIVE_DIRECTIVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="EFFECTIVE_RESOLVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_BSNVERSION"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_BSNVERSION_MULTIPLE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_BSNVERSION_SINGLE"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_COMMAND_ABSPATH"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_JARURLS"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_SYSTEMCAPABILITIES"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_SYSTEMCAPABILITIES_EXTRA"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="FRAMEWORK_UUID"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="PROVIDE_CAPABILITY"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="REMOTE_CONFIGS_SUPPORTED"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="REMOTE_INTENTS_SUPPORTED"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="REQUIRE_CAPABILITY"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_EXPORTED_CONFIGS"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_EXPORTED_INTENTS"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_EXPORTED_INTENTS_EXTRA"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_EXPORTED_INTERFACES"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_IMPORTED"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_IMPORTED_CONFIGS"/> -</message_arguments> -</filter> -<filter id="403767336"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -<message_argument value="SERVICE_INTENTS"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.Constants"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="EFFECTIVE_ACTIVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="EFFECTIVE_DIRECTIVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="EFFECTIVE_RESOLVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FILTER_ATTRIBUTE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGI API." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FILTER_DIRECTIVE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_BSNVERSION"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_BSNVERSION_MULTIPLE"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_BSNVERSION_SINGLE"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_COMMAND_ABSPATH"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_JARURLS"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_SYSTEMCAPABILITIES"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_SYSTEMCAPABILITIES_EXTRA"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FRAMEWORK_UUID"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="PROVIDE_CAPABILITY"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="REMOTE_CONFIGS_SUPPORTED"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="REMOTE_INTENTS_SUPPORTED"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi APIs." id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="REQUIRE_CAPABILITY"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_EXPORTED_CONFIGS"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_EXPORTED_INTENTS"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_EXPORTED_INTENTS_EXTRA"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_EXPORTED_INTERFACES"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_IMPORTED"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_IMPORTED_CONFIGS"/> -</message_arguments> -</filter> -<filter id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="SERVICE_INTENTS"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/Filter.java" type="org.osgi.framework.Filter"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.Filter"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1209008130"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="matches(Map<String,?>)"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/ServiceException.java" type="org.osgi.framework.ServiceException"> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.6"/> -<message_argument value="3.7"/> -<message_argument value="FACTORY_RECURSION"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/ServiceReference.java" type="org.osgi.framework.ServiceReference"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.ServiceReference"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/ServiceRegistration.java" type="org.osgi.framework.ServiceRegistration"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.ServiceRegistration"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/Version.java" type="org.osgi.framework.Version"> -<filter id="1143996420"> -<message_arguments> -<message_argument value="compareTo(Version)"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java" type="org.osgi.framework.hooks.bundle.CollisionHook"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.bundle.CollisionHook"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/bundle/EventHook.java" type="org.osgi.framework.hooks.bundle.EventHook"> -<filter comment="Ingore OSGi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.bundle.EventHook"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/bundle/FindHook.java" type="org.osgi.framework.hooks.bundle.FindHook"> -<filter comment="Ingore OSGi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.bundle.FindHook"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java" type="org.osgi.framework.hooks.resolver.ResolverHook"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.resolver.ResolverHook"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/resolver/ResolverHookFactory.java" type="org.osgi.framework.hooks.resolver.ResolverHookFactory"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.resolver.ResolverHookFactory"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/service/EventListenerHook.java" type="org.osgi.framework.hooks.service.EventListenerHook"> -<filter comment="Ignore OSGi API" id="1108344834"> -<message_arguments> -<message_argument value="1.1"/> -<message_argument value="3.7"/> -<message_argument value="org.osgi.framework.hooks.service.EventListenerHook"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/service/ListenerHook.java" type="org.osgi.framework.hooks.service.ListenerHook$ListenerInfo"> -<filter comment="Ignore OSGi APIs" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.service.ListenerHook.ListenerInfo"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/weaving/WeavingException.java" type="org.osgi.framework.hooks.weaving.WeavingException"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.weaving.WeavingException"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/weaving/WeavingHook.java" type="org.osgi.framework.hooks.weaving.WeavingHook"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.weaving.WeavingHook"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/hooks/weaving/WovenClass.java" type="org.osgi.framework.hooks.weaving.WovenClass"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.hooks.weaving.WovenClass"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/launch/Framework.java" type="org.osgi.framework.launch.Framework"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.launch.Framework"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/launch/FrameworkFactory.java" type="org.osgi.framework.launch.FrameworkFactory"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.framework.launch.FrameworkFactory"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/startlevel/BundleStartLevel.java" type="org.osgi.framework.startlevel.BundleStartLevel"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.startlevel.BundleStartLevel"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java" type="org.osgi.framework.startlevel.FrameworkStartLevel"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.startlevel.FrameworkStartLevel"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/BundleCapability.java" type="org.osgi.framework.wiring.BundleCapability"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.BundleCapability"/> -</message_arguments> -</filter> -<filter comment="Ignore osgi API." id="1211105284"> -<message_arguments> -<message_argument value="getResource()"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/BundleRequirement.java" type="org.osgi.framework.wiring.BundleRequirement"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.BundleRequirement"/> -</message_arguments> -</filter> -<filter comment="Ignore osgi API." id="1211105284"> -<message_arguments> -<message_argument value="getResource()"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/BundleRevision.java" type="org.osgi.framework.wiring.BundleRevision"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.BundleRevision"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/BundleRevisions.java" type="org.osgi.framework.wiring.BundleRevisions"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.BundleRevisions"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/BundleWire.java" type="org.osgi.framework.wiring.BundleWire"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.BundleWire"/> -</message_arguments> -</filter> -<filter comment="Ignore osgi API." id="1211105284"> -<message_arguments> -<message_argument value="getProvider()"/> -</message_arguments> -</filter> -<filter comment="Ignore osgi API." id="1211105284"> -<message_arguments> -<message_argument value="getRequirer()"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/BundleWiring.java" type="org.osgi.framework.wiring.BundleWiring"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.BundleWiring"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/Capability.java" type="org.osgi.framework.wiring.Capability"> -<filter comment="Ignore osgi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.Capability"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/FrameworkWiring.java" type="org.osgi.framework.wiring.FrameworkWiring"> -<filter comment="Ignore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.FrameworkWiring"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/Requirement.java" type="org.osgi.framework.wiring.Requirement"> -<filter comment="Ignore osgi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.Requirement"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/Resource.java" type="org.osgi.framework.wiring.Resource"> -<filter comment="Ignore osgi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.Resource"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/ResourceConstants.java" type="org.osgi.framework.wiring.ResourceConstants"> -<filter comment="Ignore osgi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.ResourceConstants"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/framework/wiring/Wire.java" type="org.osgi.framework.wiring.Wire"> -<filter comment="Ignore osgi API." id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.framework.wiring.Wire"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java" type="org.osgi.service.condpermadmin.ConditionalPermissionAdmin"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionAdmin"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java" type="org.osgi.service.condpermadmin.ConditionalPermissionInfo"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionUpdate.java" type="org.osgi.service.condpermadmin.ConditionalPermissionUpdate"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionUpdate"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/log/LogEntry.java" type="org.osgi.service.log.LogEntry"> -<filter comment="Ingore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.service.log.LogEntry"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/log/LogListener.java" type="org.osgi.service.log.LogListener"> -<filter comment="Ingore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.service.log.LogListener"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/log/LogReaderService.java" type="org.osgi.service.log.LogReaderService"> -<filter comment="Ingore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.service.log.LogReaderService"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/log/LogService.java" type="org.osgi.service.log.LogService"> -<filter comment="Ingore OSGi API" id="1110441988"> -<message_arguments> -<message_argument value="org.osgi.service.log.LogService"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/packageadmin/ExportedPackage.java" type="org.osgi.service.packageadmin.ExportedPackage"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.packageadmin.ExportedPackage"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/packageadmin/PackageAdmin.java" type="org.osgi.service.packageadmin.PackageAdmin"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.packageadmin.PackageAdmin"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/packageadmin/RequiredBundle.java" type="org.osgi.service.packageadmin.RequiredBundle"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.packageadmin.RequiredBundle"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/permissionadmin/PermissionAdmin.java" type="org.osgi.service.permissionadmin.PermissionAdmin"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.permissionadmin.PermissionAdmin"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/startlevel/StartLevel.java" type="org.osgi.service.startlevel.StartLevel"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.startlevel.StartLevel"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/service/url/URLConstants.java" type="org.osgi.service.url.URLConstants"> -<filter comment="Ignore OSGi API" id="403853384"> -<message_arguments> -<message_argument value="org.osgi.service.url.URLConstants"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/util/tracker/BundleTracker.java" type="org.osgi.util.tracker.BundleTracker"> -<filter id="1141899266"> -<message_arguments> -<message_argument value="1.5"/> -<message_argument value="3.7"/> -<message_argument value="getTracked()"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.5"/> -<message_argument value="3.7"/> -<message_argument value="isEmpty()"/> -</message_arguments> -</filter> -</resource> -<resource path="osgi/src/org/osgi/util/tracker/ServiceTracker.java" type="org.osgi.util.tracker.ServiceTracker"> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.5"/> -<message_argument value="3.7"/> -<message_argument value="getServices(T[])"/> -</message_arguments> -</filter> -<filter id="1141899266"> -<message_arguments> -<message_argument value="1.5"/> -<message_argument value="3.7"/> -<message_argument value="getTracked()"/> -</message_arguments> -</filter> -<filter comment="Ignore OSGi API" id="1141899266"> -<message_arguments> -<message_argument value="1.5"/> -<message_argument value="3.7"/> -<message_argument value="isEmpty()"/> -</message_arguments> -</filter> -<filter id="1143996420"> -<message_arguments> -<message_argument value="ServiceTracker(BundleContext, Class<S>, ServiceTrackerCustomizer<S,T>)"/> -</message_arguments> -</filter> -</resource> -<resource path="supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker_JavaNio.java" type="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio"> -<filter comment="Code is protected when running on a limited environment" id="630194212"> -<message_arguments> -<message_argument value="Locker_JavaNio.fileLock"/> -<message_argument value="FileLock"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> -<message_argument value="FileLock"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> -<message_argument value="OverlappingFileLockException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="646971428"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.lock()"/> -<message_argument value="OverlappingFileLockException"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> -<message_argument value="FileChannel"/> -<message_argument value="tryLock(long, long, boolean)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> -<message_argument value="FileLock"/> -<message_argument value="release()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> -<message_argument value="RandomAccessFile"/> -<message_argument value="getChannel()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.lock()"/> -<message_argument value="FileChannel"/> -<message_argument value="tryLock(long, long, boolean)"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.lock()"/> -<message_argument value="RandomAccessFile"/> -<message_argument value="getChannel()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -<filter comment="Code is protected when running on a limited environment" id="647004193"> -<message_arguments> -<message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.release()"/> -<message_argument value="FileLock"/> -<message_argument value="release()"/> -<message_argument value="OSGi/Minimum-1.2"/> -</message_arguments> -</filter> -</resource> + <resource path="core/framework/org/eclipse/osgi/framework/internal/protocol/URLStreamHandlerFactoryProxyFor15.java" type="org.eclipse.osgi.framework.internal.protocol.URLStreamHandlerFactoryProxyFor15"> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.osgi.framework.internal.protocol.URLStreamHandlerFactoryProxyFor15.openConnection(URL, Proxy)"/> + <message_argument value="Proxy"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + </resource> + <resource path="core/framework/org/eclipse/osgi/launch/Equinox.java" type="org.eclipse.osgi.launch.Equinox"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="adapt(Class<A>)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="compareTo(Bundle)"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="getDataFile(String)"/> + </message_arguments> + </filter> + </resource> + <resource path="eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java" type="org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorHook$ParsingService"> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorHook.ParsingService.createService()"/> + <message_argument value="DocumentBuilderFactory"/> + <message_argument value="newInstance()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorHook.ParsingService.createService()"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="newInstance()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + </resource> + <resource path="eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java" type="org.eclipse.core.runtime.internal.adaptor.PluginParser"> + <filter comment="Code is protected when running on a limited environment" id="579862564"> + <message_arguments> + <message_argument value="PluginParser"/> + <message_argument value="DefaultHandler"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="630194212"> + <message_arguments> + <message_argument value="PluginParser.locator"/> + <message_argument value="Locator"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="630194212"> + <message_arguments> + <message_argument value="PluginParser.xmlTracker"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.acquireXMLParsing(BundleContext)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.error(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.fatalError(SAXParseException)"/> + <message_argument value="SAXException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.fatalError(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleExtensionPointState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleExtensionState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleInitialState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleLibraryExportState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleLibraryState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handlePluginState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleRequiresImportState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleRequiresState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleRuntimeState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseLibraryAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginRequiresImport(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseRequiresAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.processingInstruction(String, String)"/> + <message_argument value="SAXException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.setDocumentLocator(Locator)"/> + <message_argument value="Locator"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.startElement(String, String, String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.warning(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647000098"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.PluginParser(FrameworkAdaptor, BundleContext, Version)"/> + <message_argument value="DefaultHandler()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.acquireXMLParsing(BundleContext)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="newInstance()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.handleLibraryState(String, Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getValue(String, String)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="getColumnNumber()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="getLineNumber()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="getMessage()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.logStatus(SAXParseException)"/> + <message_argument value="SAXParseException"/> + <message_argument value="getSystemId()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getLength()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getLocalName(int)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseFragmentAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getValue(int)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parseLibraryAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getValue(String, String)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXParser"/> + <message_argument value="parse(InputStream, DefaultHandler)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="newSAXParser()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="setFeature(String, boolean)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="setNamespaceAware(boolean)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePlugin(InputStream)"/> + <message_argument value="SAXParserFactory"/> + <message_argument value="setValidating(boolean)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getLength()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getLocalName(int)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginAttributes(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getValue(int)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.PluginParser.parsePluginRequiresImport(Attributes)"/> + <message_argument value="Attributes"/> + <message_argument value="getValue(String, String)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + </resource> + <resource path="eclipseAdaptor/src/org/eclipse/equinox/log/internal/ExtendedLogEntryImpl.java" type="org.eclipse.equinox.log.internal.ExtendedLogEntryImpl"> + <filter comment="Code is protected by reflection check." id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.equinox.log.internal.ExtendedLogEntryImpl.getId(Thread)"/> + <message_argument value="Thread"/> + <message_argument value="getId()"/> + <message_argument value="J2SE-1.4"/> + </message_arguments> + </filter> + <filter comment="protected by reflection method check." id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.equinox.log.internal.ExtendedLogEntryImpl.getId(Thread)"/> + <message_argument value="Thread"/> + <message_argument value="getId()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/AdaptPermission.java" type="org.osgi.framework.AdaptPermission"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.AdaptPermission"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/AdminPermission.java" type="org.osgi.framework.AdminPermission"> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="WEAVE"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/Bundle.java" type="org.osgi.framework.Bundle"> + <filter id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.Bundle"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="adapt(Class<A>)"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="getDataFile(String)"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/BundleContext.java" type="org.osgi.framework.BundleContext"> + <filter comment="ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.BundleContext"/> + </message_arguments> + </filter> + <filter comment="ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="getBundle(String)"/> + </message_arguments> + </filter> + <filter comment="ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="getServiceReference(Class<S>)"/> + </message_arguments> + </filter> + <filter comment="ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="getServiceReferences(Class<S>, String)"/> + </message_arguments> + </filter> + <filter comment="ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="registerService(Class<S>, S, Dictionary<String,?>)"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/BundleEvent.java" type="org.osgi.framework.BundleEvent"> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="BundleEvent(int, Bundle, Bundle)"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="getOrigin()"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/BundleException.java" type="org.osgi.framework.BundleException"> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="READ_ERROR"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API." id="1141899266"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="REJECTED_BY_HOOK"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/BundleReference.java" type="org.osgi.framework.BundleReference"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.BundleReference"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/CapabilityPermission.java" type="org.osgi.framework.CapabilityPermission"> + <filter comment="Ignore OSGi APIs." id="1108344834"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="org.osgi.framework.CapabilityPermission"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/Constants.java" type="org.osgi.framework.Constants"> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="EFFECTIVE_ACTIVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="EFFECTIVE_DIRECTIVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="EFFECTIVE_RESOLVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_BSNVERSION"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_BSNVERSION_MULTIPLE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_BSNVERSION_SINGLE"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_COMMAND_ABSPATH"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_JARURLS"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_SYSTEMCAPABILITIES"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_SYSTEMCAPABILITIES_EXTRA"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="FRAMEWORK_UUID"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="PROVIDE_CAPABILITY"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="REMOTE_CONFIGS_SUPPORTED"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="REMOTE_INTENTS_SUPPORTED"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="REQUIRE_CAPABILITY"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_EXPORTED_CONFIGS"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_EXPORTED_INTENTS"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_EXPORTED_INTENTS_EXTRA"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_EXPORTED_INTERFACES"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_IMPORTED"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_IMPORTED_CONFIGS"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + <message_argument value="SERVICE_INTENTS"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.Constants"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="EFFECTIVE_ACTIVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="EFFECTIVE_DIRECTIVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="EFFECTIVE_RESOLVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FILTER_ATTRIBUTE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGI API." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FILTER_DIRECTIVE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_BSNVERSION"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_BSNVERSION_MULTIPLE"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_BSNVERSION_SINGLE"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_COMMAND_ABSPATH"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_JARURLS"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_SYSTEMCAPABILITIES"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_SYSTEMCAPABILITIES_EXTRA"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FRAMEWORK_UUID"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="PROVIDE_CAPABILITY"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="REMOTE_CONFIGS_SUPPORTED"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="REMOTE_INTENTS_SUPPORTED"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs." id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="REQUIRE_CAPABILITY"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_EXPORTED_CONFIGS"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_EXPORTED_INTENTS"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_EXPORTED_INTENTS_EXTRA"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_EXPORTED_INTERFACES"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_IMPORTED"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_IMPORTED_CONFIGS"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="SERVICE_INTENTS"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi APIs" id="1209008130"> + <message_arguments> + <message_argument value="1.7"/> + <message_argument value="3.8"/> + <message_argument value="RESOLUTION_DYNAMIC"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/Filter.java" type="org.osgi.framework.Filter"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.Filter"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1209008130"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="matches(Map<String,?>)"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/ServiceException.java" type="org.osgi.framework.ServiceException"> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.6"/> + <message_argument value="3.7"/> + <message_argument value="FACTORY_RECURSION"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/ServiceReference.java" type="org.osgi.framework.ServiceReference"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.ServiceReference"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/ServiceRegistration.java" type="org.osgi.framework.ServiceRegistration"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.ServiceRegistration"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/Version.java" type="org.osgi.framework.Version"> + <filter id="1143996420"> + <message_arguments> + <message_argument value="compareTo(Version)"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java" type="org.osgi.framework.hooks.bundle.CollisionHook"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.bundle.CollisionHook"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/bundle/EventHook.java" type="org.osgi.framework.hooks.bundle.EventHook"> + <filter comment="Ingore OSGi API." id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.bundle.EventHook"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/bundle/FindHook.java" type="org.osgi.framework.hooks.bundle.FindHook"> + <filter comment="Ingore OSGi API." id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.bundle.FindHook"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java" type="org.osgi.framework.hooks.resolver.ResolverHook"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.resolver.ResolverHook"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/resolver/ResolverHookFactory.java" type="org.osgi.framework.hooks.resolver.ResolverHookFactory"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.resolver.ResolverHookFactory"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/service/EventListenerHook.java" type="org.osgi.framework.hooks.service.EventListenerHook"> + <filter comment="Ignore OSGi API" id="1108344834"> + <message_arguments> + <message_argument value="1.1"/> + <message_argument value="3.7"/> + <message_argument value="org.osgi.framework.hooks.service.EventListenerHook"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/service/ListenerHook.java" type="org.osgi.framework.hooks.service.ListenerHook$ListenerInfo"> + <filter comment="Ignore OSGi APIs" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.service.ListenerHook.ListenerInfo"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/weaving/WeavingException.java" type="org.osgi.framework.hooks.weaving.WeavingException"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.weaving.WeavingException"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/weaving/WeavingHook.java" type="org.osgi.framework.hooks.weaving.WeavingHook"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.weaving.WeavingHook"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/hooks/weaving/WovenClass.java" type="org.osgi.framework.hooks.weaving.WovenClass"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.hooks.weaving.WovenClass"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/launch/Framework.java" type="org.osgi.framework.launch.Framework"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.launch.Framework"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/launch/FrameworkFactory.java" type="org.osgi.framework.launch.FrameworkFactory"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.framework.launch.FrameworkFactory"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/resource/Capability.java" type="org.osgi.framework.resource.Capability"> + <filter id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.resource.Capability"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/resource/Requirement.java" type="org.osgi.framework.resource.Requirement"> + <filter id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.resource.Requirement"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/resource/Resource.java" type="org.osgi.framework.resource.Resource"> + <filter id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.resource.Resource"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/resource/ResourceConstants.java" type="org.osgi.framework.resource.ResourceConstants"> + <filter id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.resource.ResourceConstants"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/resource/Wire.java" type="org.osgi.framework.resource.Wire"> + <filter id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.resource.Wire"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/startlevel/BundleStartLevel.java" type="org.osgi.framework.startlevel.BundleStartLevel"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.startlevel.BundleStartLevel"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java" type="org.osgi.framework.startlevel.FrameworkStartLevel"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.framework.startlevel.FrameworkStartLevel"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java" type="org.osgi.service.condpermadmin.ConditionalPermissionAdmin"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionAdmin"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java" type="org.osgi.service.condpermadmin.ConditionalPermissionInfo"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionInfo"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionUpdate.java" type="org.osgi.service.condpermadmin.ConditionalPermissionUpdate"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.condpermadmin.ConditionalPermissionUpdate"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/log/LogEntry.java" type="org.osgi.service.log.LogEntry"> + <filter comment="Ingore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.log.LogEntry"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/log/LogListener.java" type="org.osgi.service.log.LogListener"> + <filter comment="Ingore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.log.LogListener"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/log/LogReaderService.java" type="org.osgi.service.log.LogReaderService"> + <filter comment="Ingore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.log.LogReaderService"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/log/LogService.java" type="org.osgi.service.log.LogService"> + <filter comment="Ingore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.log.LogService"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/packageadmin/ExportedPackage.java" type="org.osgi.service.packageadmin.ExportedPackage"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.packageadmin.ExportedPackage"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/packageadmin/PackageAdmin.java" type="org.osgi.service.packageadmin.PackageAdmin"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.packageadmin.PackageAdmin"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/packageadmin/RequiredBundle.java" type="org.osgi.service.packageadmin.RequiredBundle"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.packageadmin.RequiredBundle"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/permissionadmin/PermissionAdmin.java" type="org.osgi.service.permissionadmin.PermissionAdmin"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.permissionadmin.PermissionAdmin"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/startlevel/StartLevel.java" type="org.osgi.service.startlevel.StartLevel"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.startlevel.StartLevel"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/url/URLConstants.java" type="org.osgi.service.url.URLConstants"> + <filter comment="Ignore OSGi API" id="403853384"> + <message_arguments> + <message_argument value="org.osgi.service.url.URLConstants"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/util/tracker/BundleTracker.java" type="org.osgi.util.tracker.BundleTracker"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="1.5"/> + <message_argument value="3.7"/> + <message_argument value="getTracked()"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.5"/> + <message_argument value="3.7"/> + <message_argument value="isEmpty()"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/util/tracker/ServiceTracker.java" type="org.osgi.util.tracker.ServiceTracker"> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.5"/> + <message_argument value="3.7"/> + <message_argument value="getServices(T[])"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="1.5"/> + <message_argument value="3.7"/> + <message_argument value="getTracked()"/> + </message_arguments> + </filter> + <filter comment="Ignore OSGi API" id="1141899266"> + <message_arguments> + <message_argument value="1.5"/> + <message_argument value="3.7"/> + <message_argument value="isEmpty()"/> + </message_arguments> + </filter> + <filter id="1143996420"> + <message_arguments> + <message_argument value="ServiceTracker(BundleContext, Class<S>, ServiceTrackerCustomizer<S,T>)"/> + </message_arguments> + </filter> + </resource> + <resource path="supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker_JavaNio.java" type="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio"> + <filter comment="Code is protected when running on a limited environment" id="630194212"> + <message_arguments> + <message_argument value="Locker_JavaNio.fileLock"/> + <message_argument value="FileLock"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> + <message_argument value="FileLock"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> + <message_argument value="OverlappingFileLockException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="646971428"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.lock()"/> + <message_argument value="OverlappingFileLockException"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> + <message_argument value="FileChannel"/> + <message_argument value="tryLock(long, long, boolean)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> + <message_argument value="FileLock"/> + <message_argument value="release()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.isLocked()"/> + <message_argument value="RandomAccessFile"/> + <message_argument value="getChannel()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.lock()"/> + <message_argument value="FileChannel"/> + <message_argument value="tryLock(long, long, boolean)"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.lock()"/> + <message_argument value="RandomAccessFile"/> + <message_argument value="getChannel()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + <filter comment="Code is protected when running on a limited environment" id="647004193"> + <message_arguments> + <message_argument value="org.eclipse.core.runtime.internal.adaptor.Locker_JavaNio.release()"/> + <message_argument value="FileLock"/> + <message_argument value="release()"/> + <message_argument value="OSGi/Minimum-1.2"/> + </message_arguments> + </filter> + </resource> </component> diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF index 0e673c078..5cc0727b8 100644 --- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF @@ -18,14 +18,15 @@ Export-Package: org.eclipse.osgi.event;version="1.0", org.eclipse.osgi.storagemanager;version="1.0", org.eclipse.osgi.util;version="1.1", org.eclipse.equinox.log; version="1.0", - org.osgi.framework;version="1.6", + org.osgi.framework;version="1.7", org.osgi.framework.launch; version="1.0", - org.osgi.framework.hooks.bundle; version="1.0", + org.osgi.framework.hooks.bundle; version="1.1", org.osgi.framework.hooks.resolver; version="1.0", org.osgi.framework.hooks.service; version="1.1", org.osgi.framework.hooks.weaving; version="1.0", org.osgi.framework.startlevel; version="1.0", org.osgi.framework.wiring; version="1.1", + org.osgi.framework.resource; version="1.0", org.osgi.service.condpermadmin;version="1.1.1", org.osgi.service.framework; version="1.0"; x-internal:=true, org.osgi.service.log; version="1.3", diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java index 8f4002c9d..f39f68ae4 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Bundle.java @@ -76,7 +76,7 @@ import org.osgi.framework.wiring.FrameworkWiring; * * @ThreadSafe * @noimplement - * @version $Id: 239108e8d54ff493587b9cdfe1688bdefc5a714c $ + * @version $Id: 9d9159b15aa541f80f0ca3260c13f4ee0fb7878f $ */ public interface Bundle extends Comparable<Bundle> { /** @@ -139,9 +139,9 @@ public interface Bundle extends Comparable<Bundle> { * <p> * A bundle is in the {@code STARTING} state when its {@link #start(int) * start} method is active. A bundle must be in this state when the bundle's - * {@link BundleActivator#start} is called. If the {@code - * BundleActivator.start} method completes without exception, then the - * bundle has successfully started and must move to the {@code ACTIVE} + * {@link BundleActivator#start(BundleContext)} is called. If the + * {@code BundleActivator.start} method completes without exception, then + * the bundle has successfully started and must move to the {@code ACTIVE} * state. * <p> * If the bundle has a {@link Constants#ACTIVATION_LAZY lazy activation @@ -158,9 +158,9 @@ public interface Bundle extends Comparable<Bundle> { * <p> * A bundle is in the {@code STOPPING} state when its {@link #stop(int) * stop} method is active. A bundle must be in this state when the bundle's - * {@link BundleActivator#stop} method is called. When the {@code - * BundleActivator.stop} method completes the bundle is stopped and must - * move to the {@code RESOLVED} state. + * {@link BundleActivator#stop(BundleContext)} method is called. When the + * {@code BundleActivator.stop} method completes the bundle is stopped and + * must move to the {@code RESOLVED} state. * <p> * The value of {@code STOPPING} is 0x00000010. */ @@ -312,8 +312,8 @@ public interface Bundle extends Comparable<Bundle> { * * <li>A bundle event of type {@link BundleEvent#STARTING} is fired. * - * <li>The {@link BundleActivator#start} method of this bundle's - * {@code BundleActivator}, if one is specified, is called. If the + * <li>The {@link BundleActivator#start(BundleContext)} method of this + * bundle's {@code BundleActivator}, if one is specified, is called. If the * {@code BundleActivator} is invalid or throws an exception then: * <ul> * <li>This bundle's state is set to {@code STOPPING}. @@ -425,11 +425,11 @@ public interface Bundle extends Comparable<Bundle> { * <li>A bundle event of type {@link BundleEvent#STOPPING} is fired. * * <li>If this bundle's state was {@code ACTIVE} prior to setting the state - * to {@code STOPPING}, the {@link BundleActivator#stop} method of this - * bundle's {@code BundleActivator}, if one is specified, is called. If that - * method throws an exception, this method must continue to stop this bundle - * and a {@code BundleException} must be thrown after completion of the - * remaining steps. + * to {@code STOPPING}, the {@link BundleActivator#stop(BundleContext)} + * method of this bundle's {@code BundleActivator}, if one is specified, is + * called. If that method throws an exception, this method must continue to + * stop this bundle and a {@code BundleException} must be thrown after + * completion of the remaining steps. * * <li>Any services registered by this bundle must be unregistered. * <li>Any services used by this bundle must be released. @@ -857,12 +857,12 @@ public interface Bundle extends Comparable<Bundle> { * for a description of the format of a resource name. * @return A URL to the named resource, or {@code null} if the resource * could not be found or if this bundle is a fragment bundle or if - * the caller does not have the appropriate {@code - * AdminPermission[this,RESOURCE]}, and the Java Runtime Environment - * supports permissions. + * the caller does not have the appropriate + * {@code AdminPermission[this,RESOURCE]}, and the Java Runtime + * Environment supports permissions. * @throws IllegalStateException If this bundle has been uninstalled. - * @see #getEntry - * @see #findEntries + * @see #getEntry(String) + * @see #findEntries(String, String, boolean) * @since 1.1 */ URL getResource(String name); @@ -1059,7 +1059,7 @@ public interface Bundle extends Comparable<Bundle> { * * <p> * The time value is the number of milliseconds since January 1, 1970, - * 00:00:00 GMT. + * 00:00:00 UTC. * * @return The time when this bundle was last modified. * @since 1.3 diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java index c587d03c1..f4838a031 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,11 +47,11 @@ import java.util.Dictionary; * * <p> * The {@code BundleContext} object will be passed to the - * {@link BundleActivator#start} method during activation of the context bundle. - * The same {@code BundleContext} object will be passed to the - * {@link BundleActivator#stop} method when the context bundle is stopped. A - * {@code BundleContext} object is generally for the private use of its - * associated bundle and is not meant to be shared with other bundles in the + * {@link BundleActivator#start(BundleContext)} method during activation of the + * context bundle. The same {@code BundleContext} object will be passed to the + * {@link BundleActivator#stop(BundleContext)} method when the context bundle is + * stopped. A {@code BundleContext} object is generally for the private use of + * its associated bundle and is not meant to be shared with other bundles in the * OSGi environment. * * <p> @@ -76,7 +76,7 @@ import java.util.Dictionary; * * @ThreadSafe * @noimplement - * @version $Id: 6d4b5967b9fe706b1dfbdd42b3d759028ed9826d $ + * @version $Id: b51aaae4a35957753b41b47aa5a21603bbd262dd $ */ public interface BundleContext extends BundleReference { @@ -374,8 +374,11 @@ public interface BundleContext extends BundleReference { * {@code ServiceRegistration} object is for the private use of the bundle * registering the service and should not be shared with other bundles. The * registering bundle is defined to be the context bundle. Other bundles can - * locate the service by using either the {@link #getServiceReferences} or - * {@link #getServiceReference} method. + * locate the service by using one of the + * {@link #getServiceReferences(Class, String)}, + * {@link #getServiceReferences(String, String)}, + * {@link #getServiceReference(Class)} or + * {@link #getServiceReference(String)} methods. * * <p> * A bundle can register a service object that implements the @@ -413,9 +416,9 @@ public interface BundleContext extends BundleReference { * {@link Constants} for a list of standard service property keys. * Changes should not be made to this object after calling this * method. To update the service's properties the - * {@link ServiceRegistration#setProperties} method must be called. - * The set of properties may be {@code null} if the service has no - * properties. + * {@link ServiceRegistration#setProperties(Dictionary)} method must + * be called. The set of properties may be {@code null} if the + * service has no properties. * @return A {@code ServiceRegistration} object for use by the bundle * registering the service to update the service's properties or to * unregister the service. @@ -463,25 +466,22 @@ public interface BundleContext extends BundleReference { /** * Registers the specified service object with the specified properties - * under the specified class name with the Framework. + * under the name of the specified class with the Framework. * * <p> * This method is otherwise identical to - * {@link #registerService(String[], Object, Dictionary)} and is provided as - * a convenience when {@code service} will only be registered under a single - * class name. Note that even in this case the value of the service's - * {@link Constants#OBJECTCLASS} property will be an array of string, rather - * than just a single string. + * {@link #registerService(String, Object, Dictionary)} and is provided to + * return a type safe {@code ServiceRegistration}. * * @param <S> Type of Service. - * @param clazz The class name under which the service can be located. + * @param clazz The class under whose name the service can be located. * @param service The service object or a {@code ServiceFactory} object. * @param properties The properties for this service. * @return A {@code ServiceRegistration} object for use by the bundle * registering the service to update the service's properties or to * unregister the service. * @throws IllegalStateException If this BundleContext is no longer valid. - * @see #registerService(String[], Object, Dictionary) + * @see #registerService(String, Object, Dictionary) * @since 1.6 */ <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, @@ -627,7 +627,7 @@ public interface BundleContext extends BundleReference { /** * Returns a {@code ServiceReference} object for a service that implements - * and was registered under the specified class. + * and was registered under the name of the specified class. * * <p> * The returned {@code ServiceReference} object is valid at the time of the @@ -648,9 +648,10 @@ public interface BundleContext extends BundleReference { * service that was registered first is returned. * * @param <S> Type of Service. - * @param clazz The class name with which the service was registered. + * @param clazz The class under whose name the service was registered. Must + * not be {@code null}. * @return A {@code ServiceReference} object, or {@code null} if no services - * are registered which implement the named class. + * are registered which implement the specified class. * @throws IllegalStateException If this BundleContext is no longer valid. * @see #getServiceReferences(Class, String) * @since 1.6 @@ -660,10 +661,10 @@ public interface BundleContext extends BundleReference { /** * Returns a collection of {@code ServiceReference} objects. The returned * collection of {@code ServiceReference} objects contains services that - * were registered under the specified class, match the specified filter - * expression, and the packages for the class names under which the services - * were registered match the context bundle's packages as defined in - * {@link ServiceReference#isAssignableTo(Bundle, String)}. + * were registered under the name of the specified class, match the + * specified filter expression, and the packages for the class names under + * which the services were registered match the context bundle's packages as + * defined in {@link ServiceReference#isAssignableTo(Bundle, String)}. * * <p> * The collection is valid at the time of the call to this method. However @@ -684,11 +685,10 @@ public interface BundleContext extends BundleReference { * The result is a collection of {@code ServiceReference} objects for all * services that meet all of the following conditions: * <ul> - * <li>If the specified class name, {@code clazz}, is not {@code null}, the - * service must have been registered with the specified class name. The - * complete list of class names with which a service was registered is - * available from the service's {@link Constants#OBJECTCLASS objectClass} - * property. + * <li>The service must have been registered with the name of the specified + * class. The complete list of class names with which a service was + * registered is available from the service's {@link Constants#OBJECTCLASS + * objectClass} property. * <li>If the specified {@code filter} is not {@code null}, the filter * expression must match the service. * <li>If the Java Runtime Environment supports permissions, the caller must @@ -701,7 +701,7 @@ public interface BundleContext extends BundleReference { * </ul> * * @param <S> Type of Service - * @param clazz The class name with which the service was registered. Must + * @param clazz The class under whose name the service was registered. Must * not be {@code null}. * @param filter The filter expression or {@code null} for all services. * @return A collection of {@code ServiceReference} objects. May be empty if @@ -810,7 +810,7 @@ public interface BundleContext extends BundleReference { * @throws IllegalArgumentException If the specified * {@code ServiceReference} was not created by the same framework * instance as this {@code BundleContext}. - * @see #getService + * @see #getService(ServiceReference) * @see ServiceFactory */ boolean ungetService(ServiceReference< ? > reference); diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java index 13c68bed2..7f83158ae 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import java.util.EventObject; * @Immutable * @see BundleListener * @see SynchronousBundleListener - * @version $Id: ed3c40cd707bed45681cadce114a6cc5db27a844 $ + * @version $Id: 30ed6fc3603261b53bf1c65128f1f905ccdbed27 $ */ public class BundleEvent extends EventObject { @@ -86,7 +86,7 @@ public class BundleEvent extends EventObject { /** * The bundle has been uninstalled. * - * @see Bundle#uninstall + * @see Bundle#uninstall() */ public final static int UNINSTALLED = 0x00000010; diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleListener.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleListener.java index d9bb54cf8..8d86d30b8 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleListener.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/BundleListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,22 +19,22 @@ package org.osgi.framework; import java.util.EventListener; /** - * A {@code BundleEvent} listener. {@code BundleListener} is a - * listener interface that may be implemented by a bundle developer. When a + * A {@code BundleEvent} listener. {@code BundleListener} is a listener + * interface that may be implemented by a bundle developer. When a * {@code BundleEvent} is fired, it is asynchronously delivered to a - * {@code BundleListener}. The Framework delivers - * {@code BundleEvent} objects to a {@code BundleListener} in - * order and must not concurrently call a {@code BundleListener}. + * {@code BundleListener}. The Framework delivers {@code BundleEvent} objects to + * a {@code BundleListener} in order and must not concurrently call a + * {@code BundleListener}. * <p> - * A {@code BundleListener} object is registered with the Framework using - * the {@link BundleContext#addBundleListener} method. - * {@code BundleListener}s are called with a {@code BundleEvent} - * object when a bundle has been installed, resolved, started, stopped, updated, - * unresolved, or uninstalled. + * A {@code BundleListener} object is registered with the Framework using the + * {@link BundleContext#addBundleListener(BundleListener)} method. + * {@code BundleListener}s are called with a {@code BundleEvent} object when a + * bundle has been installed, resolved, started, stopped, updated, unresolved, + * or uninstalled. * * @see BundleEvent * @NotThreadSafe - * @version $Id: 77cdaebd3ac97c6798fc3043957abd1bd6d01ccb $ + * @version $Id: d48b4a8a59c839466a3d749dde23980d236f58c6 $ */ public interface BundleListener extends EventListener { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java index b71a12dfd..7b6ab54cf 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Constants.java @@ -28,7 +28,7 @@ import org.osgi.framework.launch.Framework; * * @since 1.1 * @noimplement - * @version $Id: 517c954ed7d34d2ee762933466f69fa03db7cd37 $ + * @version $Id: e243fc72560f18d79aee03782b3de92db8c21087 $ */ public interface Constants { @@ -621,6 +621,20 @@ public interface Constants { String RESOLUTION_OPTIONAL = "optional"; /** + * Bundle wiring directive value identifying an dynamic resolution type. A + * dynamic resolution type is used by requirements for + * {@link #DYNAMICIMPORT_PACKAGE dynamically imported packages} in the + * bundle wiring API. + * + * <p> + * This value cannot be used for the {@value #RESOLUTION_DIRECTIVE} + * directive on a manifest header. + * + * @since 1.7 + */ + String RESOLUTION_DYNAMIC = "dynamic"; + + /** * Manifest header directive identifying a list of packages that an exported * package or provided capability uses. * @@ -1277,8 +1291,8 @@ public interface Constants { * * <p> * By convention, every bundle has its own unique name space, starting with - * the bundle's identifier (see {@link Bundle#getBundleId}) and followed by - * a dot (.). A bundle may use this as the prefix of the persistent + * the bundle's identifier (see {@link Bundle#getBundleId()}) and followed + * by a dot (.). A bundle may use this as the prefix of the persistent * identifiers for the services it registers. */ String SERVICE_PID = "service.pid"; @@ -1293,9 +1307,10 @@ public interface Constants { * * <p> * The service ranking is used by the Framework to determine the <i>natural - * order</i> of services, see {@link ServiceReference#compareTo}, and the - * <i>default</i> service to be returned from a call to the - * {@link BundleContext#getServiceReference} method. + * order</i> of services, see {@link ServiceReference#compareTo(Object)}, + * and the <i>default</i> service to be returned from a call to the + * {@link BundleContext#getServiceReference(Class)} or + * {@link BundleContext#getServiceReference(String)} method. * * <p> * The default ranking is zero (0). A service with a ranking of diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Filter.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Filter.java index a9bb6c3a9..f381e28cc 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Filter.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/Filter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,9 @@ import java.util.Map; /** * An <a href="http://www.ietf.org/rfc/rfc1960.txt">RFC 1960</a>-based Filter. * <p> - * {@code Filter}s can be created by calling {@link BundleContext#createFilter} - * or {@link FrameworkUtil#createFilter} with a filter string. + * {@code Filter}s can be created by calling + * {@link BundleContext#createFilter(String)} or + * {@link FrameworkUtil#createFilter(String)} with a filter string. * <p> * A {@code Filter} can be used numerous times to determine if the match * argument matches the filter string that was used to create the {@code Filter}. @@ -40,7 +41,7 @@ import java.util.Map; * @see "Core Specification, Filters, for a description of the filter string syntax." * @ThreadSafe * @noimplement - * @version $Id: 4d21267f4b85d1912d73f7e2c049cc968c4237f9 $ + * @version $Id: 743270de7c45cf30e7904e13b1bb38ce08042467 $ */ public interface Filter { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkListener.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkListener.java index 5d73fb904..7e1e81355 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkListener.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,23 +19,22 @@ package org.osgi.framework; import java.util.EventListener; /** - * A {@code FrameworkEvent} listener. {@code FrameworkListener} is - * a listener interface that may be implemented by a bundle developer. When a + * A {@code FrameworkEvent} listener. {@code FrameworkListener} is a listener + * interface that may be implemented by a bundle developer. When a * {@code FrameworkEvent} is fired, it is asynchronously delivered to a - * {@code FrameworkListener}. The Framework delivers - * {@code FrameworkEvent} objects to a {@code FrameworkListener} - * in order and must not concurrently call a {@code FrameworkListener}. + * {@code FrameworkListener}. The Framework delivers {@code FrameworkEvent} + * objects to a {@code FrameworkListener} in order and must not concurrently + * call a {@code FrameworkListener}. * * <p> - * A {@code FrameworkListener} object is registered with the Framework - * using the {@link BundleContext#addFrameworkListener} method. - * {@code FrameworkListener} objects are called with a - * {@code FrameworkEvent} objects when the Framework starts and when - * asynchronous errors occur. + * A {@code FrameworkListener} object is registered with the Framework using the + * {@link BundleContext#addFrameworkListener(FrameworkListener)} method. + * {@code FrameworkListener} objects are called with a {@code FrameworkEvent} + * objects when the Framework starts and when asynchronous errors occur. * * @see FrameworkEvent * @NotThreadSafe - * @version $Id: a32e7599ea09d3510759d77e824cb8d9eff67f9d $ + * @version $Id: ad7f563bd13b60e2b8a378f147057ca7f0accae2 $ */ public interface FrameworkListener extends EventListener { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/InvalidSyntaxException.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/InvalidSyntaxException.java index 46d6d20d7..a79bf9964 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/InvalidSyntaxException.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/InvalidSyntaxException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ package org.osgi.framework; * <p> * This exception conforms to the general purpose exception chaining mechanism. * - * @version $Id: adb84e3bc0b82b842e4da84542057fdf53e2ca6a $ + * @version $Id: 1da70059917a798aec102d64bf5f8956ce61b7c2 $ */ public class InvalidSyntaxException extends Exception { @@ -50,7 +50,7 @@ public class InvalidSyntaxException extends Exception { * @param filter The invalid filter string. */ public InvalidSyntaxException(String msg, String filter) { - super(msg); + super(message(msg, filter)); this.filter = filter; } @@ -68,16 +68,27 @@ public class InvalidSyntaxException extends Exception { * @since 1.3 */ public InvalidSyntaxException(String msg, String filter, Throwable cause) { - super(msg, cause); + super(message(msg, filter), cause); this.filter = filter; } /** + * Return message string for super constructor. + */ + private static String message(String msg, String filter) { + if ((msg == null) || (filter == null) || msg.indexOf(filter) >= 0) { + return msg; + } + return msg + ": " + filter; + } + + /** * Returns the filter string that generated the * {@code InvalidSyntaxException} object. * * @return The invalid filter string. - * @see BundleContext#getServiceReferences + * @see BundleContext#getServiceReferences(Class, String) + * @see BundleContext#getServiceReferences(String, String) * @see BundleContext#addServiceListener(ServiceListener,String) */ public String getFilter() { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceEvent.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceEvent.java index 82ec899e7..8da471873 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceEvent.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import java.util.EventObject; * @Immutable * @see ServiceListener * @see AllServiceListener - * @version $Id: 2b9458d90004411b6ca0cb4b361bc282b04c85eb $ + * @version $Id: 670625e507deac1b5e6930fa448711c383e10d1a $ */ public class ServiceEvent extends EventObject { @@ -64,7 +64,7 @@ public class ServiceEvent extends EventObject { * This event is synchronously delivered <strong>after</strong> the service * properties have been modified. * - * @see ServiceRegistration#setProperties + * @see ServiceRegistration#setProperties(Dictionary) */ public final static int MODIFIED = 0x00000002; @@ -75,14 +75,14 @@ public class ServiceEvent extends EventObject { * has completed unregistering. * * <p> - * If a bundle is using a service that is {@code UNREGISTERING}, the - * bundle should release its use of the service when it receives this event. - * If the bundle does not release its use of the service when it receives - * this event, the Framework will automatically release the bundle's use of - * the service while completing the service unregistration operation. + * If a bundle is using a service that is {@code UNREGISTERING}, the bundle + * should release its use of the service when it receives this event. If the + * bundle does not release its use of the service when it receives this + * event, the Framework will automatically release the bundle's use of the + * service while completing the service unregistration operation. * - * @see ServiceRegistration#unregister - * @see BundleContext#ungetService + * @see ServiceRegistration#unregister() + * @see BundleContext#ungetService(ServiceReference) */ public final static int UNREGISTERING = 0x00000004; @@ -92,11 +92,11 @@ public class ServiceEvent extends EventObject { * <p> * This event is synchronously delivered <strong>after</strong> the service * properties have been modified. This event is only delivered to listeners - * which were added with a non-{@code null} filter where the filter - * matched the service properties prior to the modification but the filter - * does not match the modified service properties. + * which were added with a non-{@code null} filter where the filter matched + * the service properties prior to the modification but the filter does not + * match the modified service properties. * - * @see ServiceRegistration#setProperties + * @see ServiceRegistration#setProperties(Dictionary) * @since 1.5 */ public final static int MODIFIED_ENDMATCH = 0x00000008; diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceFactory.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceFactory.java index 6383b22bb..00d537607 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceFactory.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,9 +43,9 @@ package org.osgi.framework; * concurrently call a {@code ServiceFactory}. * * @param <S> Type of Service - * @see BundleContext#getService + * @see BundleContext#getService(ServiceReference) * @ThreadSafe - * @version $Id: 94cd1a0127aaad9beb484f557342a8fbd0be2322 $ + * @version $Id: c241514f24ba70c6ca6dc10bd1700854d748e1c7 $ */ public interface ServiceFactory<S> { @@ -85,7 +85,7 @@ public interface ServiceFactory<S> { * requested service. * @return A service object that <strong>must</strong> be an instance of all * the classes named when the service was registered. - * @see BundleContext#getService + * @see BundleContext#getService(ServiceReference) */ public S getService(Bundle bundle, ServiceRegistration<S> registration); @@ -108,7 +108,7 @@ public interface ServiceFactory<S> { * @param service The service object returned by a previous call to the * {@link #getService(Bundle, ServiceRegistration) getService} * method. - * @see BundleContext#ungetService + * @see BundleContext#ungetService(ServiceReference) */ public void ungetService(Bundle bundle, ServiceRegistration<S> registration, S service); diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceReference.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceReference.java index ad38df750..315c0ce12 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceReference.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceReference.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,29 +26,29 @@ import java.util.Dictionary; * {@code BundleContext.getServiceReference} and * {@code BundleContext.getServiceReferences} methods. * <p> - * A {@code ServiceReference} object may be shared between bundles and can - * be used to examine the properties of the service and to get the service - * object. + * A {@code ServiceReference} object may be shared between bundles and can be + * used to examine the properties of the service and to get the service object. * <p> * Every service registered in the Framework has a unique * {@code ServiceRegistration} object and may have multiple, distinct - * {@code ServiceReference} objects referring to it. - * {@code ServiceReference} objects associated with a - * {@code ServiceRegistration} object have the same {@code hashCode} - * and are considered equal (more specifically, their {@code equals()} - * method will return {@code true} when compared). + * {@code ServiceReference} objects referring to it. {@code ServiceReference} + * objects associated with a {@code ServiceRegistration} object have the same + * {@code hashCode} and are considered equal (more specifically, their + * {@code equals()} method will return {@code true} when compared). * <p> * If the same service object is registered multiple times, * {@code ServiceReference} objects associated with different * {@code ServiceRegistration} objects are not equal. * * @param <S> Type of Service. - * @see BundleContext#getServiceReference - * @see BundleContext#getServiceReferences - * @see BundleContext#getService + * @see BundleContext#getServiceReference(Class) + * @see BundleContext#getServiceReference(String) + * @see BundleContext#getServiceReferences(Class, String) + * @see BundleContext#getServiceReferences(String, String) + * @see BundleContext#getService(ServiceReference) * @ThreadSafe * @noimplement - * @version $Id: 771b9b4d4f65dbe593154d02912edba51a085b0c $ + * @version $Id: 3adba50fc211993c78ec5ecb46f8fa360a6cff6a $ */ public interface ServiceReference<S> extends Comparable<Object> { @@ -73,22 +73,21 @@ public interface ServiceReference<S> extends Comparable<Object> { public Object getProperty(String key); /** - * Returns an array of the keys in the properties {@code Dictionary} - * object of the service referenced by this {@code ServiceReference} - * object. + * Returns an array of the keys in the properties {@code Dictionary} object + * of the service referenced by this {@code ServiceReference} object. * * <p> * This method will continue to return the keys after the service has been * unregistered. This is so references to unregistered services (for - * example, {@code ServiceReference} objects stored in the log) can - * still be interrogated. + * example, {@code ServiceReference} objects stored in the log) can still be + * interrogated. * * <p> * This method is <i>case-preserving </i>; this means that every key in the * returned array must have the same case as the corresponding key in the * properties {@code Dictionary} that was passed to the * {@link BundleContext#registerService(String[],Object,Dictionary)} or - * {@link ServiceRegistration#setProperties} methods. + * {@link ServiceRegistration#setProperties(Dictionary)} methods. * * @return An array of property keys. */ diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java index e4cfc0e64..a43e3dfff 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/ServiceRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2000, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2000, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import java.util.Dictionary; * @see BundleContext#registerService(String[],Object,Dictionary) * @ThreadSafe * @noimplement - * @version $Id: dc742ff3749821529f9ae62e05d9bd5d8eca00d7 $ + * @version $Id: f8da04fc7afe9fda184ea3e6f674c78fe86ffebb $ */ public interface ServiceRegistration<S> { @@ -80,35 +80,33 @@ public interface ServiceRegistration<S> { public void setProperties(Dictionary<String, ? > properties); /** - * Unregisters a service. Remove a {@code ServiceRegistration} object - * from the Framework service registry. All {@code ServiceReference} - * objects associated with this {@code ServiceRegistration} object - * can no longer be used to interact with the service once unregistration is - * complete. + * Unregisters a service. Remove a {@code ServiceRegistration} object from + * the Framework service registry. All {@code ServiceReference} objects + * associated with this {@code ServiceRegistration} object can no longer be + * used to interact with the service once unregistration is complete. * * <p> * The following steps are required to unregister a service: * <ol> - * <li>The service is removed from the Framework service registry so that - * it can no longer be obtained. + * <li>The service is removed from the Framework service registry so that it + * can no longer be obtained. * <li>A service event of type {@link ServiceEvent#UNREGISTERING} is fired * so that bundles using this service can release their use of the service. * Once delivery of the service event is complete, the - * {@code ServiceReference} objects for the service may no longer be - * used to get a service object for the service. + * {@code ServiceReference} objects for the service may no longer be used to + * get a service object for the service. * <li>For each bundle whose use count for this service is greater than * zero: <br> * The bundle's use count for this service is set to zero. <br> * If the service was registered with a {@link ServiceFactory} object, the - * {@code ServiceFactory.ungetService} method is called to release - * the service object for the bundle. + * {@code ServiceFactory.ungetService} method is called to release the + * service object for the bundle. * </ol> * - * @throws IllegalStateException If this - * {@code ServiceRegistration} object has already been - * unregistered. - * @see BundleContext#ungetService - * @see ServiceFactory#ungetService + * @throws IllegalStateException If this {@code ServiceRegistration} object + * has already been unregistered. + * @see BundleContext#ungetService(ServiceReference) + * @see ServiceFactory#ungetService(Bundle, ServiceRegistration, Object) */ public void unregister(); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/SynchronousBundleListener.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/SynchronousBundleListener.java index 227dc59cc..ee8474c13 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/SynchronousBundleListener.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/SynchronousBundleListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2001, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2001, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,38 +17,37 @@ package org.osgi.framework; /** - * A synchronous {@code BundleEvent} listener. - * {@code SynchronousBundleListener} is a listener interface that may be - * implemented by a bundle developer. When a {@code BundleEvent} is fired, - * it is synchronously delivered to a {@code SynchronousBundleListener}. - * The Framework may deliver {@code BundleEvent} objects to a - * {@code SynchronousBundleListener} out of order and may concurrently call - * and/or reenter a {@code SynchronousBundleListener}. + * A synchronous {@code BundleEvent} listener. {@code SynchronousBundleListener} + * is a listener interface that may be implemented by a bundle developer. When a + * {@code BundleEvent} is fired, it is synchronously delivered to a + * {@code SynchronousBundleListener}. The Framework may deliver + * {@code BundleEvent} objects to a {@code SynchronousBundleListener} out of + * order and may concurrently call and/or reenter a + * {@code SynchronousBundleListener}. * * <p> * For {@code BundleEvent} types {@link BundleEvent#STARTED STARTED} and * {@link BundleEvent#LAZY_ACTIVATION LAZY_ACTIVATION}, the Framework must not * hold the referenced bundle's "state change" lock when the - * {@code BundleEvent} is delivered to a - * {@code SynchronousBundleListener}. For the other - * {@code BundleEvent} types, the Framework must hold the referenced + * {@code BundleEvent} is delivered to a {@code SynchronousBundleListener}. For + * the other {@code BundleEvent} types, the Framework must hold the referenced * bundle's "state change" lock when the {@code BundleEvent} is * delivered to a {@code SynchronousBundleListener}. A - * {@code SynchronousBundleListener} cannot directly call life cycle - * methods on the referenced bundle when the Framework is holding the referenced - * bundle's "state change" lock. + * {@code SynchronousBundleListener} cannot directly call life cycle methods on + * the referenced bundle when the Framework is holding the referenced bundle's + * "state change" lock. * * <p> - * A {@code SynchronousBundleListener} object is registered with the - * Framework using the {@link BundleContext#addBundleListener} method. + * A {@code SynchronousBundleListener} object is registered with the Framework + * using the {@link BundleContext#addBundleListener(BundleListener)} method. * {@code SynchronousBundleListener} objects are called with a * {@code BundleEvent} object when a bundle has been installed, resolved, * starting, started, stopping, stopped, updated, unresolved, or uninstalled. * <p> * Unlike normal {@code BundleListener} objects, - * {@code SynchronousBundleListener}s are synchronously called during - * bundle lifecycle processing. The bundle lifecycle processing will not proceed - * until all {@code SynchronousBundleListener}s have completed. + * {@code SynchronousBundleListener}s are synchronously called during bundle + * lifecycle processing. The bundle lifecycle processing will not proceed until + * all {@code SynchronousBundleListener}s have completed. * {@code SynchronousBundleListener} objects will be called prior to * {@code BundleListener} objects. * <p> @@ -58,7 +57,7 @@ package org.osgi.framework; * @since 1.1 * @see BundleEvent * @ThreadSafe - * @version $Id: b22484f48ebdcb2141da9bba9eb65f5c40e0f520 $ + * @version $Id: 74246f4ceeba7f9a5ee198048522f93d4691c51a $ */ public interface SynchronousBundleListener extends BundleListener { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java index 94dabb724..f7358d518 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/CollisionHook.java @@ -16,6 +16,7 @@ package org.osgi.framework.hooks.bundle; import java.util.Collection; + import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -23,54 +24,58 @@ import org.osgi.framework.BundleContext; * OSGi Framework Bundle Collision Hook Service. * * <p> - * Bundles registering this service will be called during framework bundle - * install and update operations to determine if an install or update - * operation will result in a bundle symbolic name and version collision. + * Bundles registering this service will be called during framework bundle + * install and update operations to determine if an install or update operation + * will result in a bundle symbolic name and version collision. * * @ThreadSafe - * @version $Id: 64a98074fa8331b0cd21989f9c8583b99b2370cf $ + * @version $Id$ */ public interface CollisionHook { /** * Specifies a bundle install operation is being performed. */ - public static final int INSTALLING = 0x01; + int INSTALLING = 1; /** * Specifies a bundle update operation is being performed. */ - public static final int UPDATING = 0x02; + int UPDATING = 2; /** * Filter bundle collisions hook method. This method is called during the - * install or update operation. The operation type will be - * {@link #INSTALLING installing} or - * {@link #UPDATING updating}. Depending on the operation - * type the target bundle and the collision candidate collection are the following: + * install or update operation. The operation type will be + * {@link #INSTALLING installing} or {@link #UPDATING updating}. Depending + * on the operation type the target bundle and the collision candidate + * collection are the following: * <ul> - * <li> {@link #INSTALLING installing} - The target is the bundle associated with the - * {@link BundleContext} used to call one of the - * {@link BundleContext#installBundle(String) install} - * methods. The collision candidate collection contains the existing bundles - * installed which have the same symbolic name and version as the bundle being installed. - * <li> {@link #UPDATING updating} - The target is the bundle used to call one of the - * {@link Bundle#update() update} methods. The collision candidate collection - * contains the existing bundles installed which have the same symbolic name and version - * as the content the target bundle is being updated to. + * <li> {@link #INSTALLING installing} - The target is the bundle associated + * with the {@link BundleContext} used to call one of the + * {@link BundleContext#installBundle(String) install} methods. The + * collision candidate collection contains the existing bundles installed + * which have the same symbolic name and version as the bundle being + * installed. + * <li> {@link #UPDATING updating} - The target is the bundle used to call + * one of the {@link Bundle#update() update} methods. The collision + * candidate collection contains the existing bundles installed which have + * the same symbolic name and version as the content the target bundle is + * being updated to. * </ul> * This method can filter the list of collision candidates by removing * potential collisions. Removing a collision candidate will allow the - * specified operation to succeed as if the collision candidate is not installed. + * specified operation to succeed as if the collision candidate is not + * installed. * - * @param operationType the operation type. Must be the value of - * {@link #INSTALLING installing} or {@link #UPDATING updating}. - * @param target the target bundle used to determine what collision candidates to filter. - * @param collisionCandidates a collection of collision candidates. - * The collection supports all the optional {@code Collection} - * operations except {@code add} and {@code addAll}. Attempting - * to add to the collection will result in an - * {@code UnsupportedOperationException}. The collection is not - * synchronized. + * @param operationType the operation type. Must be the value of + * {@link #INSTALLING installing} or {@link #UPDATING updating}. + * @param target the target bundle used to determine what collision + * candidates to filter. + * @param collisionCandidates a collection of collision candidates. The + * collection supports all the optional {@code Collection} operations + * except {@code add} and {@code addAll}. Attempting to add to the + * collection will result in an {@code UnsupportedOperationException} + * . The collection is not synchronized. */ - void filterCollisions(int operationType, Bundle target, Collection<Bundle> collisionCandidates); + void filterCollisions(int operationType, Bundle target, + Collection<Bundle> collisionCandidates); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/FindHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/FindHook.java index 53c57fe51..e55ee3b86 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/FindHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/FindHook.java @@ -29,7 +29,7 @@ import org.osgi.framework.BundleException; * (get bundles) operations. * * @ThreadSafe - * @version $Id: 64a98074fa8331b0cd21989f9c8583b99b2370cf $ + * @version $Id: 4492a677df650072fe6acaea9ea35571f31eb5a9 $ */ public interface FindHook { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java index bbde7ffb5..fd7c60b0d 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHook.java @@ -19,6 +19,7 @@ package org.osgi.framework.hooks.resolver; import java.util.Collection; import org.osgi.framework.Bundle; +import org.osgi.framework.resource.ResourceConstants; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleRequirement; import org.osgi.framework.wiring.BundleRevision; @@ -51,62 +52,71 @@ import org.osgi.framework.wiring.FrameworkWiring; * must be thrown to the caller of the API which triggered the resolve process. * In cases where the the caller is not available a framework event of type * error should be fired.</li> + * * <li>For each registered hook factory call the * {@link ResolverHookFactory#begin(Collection)} method to inform the hooks * about a resolve process beginning and to obtain a Resolver Hook instance that * will be used for the duration of the resolve process.</li> + * * <li>Determine the collection of unresolved bundle revisions that may be * considered for resolution during the current resolution process and place - * each of the bundle revisions in a shrinkable collection {@code R}. For each + * each of the bundle revisions in a shrinkable collection {@code Resolvable}. For each * resolver hook call the {@link #filterResolvable(Collection)} method with the - * shrinkable collection {@code R}.</li> - * <li>The shrinkable collection {@code R} now contains all the unresolved + * shrinkable collection {@code Resolvable}.</li> + * <li>The shrinkable collection {@code Resolvable} now contains all the unresolved * bundle revisions that may end up as resolved at the end of the current * resolve process. Any other bundle revisions that got removed from the - * shrinkable collection {@code R} must not end up as resolved at the end of the + * shrinkable collection {@code Resolvable} must not end up as resolved at the end of the * current resolve process.</li> * <li>For each bundle revision {@code B} left in the shrinkable collection - * {@code R} that represents a singleton bundle do the following:<br/> + * {@code Resolvable} and any bundle revision {@code B} which is currently resolved + * that represents a singleton bundle do the following: + * <p/> * Determine the collection of available capabilities that have a name space of - * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle}, are singletons, + * {@link ResourceConstants#IDENTITY_NAMESPACE osgi.identity}, are singletons, * and have the same symbolic name as the singleton bundle revision {@code B} * and place each of the matching capabilities into a shrinkable collection - * {@code S}. - * - * Remove the {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle} + * {@code Collisions}. + * <p/> + * Remove the {@link ResourceConstants#IDENTITY_NAMESPACE osgi.identity} * capability provided by bundle revision {@code B} from shrinkable collection - * {@code S}. A singleton bundle cannot collide with itself. - * + * {@code Collisions}. A singleton bundle cannot collide with itself. + * <p/> * For each resolver hook call the * {@link #filterSingletonCollisions(BundleCapability, Collection)} with the - * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle} capability - * provided by bundle revision {@code B} and the shrinkable collection {@code S} - * - * The shrinkable collection {@code S} now contains all singleton - * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle} capabilities that - * can influence the ability of bundle revision {@code B} to resolve.</li> + * {@link ResourceConstants#IDENTITY_NAMESPACE osgi.identity} capability + * provided by bundle revision {@code B} and the shrinkable collection {@code Collisions} + * <p/> + * The shrinkable collection {@code Collisions} now contains all singleton + * {@link ResourceConstants#IDENTITY_NAMESPACE osgi.identity} capabilities that + * can influence the ability of bundle revision {@code B} to resolve. + * <p/> + * If the bundle revision {@code B} is already resolved then any resolvable + * bundle revision contained in the collection {@code Collisions} is not + * allowed to resolve. + * </li> * <li>During a resolve process a framework is free to attempt to resolve any or - * all bundles contained in shrinkable collection {@code R}. For each bundle - * revision {@code B} left in the shrinkable collection {@code R} which the + * all bundles contained in shrinkable collection {@code Resolvable}. For each bundle + * revision {@code B} left in the shrinkable collection {@code Resolvable} which the * framework attempts to resolve the following steps must be followed: * <p/> - * For each requirement {@code T} specified by bundle revision {@code B} + * For each requirement {@code R} specified by bundle revision {@code B} * determine the collection of capabilities that satisfy (or match) the * requirement and place each matching capability into a shrinkable collection - * {@code C}. A capability is considered to match a particular requirement if + * {@code Candidates}. A capability is considered to match a particular requirement if * its attributes satisfy a specified requirement and the requirer bundle has * permission to access the capability. * * <p/> * For each resolver hook call the * {@link #filterMatches(BundleRequirement, Collection)} with the requirement - * {@code T} and the shrinkable collection {@code C}. + * {@code R} and the shrinkable collection {@code Candidates}. * * <p/> - * The shrinkable collection {@code C} now contains all the capabilities that - * may be used to satisfy the requirement {@code T}. Any other capabilities that - * got removed from the shrinkable collection {@code C} must not be used to - * satisfy requirement {@code T}.</li> + * The shrinkable collection {@code Candidates} now contains all the capabilities that + * may be used to satisfy the requirement {@code R}. Any other capabilities that + * got removed from the shrinkable collection {@code Candidates} must not be used to + * satisfy requirement {@code R}.</li> * <li>For each resolver hook call the {@link #end()} method to inform the hooks * about a resolve process ending.</li> * </ol> @@ -125,7 +135,7 @@ import org.osgi.framework.wiring.FrameworkWiring; * * @see ResolverHookFactory * @NotThreadSafe - * @version $Id: ea23400257d780706250f8825ec886aaebb0e5d8 $ + * @version $Id: c4fec6e543d160ff99f50906de10de754661d7ae $ */ public interface ResolverHook { /** @@ -149,16 +159,17 @@ public interface ResolverHook { * candidates must all use the same name space. * <p> * Currently only capabilities with the name space of - * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle} can be - * singletons. In that case all the collision candidates have the name space - * of {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle}, are - * singletons, and have the same symbolic name as the specified singleton - * capability. + * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle} and + * {@link ResourceConstants#IDENTITY_NAMESPACE osgi.identity} can be + * singletons. The collision candidates will all have the same name space, + * be singletons, and have the same symbolic name as the specified + * singleton capability. * <p> * In the future, capabilities in other name spaces may support the * singleton concept. Hook implementations should be prepared to receive * calls to this method for capabilities in name spaces other than - * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle}. + * {@link BundleRevision#BUNDLE_NAMESPACE osgi.wiring.bundle} or + * {@link ResourceConstants#IDENTITY_NAMESPACE osgi.identity}. * <p> * This method can filter the list of collision candidates by removing * potential collisions. Removing a collision candidate will allow the diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHookFactory.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHookFactory.java index cd0779044..1d4edd43b 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHookFactory.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/ResolverHookFactory.java @@ -32,7 +32,7 @@ import org.osgi.framework.wiring.FrameworkWiring; * * @ThreadSafe * @see ResolverHook - * @version $Id: 08a6fba0f95499d08047282124b88256d33e1ce4 $ + * @version $Id: 4023566367435f07c047a7ba571f3bedc53aa37a $ */ public interface ResolverHookFactory { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClass.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClass.java index 34aa6d2f4..835618603 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClass.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/WovenClass.java @@ -138,13 +138,14 @@ public interface WovenClass { public ProtectionDomain getProtectionDomain(); /** - * Returns the class associated with this woven class. When loading a class - * for the first time this method will return {@code null} until weaving is - * {@link #isWeavingComplete() complete}. Once weaving is complete, this - * method will return the class object. + * Returns the class defined by this woven class. During weaving, this + * method will return {@code null}. Once weaving is + * {@link #isWeavingComplete() complete}, this method will return the class + * object if this woven class was used to define the class. * * @return The class associated with this woven class, or {@code null} if - * weaving is not complete or the class definition failed. + * weaving is not complete, the class definition failed or this + * woven class was not used to define the class. */ public Class< ? > getDefinedClass(); diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Capability.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Capability.java index c524c9c9b..305d71f87 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Capability.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Capability.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved. + * Copyright (c) OSGi Alliance (2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.osgi.framework.wiring; +package org.osgi.framework.resource; import java.util.Map; @@ -22,8 +22,7 @@ import java.util.Map; * A capability that has been declared from a {@link Resource}. * * @ThreadSafe - * @Immutable - * @version $Id: a37df4f0d0a54593fab0a3ddec451f0b1342d4f3 $ + * @version $Id: f230000a3da509b0bff654795c4b694ec86f601c $ */ public interface Capability { @@ -35,29 +34,28 @@ public interface Capability { String getNamespace(); /** - * Returns the directives of this capability. Only the following list of - * directives have semantic meaning in the returned {@link Map map} of - * directives: + * Returns the directives of this capability. + * + * <p> + * Only the following list of directives have specified semantics: * <ul> * <li> {@link ResourceConstants#CAPABILITY_EFFECTIVE_DIRECTIVE effective} * <li> {@link ResourceConstants#CAPABILITY_USES_DIRECTIVE uses} * <li> {@link ResourceConstants#CAPABILITY_MANDATORY_DIRECTIVE mandatory} - - * only recognized for the - * {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE osgi.wiring.bundle} and + * only recognized for the {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE + * osgi.wiring.bundle} and * {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package} * name spaces. - * <li> {@link ResourceConstants#CAPABILITY_EXCLUDE_DIRECTIVE exclude} - - * only recognized for the - * {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package} - * name space. - * <li> {@link ResourceConstants#CAPABILITY_INCLUDE_DIRECTIVE include} - - * only recognized for the - * {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package} - * name space. + * <li> {@link ResourceConstants#CAPABILITY_EXCLUDE_DIRECTIVE exclude} - only + * recognized for the {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE + * osgi.wiring.package} name space. + * <li> {@link ResourceConstants#CAPABILITY_INCLUDE_DIRECTIVE include} - only + * recognized for the {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE + * osgi.wiring.package} name space. * </ul> - * All other directive are considered extra user defined information that - * has no semantic meaning. OSGi Alliance reserves the right to extend the - * set of directives which have semantic meaning. + * All other directives have no specified semantics and are considered extra + * user defined information. The OSGi Alliance reserves the right to extend + * the set of directives which have specified semantics. * * @return An unmodifiable map of directive names to directive values for * this capability, or an empty map if this capability has no @@ -75,9 +73,9 @@ public interface Capability { Map<String, Object> getAttributes(); /** - * The resource that declares this capability. + * Returns the resource declaring this capability. * - * @return the resource + * @return The resource declaring this capability. */ Resource getResource(); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Requirement.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Requirement.java index 1debc0e23..9864eafaf 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Requirement.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Requirement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved. + * Copyright (c) OSGi Alliance (2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.osgi.framework.wiring; +package org.osgi.framework.resource; import java.util.Map; @@ -24,9 +24,7 @@ import org.osgi.framework.Constants; * A requirement that has been declared from a {@link Resource} . * * @ThreadSafe - * @Immutable - * - * @version $Id: a085f0fb285b6a0d72203440ffdb1c9e6a236f49 $ + * @version $Id: 34bfa17b8e9a55493390d6df96f2dcb026c74185 $ */ public interface Requirement { /** @@ -37,9 +35,10 @@ public interface Requirement { String getNamespace(); /** - * Returns the directives of this requirement. Only the following list of - * directives have semantic meaning in the returned {@link Map map} of - * directives: + * Returns the directives of this requirement. + * + * <p> + * Only the following list of directives have specified semantics: * <ul> * <li> {@link ResourceConstants#REQUIREMENT_EFFECTIVE_DIRECTIVE effective} * <li> {@link ResourceConstants#REQUIREMENT_FILTER_DIRECTIVE filter} @@ -51,9 +50,9 @@ public interface Requirement { * {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE osgi.wiring.bundle} name * space. * </ul> - * All other directive are considered extra user defined information that - * has no semantic meaning. OSGi Alliance reserves the right to extend the - * set of directives which have semantic meaning. + * All other directives have no specified semantics and are considered extra + * user defined information. The OSGi Alliance reserves the right to extend + * the set of directives which have specified semantics. * * @return An unmodifiable map of directive names to directive values for * this requirement, or an empty map if this requirement has no @@ -62,8 +61,11 @@ public interface Requirement { Map<String, String> getDirectives(); /** - * Returns the attributes of this requirement. Requirement attributes have - * no semantic meaning and are considered extra user defined information. + * Returns the attributes of this requirement. + * + * <p> + * Requirement attributes have no specified semantics and are considered + * extra user defined information. * * @return An unmodifiable map of attribute names to attribute values for * this requirement, or an empty map if this requirement has no @@ -72,36 +74,33 @@ public interface Requirement { Map<String, Object> getAttributes(); /** - * Returns the resource declaring this requirement. If there is no resource - * declaring this requirement, {@code null} is returned. + * Returns the resource declaring this requirement. * - * @return The resource declaring this requirement, if any. + * @return The resource declaring this requirement. */ Resource getResource(); /** - * Returns whether the specified capability matches this requirement. A - * capability matches this requirement when all of the following are true: + * Returns whether the specified capability matches this requirement. + * + * <p> + * A capability matches this requirement when all of the following are true: * <ul> * <li>The specified capability has the same {@link #getNamespace() name * space} as this requirement. * <li>The filter specified by the {@link Constants#FILTER_DIRECTIVE filter} * directive of this requirement matches the * {@link Capability#getAttributes() attributes of the specified capability}. - * <li>The {@link #getDirectives() requirement directives} and the - * {@link Capability#getDirectives() capability directives} that apply to - * the name space are satisfied. + * <li>The standard capability {@link Capability#getDirectives() directives} + * that influence matching and that apply to the name space are satisfied. + * See the capability + * {@link ResourceConstants#CAPABILITY_MANDATORY_DIRECTIVE mandatory} + * directive. * </ul> * - * - * @param capability - * The capability to match to this requirement. + * @param capability The capability to match to this requirement. * @return {@code true} if the specified capability matches this this - * requirement. {@link #getNamespace() name space} as this - * requirement and the filter for this requirement matches the - * {@link BundleCapability#getAttributes() attributes of the - * specified capability}; {@code false} otherwise. + * requirement; {@code false} otherwise. */ - // TODO much debate on the placement and need for this method. boolean matches(Capability capability); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Resource.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Resource.java index af4db8211..855fc5e59 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Resource.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Resource.java @@ -1,4 +1,20 @@ -package org.osgi.framework.wiring; +/* + * Copyright (c) OSGi Alliance (2011). All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.osgi.framework.resource; import java.util.List; @@ -9,9 +25,7 @@ import java.util.List; * A resources can be wired together via capabilities and requirements. * * @ThreadSafe - * @Immutable - * - * @version $Id: ab65b58b724ec74515bb8c5bad355658efc2460d $ + * @version $Id: 047a96acb364265b1cd15a14c74bb5e44da19062 $ */ public interface Resource { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/ResourceConstants.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/ResourceConstants.java index 0da0bf3d6..b7d100710 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/ResourceConstants.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/ResourceConstants.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.osgi.framework.wiring; + +package org.osgi.framework.resource; import org.osgi.framework.Constants; import org.osgi.framework.Version; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleWiring; /** * Defines standard names for the attributes, directives and name spaces for @@ -26,7 +29,8 @@ import org.osgi.framework.Version; * The values associated with these keys are of type {@code String}, unless * otherwise indicated. * - * @version $Id$ + * @Immutable + * @version $Id: 7b7e18d49b0e34e527a70641eed790d808800287 $ */ public final class ResourceConstants { @@ -350,7 +354,8 @@ public final class ResourceConstants { * in the {@link #REQUIREMENT_FILTER_DIRECTIVE filter} of a requirement in * order for the capability to match the requirement. This directive must * only be used for capabilities with the {@link #WIRING_PACKAGE_NAMESPACE - * package} name space. + * package}, {@link #WIRING_BUNDLE_NAMESPACE bundle}, or + * {@link #WIRING_HOST_NAMESPACE host} name space. */ public final static String CAPABILITY_MANDATORY_DIRECTIVE = "mandatory"; diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Wire.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Wire.java index 77badd1b8..a18a12b59 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/Wire.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/resource/Wire.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.osgi.framework.wiring; +package org.osgi.framework.resource; /** * A wire connecting a {@link Capability} to a {@link Requirement}. * * @ThreadSafe - * @Immutable - * @version $Id: ca06f75ac2d214182c5e5112f84334efd9d083fd $ + * @version $Id: e1d43aa8b1d29bcd6d840397b18d6af0b3ae6824 $ */ public interface Wire { /** diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java index adb51ecb2..11a8049a4 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/FrameworkStartLevel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2002, 2010). All Rights Reserved. + * Copyright (c) OSGi Alliance (2002, 2011). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.osgi.framework.FrameworkListener; * * @ThreadSafe * @noimplement - * @version $Id: 2bca22671674ba50b8c6801d5d1df8e291fe2a9d $ + * @version $Id: 12c6f60842df994c7de2cc3cfd02f791b95fc35b $ */ public interface FrameworkStartLevel extends BundleReference { /** @@ -126,7 +126,7 @@ public interface FrameworkStartLevel extends BundleReference { * is first installed. * * @return The initial start level value for Bundles. - * @see #setInitialBundleStartLevel + * @see #setInitialBundleStartLevel(int) */ int getInitialBundleStartLevel(); diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java index b44d6318d..06642fbd6 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleCapability.java @@ -18,6 +18,7 @@ package org.osgi.framework.wiring; import java.util.Map; +import org.osgi.framework.resource.Capability; /** * A capability that has been declared from a {@link BundleRevision bundle @@ -25,40 +26,32 @@ import java.util.Map; * * @ThreadSafe * @noimplement - * @version $Id: 6bbc1e645f927531d40fb245c95f5d26ad189db3 $ + * @version $Id: 3b48ced7e0ff67cc42031644879d6b1563296ba5 $ */ -public interface BundleCapability extends Capability{ +public interface BundleCapability extends Capability { + /** - * Returns the name space of this capability. + * Returns the bundle revision declaring this capability. + * + * <p> + * This method returns the same object as {@link #getResource()}. * - * @return The name space of this capability. + * @return The bundle revision declaring this capability. */ - String getNamespace(); + BundleRevision getRevision(); /** - * Returns the directives of this capability. - * - * @return An unmodifiable map of directive names to directive values for - * this capability, or an empty map if this capability has no - * directives. + * {@inheritDoc} */ - Map<String, String> getDirectives(); + String getNamespace(); /** - * Returns the attributes of this capability. - * - * @return An unmodifiable map of attribute names to attribute values for - * this capability, or an empty map if this capability has no - * attributes. + * {@inheritDoc} */ - Map<String, Object> getAttributes(); + Map<String, String> getDirectives(); /** - * Returns the bundle revision declaring this capability. - * - * @return The bundle revision declaring this capability. + * {@inheritDoc} */ - BundleRevision getRevision(); - - BundleRevision getResource(); + Map<String, Object> getAttributes(); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java index 884ef3ded..fe5b5a4d8 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRequirement.java @@ -18,6 +18,7 @@ package org.osgi.framework.wiring; import java.util.Map; +import org.osgi.framework.resource.Requirement; /** * A requirement that has been declared from a {@link BundleRevision bundle @@ -25,47 +26,20 @@ import java.util.Map; * * @ThreadSafe * @noimplement - * @version $Id: 3ee254a3c0d5516b56affaa66544c892f3d522cb $ + * @version $Id: 2c875c9711292a033a7cd597742b79b5791e9d10 $ */ -public interface BundleRequirement extends Requirement{ - /** - * Returns the name space of this requirement. - * - * @return The name space of this requirement. - */ - String getNamespace(); - - /** - * Returns the directives of this requirement. - * - * @return An unmodifiable map of directive names to directive values for - * this requirement, or an empty map if this requirement has no - * directives. - */ - Map<String, String> getDirectives(); - - /** - * Returns the attributes of this requirement. - * - * @return An unmodifiable map of attribute names to attribute values for - * this requirement, or an empty map if this requirement has no - * attributes. - */ - Map<String, Object> getAttributes(); - +public interface BundleRequirement extends Requirement { /** * Returns the bundle revision declaring this requirement. * + * <p> + * This method returns the same object as {@link #getResource()}. + * * @return The bundle revision declaring this requirement. */ BundleRevision getRevision(); /** - * {@inheritDoc} - */ - BundleRevision getResource(); - - /** * Returns whether the specified capability matches this requirement. * * @param capability The capability to match to this requirement. @@ -76,4 +50,19 @@ public interface BundleRequirement extends Requirement{ * specified capability}; {@code false} otherwise. */ boolean matches(BundleCapability capability); + + /** + * {@inheritDoc} + */ + String getNamespace(); + + /** + * {@inheritDoc} + */ + Map<String, String> getDirectives(); + + /** + * {@inheritDoc} + */ + Map<String, Object> getAttributes(); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java index 17a54c1ef..eb5184a37 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleRevision.java @@ -22,6 +22,8 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleReference; import org.osgi.framework.Constants; import org.osgi.framework.Version; +import org.osgi.framework.resource.Resource; +import org.osgi.framework.resource.ResourceConstants; /** * Bundle Revision. When a bundle is installed and each time a bundle is diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java index d2bbd3b97..2efde3006 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWire.java @@ -16,13 +16,15 @@ package org.osgi.framework.wiring; +import org.osgi.framework.resource.Wire; + /** * A wire connecting a {@link BundleCapability} to a {@link BundleRequirement}. * * @ThreadSafe * @noimplement - * @version $Id: aca8642cea91995d0b178129cba1131ed327c7e7 $ + * @version $Id: 6dc92f05a3786642510e2f126c5e751c73cf8c3e $ */ public interface BundleWire extends Wire { /** @@ -70,14 +72,4 @@ public interface BundleWire extends Wire { * returned. */ BundleWiring getRequirerWiring(); - - /** - * {@inheritDoc} - */ - BundleRevision getProvider(); - - /** - * {@inheritDoc} - */ - BundleRevision getRequirer(); } diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java index 52c24852d..66937099a 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/BundleWiring.java @@ -22,6 +22,7 @@ import java.util.List; import org.osgi.framework.Bundle; import org.osgi.framework.BundleReference; +import org.osgi.framework.resource.ResourceConstants; /** * A wiring for a bundle. Each time a bundle is resolved, a new bundle wiring @@ -47,7 +48,7 @@ import org.osgi.framework.BundleReference; * * @ThreadSafe * @noimplement - * @version $Id: 58b8ec3bb9649387d4ccba1070f034f217d06ea2 $ + * @version $Id: ca8336db29d70e54bf0e9ba516a618f041040b97 $ */ public interface BundleWiring extends BundleReference { /** @@ -77,22 +78,31 @@ public interface BundleWiring extends BundleReference { * Returns the capabilities provided by this bundle wiring. * * <p> + * Only capabilities considered by the resolver are returned. For example, + * capabilities with + * {@link ResourceConstants#CAPABILITY_EFFECTIVE_DIRECTIVE effective} + * directive not equal to {@link ResourceConstants#EFFECTIVE_RESOLVE + * resolve} are not returned. + * + * <p> * A capability may not be required by any bundle wiring and thus there may * be no {@link #getProvidedWires(String) wires} for the capability. * * <p> * A bundle wiring for a non-fragment revision provides a subset of the * declared capabilities from the bundle revision and all attached fragment - * revisions<sup>†</sup>. Not all declared capabilities may be provided since some may - * be discarded. For example, if a package is declared to be exported and - * import, only one is selected and the other is discarded. + * revisions<sup>†</sup>. Not all declared capabilities may be + * provided since some may be discarded. For example, if a package is + * declared to be exported and import, only one is selected and the other is + * discarded. * <p> - * A bundle wiring for a fragment revision with a symbolic name must - * provide exactly one {@link ResourceConstants#IDENTITY_NAMESPACE identity} capability. + * A bundle wiring for a fragment revision with a symbolic name must provide + * exactly one {@link ResourceConstants#IDENTITY_NAMESPACE identity} + * capability. * <p> - * † The {@link ResourceConstants#IDENTITY_NAMESPACE identity} capability - * provided by attached fragment revisions must not be included in the capabilities of the - * host bundle wiring. + * † The {@link ResourceConstants#IDENTITY_NAMESPACE identity} + * capability provided by attached fragment revisions must not be included + * in the capabilities of the host bundle wiring. * * @param namespace The name space of the capabilities to return or * {@code null} to return the capabilities from all name spaces. @@ -102,9 +112,9 @@ public interface BundleWiring extends BundleReference { * {@link #isInUse() in use}, {@code null} will be returned. For a * given name space, the list contains the wires in the order the * capabilities were specified in the manifests of the - * {@link #getRevision() bundle revision} and the attached fragments<sup>†</sup> - * of this bundle wiring. There is no ordering defined between - * capabilities in different name spaces. + * {@link #getRevision() bundle revision} and the attached + * fragments<sup>†</sup> of this bundle wiring. There is no + * ordering defined between capabilities in different name spaces. */ List<BundleCapability> getCapabilities(String namespace); @@ -112,6 +122,13 @@ public interface BundleWiring extends BundleReference { * Returns the requirements of this bundle wiring. * * <p> + * Only requirements considered by the resolver are returned. For example, + * requirements with + * {@link ResourceConstants#REQUIREMENT_EFFECTIVE_DIRECTIVE effective} + * directive not equal to {@link ResourceConstants#EFFECTIVE_RESOLVE + * resolve} are not returned. + * + * <p> * A bundle wiring for a non-fragment revision has a subset of the declared * requirements from the bundle revision and all attached fragment * revisions. Not all declared requirements may be present since some may be diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java index 41c0faf96..abb88e838 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverBundle.java @@ -10,13 +10,14 @@ *******************************************************************************/ package org.eclipse.osgi.internal.module; +import org.osgi.framework.resource.ResourceConstants; + import java.util.*; import java.util.Map.Entry; import org.eclipse.osgi.internal.resolver.ExportPackageDescriptionImpl; import org.eclipse.osgi.internal.resolver.GenericDescriptionImpl; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.Constants; -import org.osgi.framework.wiring.ResourceConstants; /* * A companion to BundleDescription from the state used while resolving. diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java index ebd92db6e..f750efb63 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java @@ -11,6 +11,8 @@ ******************************************************************************/ package org.eclipse.osgi.internal.module; +import org.osgi.framework.resource.ResourceConstants; + import java.security.AccessController; import java.util.*; import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor; diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java index a83425a06..22c38d221 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.osgi.internal.resolver; +import org.osgi.framework.resource.Capability; +import org.osgi.framework.resource.Requirement; + import java.io.IOException; import java.net.URL; import java.util.*; diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java index bca93d05a..114b86c65 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java @@ -11,6 +11,8 @@ *******************************************************************************/ package org.eclipse.osgi.internal.resolver; +import org.osgi.framework.resource.ResourceConstants; + import java.lang.reflect.Constructor; import java.util.*; import org.eclipse.osgi.framework.internal.core.*; @@ -19,7 +21,6 @@ import org.eclipse.osgi.service.resolver.*; import org.eclipse.osgi.util.ManifestElement; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; -import org.osgi.framework.wiring.ResourceConstants; /** * This class builds bundle description objects from manifests diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java index 716d86c79..a88af773a 100644 --- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java +++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/VersionConstraintImpl.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.osgi.internal.resolver; +import org.osgi.framework.resource.Capability; +import org.osgi.framework.resource.ResourceConstants; + import java.util.Collections; import java.util.Map; import org.eclipse.osgi.framework.internal.core.Constants; |