diff options
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src')
18 files changed, 19 insertions, 28 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/AdaptorUtil.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/AdaptorUtil.java index 5f61ccaf8..0003d782c 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/AdaptorUtil.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/AdaptorUtil.java @@ -70,13 +70,6 @@ public class AdaptorUtil { while ((count = in.read(buffer, 0, buffer.length)) > 0) { fos.write(buffer, 0, count); } - } catch (IOException e) { - if (Debug.DEBUG_GENERAL) { - Debug.println("Unable to read file"); //$NON-NLS-1$ - Debug.printStackTrace(e); - } - - throw e; } finally { if (in != null) { try { @@ -114,7 +107,7 @@ public class AdaptorUtil { } } } - if (Debug.DEBUG_GENERAL) { + if (Debug.STATIC_DEBUG_GENERAL) { if (file.isDirectory()) { Debug.println("rmdir " + file.getPath()); //$NON-NLS-1$ } else { @@ -124,7 +117,7 @@ public class AdaptorUtil { boolean success = file.delete(); - if (Debug.DEBUG_GENERAL) { + if (Debug.STATIC_DEBUG_GENERAL) { if (!success) { Debug.println(" rm failed!!"); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java index bd858f00c..ed8cd9e9a 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/AliasMapper.java @@ -147,9 +147,7 @@ public class AliasMapper { } } } catch (IOException e) { - if (Debug.DEBUG_GENERAL) { - Debug.printStackTrace(e); - } + Debug.printStackTrace(e); } return aliases; } diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java index ea940cead..e9987f253 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java @@ -20,9 +20,9 @@ import org.eclipse.osgi.container.ModuleWiring; import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.framework.eventmgr.EventDispatcher; import org.eclipse.osgi.framework.internal.core.Msg; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.loader.BundleLoader; import org.eclipse.osgi.internal.serviceregistry.*; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java index f76b8fb09..4cb2dd3b6 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java @@ -15,11 +15,11 @@ import java.lang.reflect.Method; import java.net.*; import java.security.CodeSource; import java.util.*; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.debug.FrameworkDebugOptions; import org.eclipse.osgi.internal.hookregistry.HookRegistry; import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; import org.eclipse.osgi.internal.location.EquinoxLocations; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.service.debug.DebugOptions; import org.eclipse.osgi.service.environment.Constants; import org.eclipse.osgi.service.environment.EnvironmentInfo; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java index 3d12b4173..f3f40db07 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxEventPublisher.java @@ -14,9 +14,9 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.*; import org.eclipse.osgi.framework.eventmgr.*; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.serviceregistry.HookContext; import org.eclipse.osgi.internal.serviceregistry.ShrinkableCollection; -import org.eclipse.osgi.next.internal.debug.Debug; import org.osgi.framework.*; import org.osgi.framework.hooks.bundle.CollisionHook; import org.osgi.framework.hooks.bundle.EventHook; 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 80e2d2698..3057cc07e 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 @@ -18,8 +18,8 @@ import org.eclipse.osgi.container.ModuleCollisionHook; import org.eclipse.osgi.container.namespaces.EquinoxNativeCodeNamespace; import org.eclipse.osgi.framework.internal.core.Msg; import org.eclipse.osgi.internal.baseadaptor.ArrayMap; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.serviceregistry.*; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; import org.osgi.framework.hooks.bundle.CollisionHook; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java index 0ae93fdac..0813c3811 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java @@ -14,6 +14,7 @@ package org.eclipse.osgi.internal.framework; import java.util.*; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.debug.FrameworkDebugOptions; import org.eclipse.osgi.internal.hookregistry.ActivatorHookFactory; import org.eclipse.osgi.internal.hookregistry.HookRegistry; @@ -21,7 +22,6 @@ import org.eclipse.osgi.internal.location.EquinoxLocations; import org.eclipse.osgi.internal.permadmin.EquinoxSecurityManager; import org.eclipse.osgi.internal.permadmin.SecurityAdmin; import org.eclipse.osgi.internal.url.EquinoxFactoryManager; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.osgi.service.debug.DebugOptions; import org.eclipse.osgi.service.environment.EnvironmentInfo; 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 34076f6bf..042e91f83 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 @@ -25,11 +25,11 @@ import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.framework.adaptor.StatusException; import org.eclipse.osgi.framework.util.KeyedElement; import org.eclipse.osgi.framework.util.KeyedHashSet; +import org.eclipse.osgi.internal.debug.Debug; 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.next.internal.debug.Debug; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.util.ManifestElement; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java index 92c754af7..d8524a169 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/ModuleClassLoader.java @@ -18,10 +18,10 @@ import java.net.URL; import java.security.*; import java.security.cert.Certificate; import java.util.*; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.loader.classpath.ClasspathEntry; import org.eclipse.osgi.internal.loader.classpath.ClasspathManager; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.signedcontent.SignedContent; import org.eclipse.osgi.signedcontent.SignerInfo; import org.eclipse.osgi.storage.BundleInfo.Generation; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java index c9f53dfe7..d166e5043 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java @@ -21,11 +21,11 @@ import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.container.namespaces.EquinoxModuleDataNamespace; import org.eclipse.osgi.internal.baseadaptor.AdaptorMsg; import org.eclipse.osgi.internal.baseadaptor.ArrayMap; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; import org.eclipse.osgi.internal.hookregistry.HookRegistry; import org.eclipse.osgi.internal.loader.ModuleClassLoader; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.storage.*; import org.eclipse.osgi.storage.bundlefile.BundleEntry; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java index a0429bcdc..6bdcab5c3 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java @@ -11,9 +11,9 @@ package org.eclipse.osgi.internal.serviceregistry; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.BundleContextImpl; import org.eclipse.osgi.internal.framework.FilterImpl; -import org.eclipse.osgi.next.internal.debug.Debug; import org.osgi.framework.*; import org.osgi.framework.hooks.service.ListenerHook; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java index 0de45aa04..3cc4de094 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java @@ -13,9 +13,9 @@ package org.eclipse.osgi.internal.serviceregistry; import java.util.*; import org.eclipse.osgi.framework.internal.core.Msg; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.BundleContextImpl; import org.eclipse.osgi.internal.loader.sources.PackageSource; -import org.eclipse.osgi.next.internal.debug.Debug; import org.osgi.framework.*; /** diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java index f95a5a36c..3b4cbdc2f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java @@ -17,9 +17,9 @@ import org.eclipse.osgi.container.Module; import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.framework.eventmgr.*; import org.eclipse.osgi.framework.internal.core.Msg; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.BundleContextImpl; import org.eclipse.osgi.internal.framework.EquinoxContainer; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java index 51deac949..bf5fc7221 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java @@ -14,8 +14,8 @@ package org.eclipse.osgi.internal.serviceregistry; import java.security.AccessController; import java.security.PrivilegedAction; import org.eclipse.osgi.framework.internal.core.Msg; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.BundleContextImpl; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; 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 671d5f2be..13cd7dad3 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 @@ -20,11 +20,11 @@ import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.framework.log.FrameworkLogEntry; import org.eclipse.osgi.framework.util.Headers; import org.eclipse.osgi.internal.container.LockSet; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.eclipse.osgi.internal.framework.EquinoxContainer; import org.eclipse.osgi.internal.hookregistry.StorageHookFactory; import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.storage.bundlefile.BundleFile; import org.eclipse.osgi.storage.url.BundleResourceHandler; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java index f462338cf..2ffbc3043 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/NativeCodeFinder.java @@ -15,8 +15,8 @@ import java.io.File; import java.util.*; import org.eclipse.osgi.container.*; import org.eclipse.osgi.container.namespaces.EquinoxNativeCodeNamespace; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.storage.bundlefile.BundleEntry; import org.eclipse.osgi.storage.bundlefile.BundleFile; 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 7f4248752..676f31ac1 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 @@ -27,12 +27,12 @@ import org.eclipse.osgi.framework.util.SecureAction; import org.eclipse.osgi.internal.baseadaptor.AdaptorMsg; import org.eclipse.osgi.internal.baseadaptor.AdaptorUtil; import org.eclipse.osgi.internal.container.LockSet; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.internal.framework.*; import org.eclipse.osgi.internal.hookregistry.*; import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook; import org.eclipse.osgi.internal.log.EquinoxLogServices; import org.eclipse.osgi.internal.permadmin.SecurityAdmin; -import org.eclipse.osgi.next.internal.debug.Debug; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.osgi.storage.BundleInfo.Generation; import org.eclipse.osgi.storage.bundlefile.*; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java index 3611ad4ec..beeadf945 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/bundlefile/ZipBundleFile.java @@ -20,7 +20,7 @@ import org.eclipse.osgi.container.ModuleContainerAdaptor.ContainerEvent; import org.eclipse.osgi.container.ModuleRevision; import org.eclipse.osgi.internal.baseadaptor.AdaptorMsg; import org.eclipse.osgi.internal.baseadaptor.AdaptorUtil; -import org.eclipse.osgi.next.internal.debug.Debug; +import org.eclipse.osgi.internal.debug.Debug; import org.eclipse.osgi.storage.BundleInfo; import org.eclipse.osgi.util.NLS; |