diff options
13 files changed, 36 insertions, 9 deletions
diff --git a/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF index afd0a7296..9f1759b36 100644 --- a/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.container.tests/META-INF/MANIFEST.MF @@ -13,5 +13,6 @@ Import-Package: org.eclipse.osgi.util;version="1.1.0", org.osgi.framework.namespace;version="1.0.0", org.osgi.framework.startlevel;version="1.0.0", org.osgi.framework.wiring;version="1.1.0", - org.osgi.resource;version="1.0.0" + org.osgi.resource;version="1.0.0", + org.osgi.service.resolver;version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.osgi.container/.classpath b/bundles/org.eclipse.osgi.container/.classpath index ad55e17bd..cb54aec9b 100644 --- a/bundles/org.eclipse.osgi.container/.classpath +++ b/bundles/org.eclipse.osgi.container/.classpath @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="osgi"/> <classpathentry kind="src" path="container"/> <classpathentry kind="src" path="resolver"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.osgi.container/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.osgi.container/.settings/org.eclipse.core.resources.prefs index 47cf5ee18..370ae2c69 100644 --- a/bundles/org.eclipse.osgi.container/.settings/org.eclipse.core.resources.prefs +++ b/bundles/org.eclipse.osgi.container/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,2 @@ eclipse.preferences.version=1 encoding/<project>=ISO-8859-1 -encoding/osgi=UTF-8 diff --git a/bundles/org.eclipse.osgi.container/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.container/META-INF/MANIFEST.MF index cc4205631..076f52054 100644 --- a/bundles/org.eclipse.osgi.container/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.container/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Framework +Bundle-Name: Equnox Container Bundle-SymbolicName: org.eclipse.osgi.container Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -14,8 +14,8 @@ Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.2.0", org.osgi.framework.namespace;version="[1.0.0,2.0.0)", org.osgi.framework.startlevel;version="1.0.0", org.osgi.framework.wiring;version="[1.1.0,1.2.0)", - org.osgi.resource;version="[1.0.0,1.1.0)" + org.osgi.resource;version="[1.0.0,1.1.0)", + org.osgi.service.resolver;version="[1.0.0, 2.0.0)" Export-Package: org.eclipse.osgi.container;version="1.0", org.eclipse.osgi.container.builders;version="1.0", - org.eclipse.osgi.container.namespaces;version="1.0", - org.osgi.service.resolver;version="1.0" + org.eclipse.osgi.container.namespaces;version="1.0" diff --git a/bundles/org.eclipse.osgi.container/build.properties b/bundles/org.eclipse.osgi.container/build.properties index 4714edd6c..e62c5d2a9 100644 --- a/bundles/org.eclipse.osgi.container/build.properties +++ b/bundles/org.eclipse.osgi.container/build.properties @@ -1,5 +1,4 @@ -source.. = osgi/,\ - container/,\ +source.. = container/,\ resolver/ output.. = bin/ bin.includes = META-INF/,\ diff --git a/bundles/org.eclipse.osgi/.settings/.api_filters b/bundles/org.eclipse.osgi/.settings/.api_filters index 2edc26f86..22e7fc6fa 100644 --- a/bundles/org.eclipse.osgi/.settings/.api_filters +++ b/bundles/org.eclipse.osgi/.settings/.api_filters @@ -576,6 +576,34 @@ </message_arguments> </filter> </resource> + <resource path="osgi/src/org/osgi/service/resolver/HostedCapability.java" type="org.osgi.service.resolver.HostedCapability"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.resolver.HostedCapability"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/resolver/ResolutionException.java" type="org.osgi.service.resolver.ResolutionException"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.resolver.ResolutionException"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/resolver/ResolveContext.java" type="org.osgi.service.resolver.ResolveContext"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.resolver.ResolveContext"/> + </message_arguments> + </filter> + </resource> + <resource path="osgi/src/org/osgi/service/resolver/Resolver.java" type="org.osgi.service.resolver.Resolver"> + <filter comment="Ignore OSGi API" id="1110441988"> + <message_arguments> + <message_argument value="org.osgi.service.resolver.Resolver"/> + </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> diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF index 29267ae60..e24d90a9a 100644 --- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF @@ -34,6 +34,7 @@ Export-Package: org.eclipse.osgi.event;version="1.0", org.osgi.service.log; version="1.3", org.osgi.service.packageadmin;version="1.2", org.osgi.service.permissionadmin;version="1.2", + org.osgi.service.resolver;version="1.0", org.osgi.service.startlevel;version="1.1", org.osgi.service.url;version="1.0", org.osgi.util.tracker;version="1.5.1", diff --git a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/HostedCapability.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/HostedCapability.java index db698baa0..db698baa0 100644 --- a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/HostedCapability.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/HostedCapability.java diff --git a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/ResolutionException.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/ResolutionException.java index 42e5773e3..42e5773e3 100644 --- a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/ResolutionException.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/ResolutionException.java diff --git a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/ResolveContext.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/ResolveContext.java index f92eae32a..f92eae32a 100644 --- a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/ResolveContext.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/ResolveContext.java diff --git a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/Resolver.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java index dfb89b8d0..dfb89b8d0 100644 --- a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/Resolver.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/Resolver.java diff --git a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/package-info.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/package-info.java index db1706d83..db1706d83 100644 --- a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/package-info.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/package-info.java diff --git a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/packageinfo index 7c8de0324..7c8de0324 100644 --- a/bundles/org.eclipse.osgi.container/osgi/org/osgi/service/resolver/packageinfo +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/service/resolver/packageinfo |