diff options
author | Thomas Watson | 2017-11-15 18:53:41 +0000 |
---|---|---|
committer | Thomas Watson | 2017-11-16 15:13:33 +0000 |
commit | 045a3a31cf5900255afd392a6e310fd99b84ac6e (patch) | |
tree | bf28ee7fce4702701a47e187023395b95ff6c482 | |
parent | 399ac521ec3043355fe1a0daa2bb0f0483c28605 (diff) | |
download | rt.equinox.framework-045a3a31cf5900255afd392a6e310fd99b84ac6e.tar.gz rt.equinox.framework-045a3a31cf5900255afd392a6e310fd99b84ac6e.tar.xz rt.equinox.framework-045a3a31cf5900255afd392a6e310fd99b84ac6e.zip |
Bug 526997 - Usage of org.eclipse.osgi.container.Module is ambiguousI20171122-2000I20171121-2000I20171121-0020I20171120-2225I20171120-2000I20171119-2000I20171118-1500I20171117-2000I20171116-2000
with a Java 9 JRE
Added explicit imports to org.eclipse.osgi.container.Module where
needed. Also had to update the jdt prefs for the projects to stop
collapsing the imports when 3 or more classes are imported from the same
package.
Change-Id: I6cbfbeea07e2cb0e5df7db8db1d145014ab33cb2
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
25 files changed, 431 insertions, 98 deletions
diff --git a/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs index 023a27a64..f7a344cd2 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs +++ b/bundles/org.eclipse.osgi.compatibility.state/.settings/org.eclipse.jdt.ui.prefs @@ -1,11 +1,10 @@ -#Tue Aug 21 11:19:11 CDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_core formatter_settings_version=11 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=; -org.eclipse.jdt.ui.ondemandthreshold=3 +org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.staticondemandthreshold=99 sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false diff --git a/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF index 111483607..b336a11d7 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.osgi.compatibility.state -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.100.qualifier ExtensionBundle-Activator: org.eclipse.osgi.compatibility.state.Activator Fragment-Host: org.eclipse.osgi;bundle-version="3.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/bundles/org.eclipse.osgi.compatibility.state/pom.xml b/bundles/org.eclipse.osgi.compatibility.state/pom.xml index 6b1727f42..da94f0927 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/pom.xml +++ b/bundles/org.eclipse.osgi.compatibility.state/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi.compatibility.state</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java index 3f35cd719..4adbb67b6 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/compatibility/state/PlatformAdminImpl.java @@ -9,15 +9,29 @@ ******************************************************************************/ package org.eclipse.osgi.compatibility.state; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleDatabase; +import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.internal.framework.BundleContextImpl; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.module.ResolverImpl; import org.eclipse.osgi.internal.resolver.StateHelperImpl; import org.eclipse.osgi.internal.resolver.StateObjectFactoryImpl; -import org.eclipse.osgi.service.resolver.*; -import org.osgi.framework.*; +import org.eclipse.osgi.service.resolver.BundleDescription; +import org.eclipse.osgi.service.resolver.DisabledInfo; +import org.eclipse.osgi.service.resolver.PlatformAdmin; +import org.eclipse.osgi.service.resolver.Resolver; +import org.eclipse.osgi.service.resolver.State; +import org.eclipse.osgi.service.resolver.StateHelper; +import org.eclipse.osgi.service.resolver.StateObjectFactory; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceRegistration; public class PlatformAdminImpl implements PlatformAdmin { private final StateObjectFactory factory = new StateObjectFactoryImpl(); diff --git a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.ui.prefs index d56ae862a..f7a344cd2 100644 --- a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.ui.prefs +++ b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.ui.prefs @@ -1,11 +1,10 @@ -#Tue Aug 21 11:33:29 CDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_core formatter_settings_version=11 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=; -org.eclipse.jdt.ui.ondemandthreshold=3 +org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.staticondemandthreshold=99 sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java index 2b06d17b5..bdd4b3577 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java @@ -12,14 +12,27 @@ package org.eclipse.osgi.tests.container; import java.io.IOException; import java.net.URL; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleRevisionBuilder; import org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory; import org.eclipse.osgi.service.debug.DebugOptions; -import org.eclipse.osgi.tests.container.dummys.*; +import org.eclipse.osgi.tests.container.dummys.DummyCollisionHook; +import org.eclipse.osgi.tests.container.dummys.DummyContainerAdaptor; +import org.eclipse.osgi.tests.container.dummys.DummyResolverHookFactory; import org.eclipse.osgi.util.ManifestElement; -import org.junit.*; -import org.osgi.framework.*; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.BundleReference; +import org.osgi.framework.ServiceRegistration; import org.osgi.framework.hooks.resolver.ResolverHook; public abstract class AbstractTest { diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java index 553819d87..8691a6ee9 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java @@ -17,32 +17,82 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.jar.Attributes; import java.util.jar.Manifest; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.Module.StartOptions; import org.eclipse.osgi.container.Module.State; +import org.eclipse.osgi.container.ModuleCapability; +import org.eclipse.osgi.container.ModuleContainer; import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent; +import org.eclipse.osgi.container.ModuleRequirement; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory; import org.eclipse.osgi.container.namespaces.EclipsePlatformNamespace; import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.report.resolution.ResolutionReport; -import org.eclipse.osgi.tests.container.dummys.*; +import org.eclipse.osgi.tests.container.dummys.DummyCollisionHook; +import org.eclipse.osgi.tests.container.dummys.DummyContainerAdaptor; +import org.eclipse.osgi.tests.container.dummys.DummyDebugOptions; +import org.eclipse.osgi.tests.container.dummys.DummyModuleDatabase; import org.eclipse.osgi.tests.container.dummys.DummyModuleDatabase.DummyContainerEvent; import org.eclipse.osgi.tests.container.dummys.DummyModuleDatabase.DummyModuleEvent; +import org.eclipse.osgi.tests.container.dummys.DummyResolverHook; +import org.eclipse.osgi.tests.container.dummys.DummyResolverHookFactory; import org.eclipse.osgi.util.ManifestElement; import org.junit.Assert; import org.junit.Test; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.BundleReference; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; import org.osgi.framework.hooks.resolver.ResolverHook; import org.osgi.framework.hooks.resolver.ResolverHookFactory; -import org.osgi.framework.namespace.*; -import org.osgi.framework.wiring.*; +import org.osgi.framework.namespace.BundleNamespace; +import org.osgi.framework.namespace.ExecutionEnvironmentNamespace; +import org.osgi.framework.namespace.HostNamespace; +import org.osgi.framework.namespace.IdentityNamespace; +import org.osgi.framework.namespace.PackageNamespace; +import org.osgi.framework.wiring.BundleCapability; +import org.osgi.framework.wiring.BundleRequirement; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleWire; import org.osgi.resource.Namespace; public class TestModuleContainer extends AbstractTest { diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java index 4bf96b573..bdb0832e6 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyContainerAdaptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2016 IBM Corporation and others. + * Copyright (c) 2012, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,8 +15,12 @@ import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.Module.Settings; +import org.eclipse.osgi.container.ModuleCollisionHook; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleContainerAdaptor; +import org.eclipse.osgi.container.SystemModule; import org.eclipse.osgi.service.debug.DebugOptions; import org.eclipse.osgi.tests.container.dummys.DummyModuleDatabase.DummyContainerEvent; import org.eclipse.osgi.tests.container.dummys.DummyModuleDatabase.DummyModuleEvent; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java index 1612fe94a..3e9d7b2a4 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. + * Copyright (c) 2012, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,9 @@ package org.eclipse.osgi.tests.container.dummys; import java.util.EnumSet; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleRevision; import org.osgi.framework.Bundle; public class DummyModule extends Module { diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java index 28d82d1a4..c9bfe3e1c 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/dummys/DummyModuleDatabase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. + * Copyright (c) 2012, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,10 +12,12 @@ package org.eclipse.osgi.tests.container.dummys; import java.util.ArrayList; import java.util.List; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.Module.State; +import org.eclipse.osgi.container.ModuleContainerAdaptor; import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent; +import org.eclipse.osgi.container.ModuleDatabase; import org.osgi.framework.FrameworkListener; public class DummyModuleDatabase extends ModuleDatabase { @@ -112,8 +114,7 @@ public class DummyModuleDatabase extends ModuleDatabase { public final Throwable error; public final FrameworkListener[] listeners; - public DummyContainerEvent(ContainerEvent type, Module module, - Throwable error, FrameworkListener... listeners) { + public DummyContainerEvent(ContainerEvent type, Module module, Throwable error, FrameworkListener... listeners) { this.type = type; this.module = module; this.error = error; diff --git a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.ui.prefs index 023a27a64..f7a344cd2 100644 --- a/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.ui.prefs +++ b/bundles/org.eclipse.osgi/.settings/org.eclipse.jdt.ui.prefs @@ -1,11 +1,10 @@ -#Tue Aug 21 11:19:11 CDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_core formatter_settings_version=11 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=; -org.eclipse.jdt.ui.ondemandthreshold=3 +org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.staticondemandthreshold=99 sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java index e8f203f1c..ded552786 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxBundle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2016 IBM Corporation and others. + * Copyright (c) 2012, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,43 @@ *******************************************************************************/ package org.eclipse.osgi.internal.framework; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; -import java.security.*; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.security.Permission; +import java.security.PrivilegedAction; +import java.security.ProtectionDomain; import java.security.cert.Certificate; import java.security.cert.X509Certificate; -import java.util.*; -import org.eclipse.osgi.container.*; -import org.eclipse.osgi.container.Module.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Dictionary; +import java.util.EnumSet; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.Module.Settings; +import org.eclipse.osgi.container.Module.StartOptions; +import org.eclipse.osgi.container.Module.State; +import org.eclipse.osgi.container.Module.StopOptions; +import org.eclipse.osgi.container.ModuleContainer; import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent; +import org.eclipse.osgi.container.ModuleLoader; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; +import org.eclipse.osgi.container.SystemModule; import org.eclipse.osgi.framework.log.FrameworkLogEntry; import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.loader.BundleLoader; @@ -28,19 +55,38 @@ import org.eclipse.osgi.internal.loader.classpath.ClasspathManager; import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.internal.permadmin.EquinoxSecurityManager; import org.eclipse.osgi.report.resolution.ResolutionReport; -import org.eclipse.osgi.signedcontent.*; +import org.eclipse.osgi.signedcontent.SignedContent; +import org.eclipse.osgi.signedcontent.SignedContentFactory; +import org.eclipse.osgi.signedcontent.SignerInfo; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.storage.Storage; -import org.osgi.framework.*; -import org.osgi.framework.dto.*; +import org.osgi.framework.AdaptPermission; +import org.osgi.framework.AdminPermission; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.BundleReference; +import org.osgi.framework.Constants; +import org.osgi.framework.FrameworkEvent; +import org.osgi.framework.FrameworkListener; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; +import org.osgi.framework.dto.BundleDTO; +import org.osgi.framework.dto.FrameworkDTO; +import org.osgi.framework.dto.ServiceReferenceDTO; import org.osgi.framework.launch.Framework; import org.osgi.framework.namespace.HostNamespace; import org.osgi.framework.startlevel.BundleStartLevel; import org.osgi.framework.startlevel.FrameworkStartLevel; import org.osgi.framework.startlevel.dto.BundleStartLevelDTO; import org.osgi.framework.startlevel.dto.FrameworkStartLevelDTO; -import org.osgi.framework.wiring.*; -import org.osgi.framework.wiring.dto.*; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleRevisions; +import org.osgi.framework.wiring.BundleWiring; +import org.osgi.framework.wiring.FrameworkWiring; +import org.osgi.framework.wiring.dto.BundleRevisionDTO; +import org.osgi.framework.wiring.dto.BundleWiringDTO; +import org.osgi.framework.wiring.dto.FrameworkWiringDTO; public class EquinoxBundle implements Bundle, BundleReference { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java index 4c3e6539a..885b71828 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2016 IBM Corporation and others. + * Copyright (c) 2012, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,20 +12,43 @@ package org.eclipse.osgi.internal.framework; import java.lang.reflect.Method; import java.security.ProtectionDomain; -import java.util.*; -import java.util.concurrent.*; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.Module.Settings; import org.eclipse.osgi.container.Module.State; +import org.eclipse.osgi.container.ModuleCollisionHook; +import org.eclipse.osgi.container.ModuleContainerAdaptor; +import org.eclipse.osgi.container.ModuleLoader; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; +import org.eclipse.osgi.container.ModuleWiring; +import org.eclipse.osgi.container.SystemModule; import org.eclipse.osgi.internal.container.AtomicLazyInitializer; import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; -import org.eclipse.osgi.internal.loader.*; +import org.eclipse.osgi.internal.loader.BundleLoader; +import org.eclipse.osgi.internal.loader.FragmentLoader; +import org.eclipse.osgi.internal.loader.SystemBundleLoader; import org.eclipse.osgi.internal.permadmin.BundlePermissions; import org.eclipse.osgi.service.debug.DebugOptions; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.storage.Storage; -import org.osgi.framework.*; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.Constants; +import org.osgi.framework.FrameworkEvent; +import org.osgi.framework.FrameworkListener; import org.osgi.framework.hooks.resolver.ResolverHookFactory; import org.osgi.framework.wiring.BundleRevision; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java index 14a6df5da..6a6d9e12f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java @@ -12,21 +12,35 @@ package org.eclipse.osgi.internal.framework; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.Module.State; +import org.eclipse.osgi.container.ModuleCollisionHook; +import org.eclipse.osgi.container.ModuleContainer; import org.eclipse.osgi.framework.util.ArrayMap; import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.messages.Msg; -import org.eclipse.osgi.internal.serviceregistry.*; +import org.eclipse.osgi.internal.serviceregistry.HookContext; +import org.eclipse.osgi.internal.serviceregistry.ServiceReferenceImpl; +import org.eclipse.osgi.internal.serviceregistry.ServiceRegistry; +import org.eclipse.osgi.internal.serviceregistry.ShrinkableCollection; import org.eclipse.osgi.report.resolution.ResolutionReport; import org.eclipse.osgi.storage.Storage; import org.eclipse.osgi.util.NLS; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceRegistration; import org.osgi.framework.hooks.bundle.CollisionHook; import org.osgi.framework.hooks.resolver.ResolverHook; import org.osgi.framework.hooks.resolver.ResolverHookFactory; -import org.osgi.framework.wiring.*; +import org.osgi.framework.wiring.BundleCapability; +import org.osgi.framework.wiring.BundleRequirement; +import org.osgi.framework.wiring.BundleRevision; class OSGiFrameworkHooks { static final String collisionHookName = CollisionHook.class.getName(); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java index e21313296..77ba89354 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java @@ -13,17 +13,42 @@ package org.eclipse.osgi.internal.framework.legacy; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleCapability; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.internal.container.Capabilities; import org.eclipse.osgi.internal.container.InternalUtils; import org.eclipse.osgi.internal.framework.EquinoxContainer; -import org.osgi.framework.*; -import org.osgi.framework.namespace.*; -import org.osgi.framework.wiring.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleReference; +import org.osgi.framework.Constants; +import org.osgi.framework.Version; +import org.osgi.framework.VersionRange; +import org.osgi.framework.namespace.BundleNamespace; +import org.osgi.framework.namespace.HostNamespace; +import org.osgi.framework.namespace.IdentityNamespace; +import org.osgi.framework.namespace.PackageNamespace; +import org.osgi.framework.wiring.BundleCapability; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleWire; +import org.osgi.framework.wiring.BundleWiring; import org.osgi.resource.Namespace; import org.osgi.resource.Requirement; -import org.osgi.service.packageadmin.*; +import org.osgi.service.packageadmin.ExportedPackage; +import org.osgi.service.packageadmin.PackageAdmin; +import org.osgi.service.packageadmin.RequiredBundle; @Deprecated public class PackageAdminImpl implements PackageAdmin { diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java index 9c5ad2abc..4d221f1ff 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/StorageHookFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2016 IBM Corporation and others. + * Copyright (c) 2005, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,10 +11,16 @@ package org.eclipse.osgi.internal.hookregistry; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; import java.util.Dictionary; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleContainerAdaptor; import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.osgi.framework.BundleException; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java index 26edbbac6..66aafd7a7 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hooks/EclipseLazyStarter.java @@ -12,10 +12,19 @@ package org.eclipse.osgi.internal.hooks; import java.security.AccessController; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Deque; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.Module.StartOptions; import org.eclipse.osgi.container.Module.State; +import org.eclipse.osgi.container.ModuleCapability; +import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.framework.log.FrameworkLogEntry; import org.eclipse.osgi.framework.util.SecureAction; @@ -24,7 +33,9 @@ import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; import org.eclipse.osgi.internal.loader.classpath.ClasspathManager; import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.util.NLS; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; +import org.osgi.framework.FrameworkEvent; public class EclipseLazyStarter extends ClassLoaderHook { private static final EnumSet<State> alreadyActive = EnumSet.of(State.ACTIVE, State.STOPPING, State.UNINSTALLED); diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java index 86be6744c..d797d422f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java @@ -16,11 +16,27 @@ import java.io.IOException; import java.net.URL; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleCapability; +import org.eclipse.osgi.container.ModuleLoader; +import org.eclipse.osgi.container.ModuleRequirement; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory; import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.framework.util.KeyedElement; @@ -30,11 +46,19 @@ import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; import org.eclipse.osgi.internal.loader.buddy.PolicyHandler; -import org.eclipse.osgi.internal.loader.sources.*; +import org.eclipse.osgi.internal.loader.sources.MultiSourcePackage; +import org.eclipse.osgi.internal.loader.sources.NullPackageSource; +import org.eclipse.osgi.internal.loader.sources.PackageSource; +import org.eclipse.osgi.internal.loader.sources.SingleSourcePackage; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.util.ManifestElement; -import org.osgi.framework.*; -import org.osgi.framework.namespace.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.namespace.BundleNamespace; +import org.osgi.framework.namespace.HostNamespace; +import org.osgi.framework.namespace.PackageNamespace; import org.osgi.framework.wiring.BundleWiring; /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java index 926072e8a..bfa5cfe88 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/SystemBundleLoader.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2016 IBM Corporation and others. + * Copyright (c) 2003, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,8 +15,10 @@ import java.io.IOException; import java.net.URL; import java.util.Collection; import java.util.Enumeration; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.storage.BundleInfo.Generation; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java index 5cda709d7..c905d2832 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/BundleInfo.java @@ -10,14 +10,28 @@ *******************************************************************************/ package org.eclipse.osgi.storage; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.security.ProtectionDomain; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; import java.util.concurrent.TimeUnit; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.ModuleContainerAdaptor.ModuleEvent; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; import org.eclipse.osgi.framework.log.FrameworkLogEntry; import org.eclipse.osgi.framework.util.CaseInsensitiveDictionaryMap; import org.eclipse.osgi.internal.container.LockSet; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java index b3f084593..9c7f09b93 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/FrameworkExtensionInstaller.java @@ -15,9 +15,17 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; -import java.security.*; -import java.util.*; -import org.eclipse.osgi.container.*; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleCapability; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.framework.util.ArrayMap; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; @@ -26,7 +34,11 @@ import org.eclipse.osgi.internal.hookregistry.HookRegistry; import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.util.NLS; -import org.osgi.framework.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.FrameworkEvent; import org.osgi.framework.namespace.HostNamespace; import org.osgi.framework.wiring.BundleWiring; import org.osgi.resource.Capability; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java index 7fc5223ce..92fa074a4 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/ManifestLocalization.java @@ -13,9 +13,20 @@ package org.eclipse.osgi.storage; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.List; +import java.util.Locale; import java.util.Map.Entry; -import org.eclipse.osgi.container.*; +import java.util.MissingResourceException; +import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.framework.util.CaseInsensitiveDictionaryMap; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.osgi.framework.Constants; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java index 9548fe962..340e20d50 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java @@ -10,19 +10,61 @@ *******************************************************************************/ package org.eclipse.osgi.storage; -import java.io.*; -import java.net.*; -import java.security.*; -import java.util.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.StringTokenizer; import org.eclipse.core.runtime.adaptor.EclipseStarter; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleCapability; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleContainerAdaptor; +import org.eclipse.osgi.container.ModuleDatabase; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleRevisionBuilder; import org.eclipse.osgi.container.ModuleRevisionBuilder.GenericInfo; +import org.eclipse.osgi.container.ModuleWire; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory; import org.eclipse.osgi.container.namespaces.EclipsePlatformNamespace; import org.eclipse.osgi.framework.log.FrameworkLogEntry; -import org.eclipse.osgi.framework.util.*; +import org.eclipse.osgi.framework.util.FilePath; +import org.eclipse.osgi.framework.util.ObjectPool; +import org.eclipse.osgi.framework.util.SecureAction; import org.eclipse.osgi.internal.debug.Debug; -import org.eclipse.osgi.internal.framework.*; +import org.eclipse.osgi.internal.framework.EquinoxConfiguration; +import org.eclipse.osgi.internal.framework.EquinoxContainer; +import org.eclipse.osgi.internal.framework.EquinoxContainerAdaptor; +import org.eclipse.osgi.internal.framework.FilterImpl; import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook; import org.eclipse.osgi.internal.hookregistry.StorageHookFactory; import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook; @@ -34,16 +76,33 @@ import org.eclipse.osgi.internal.permadmin.SecurityAdmin; import org.eclipse.osgi.internal.url.URLStreamHandlerFactoryImpl; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.osgi.storage.BundleInfo.Generation; -import org.eclipse.osgi.storage.bundlefile.*; +import org.eclipse.osgi.storage.bundlefile.BundleEntry; +import org.eclipse.osgi.storage.bundlefile.BundleFile; +import org.eclipse.osgi.storage.bundlefile.BundleFileWrapper; +import org.eclipse.osgi.storage.bundlefile.BundleFileWrapperChain; +import org.eclipse.osgi.storage.bundlefile.DirBundleFile; +import org.eclipse.osgi.storage.bundlefile.MRUBundleFileList; +import org.eclipse.osgi.storage.bundlefile.NestedDirBundleFile; +import org.eclipse.osgi.storage.bundlefile.ZipBundleFile; import org.eclipse.osgi.storage.url.reference.Handler; import org.eclipse.osgi.storage.url.reference.ReferenceInputStream; import org.eclipse.osgi.storagemanager.ManagedOutputStream; import org.eclipse.osgi.storagemanager.StorageManager; import org.eclipse.osgi.util.ManifestElement; import org.eclipse.osgi.util.NLS; -import org.osgi.framework.*; -import org.osgi.framework.namespace.*; -import org.osgi.framework.wiring.*; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; +import org.osgi.framework.Filter; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.Version; +import org.osgi.framework.namespace.HostNamespace; +import org.osgi.framework.namespace.NativeNamespace; +import org.osgi.framework.namespace.PackageNamespace; +import org.osgi.framework.wiring.BundleCapability; +import org.osgi.framework.wiring.BundleRevision; +import org.osgi.framework.wiring.BundleWiring; import org.osgi.resource.Namespace; import org.osgi.resource.Requirement; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java index 3565735d9..e96eb1445 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleentry/Handler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * Copyright (c) 2004, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,9 @@ package org.eclipse.osgi.storage.url.bundleentry; import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.internal.location.LocationHelper; import org.eclipse.osgi.storage.BundleInfo; import org.eclipse.osgi.storage.bundlefile.BundleEntry; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java index e77146525..f0fbabdde 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/url/bundleresource/Handler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2012 IBM Corporation and others. + * Copyright (c) 2004, 2017 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,10 @@ package org.eclipse.osgi.storage.url.bundleresource; import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import org.eclipse.osgi.container.*; +import org.eclipse.osgi.container.Module; +import org.eclipse.osgi.container.ModuleContainer; +import org.eclipse.osgi.container.ModuleRevision; +import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.internal.loader.ModuleClassLoader; import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.storage.url.BundleResourceHandler; |