diff options
author | Thomas Watson | 2012-07-17 13:38:05 +0000 |
---|---|---|
committer | Thomas Watson | 2012-07-17 13:38:05 +0000 |
commit | 6e9d57c89b3914c6c957317b908ea8bf11fec748 (patch) | |
tree | 60ed96750a2e8ea547184868acdaf4fd49c64455 | |
parent | 7e980cfb94c1eb742bf1c9986055e70373f76392 (diff) | |
download | rt.equinox.framework-6e9d57c89b3914c6c957317b908ea8bf11fec748.tar.gz rt.equinox.framework-6e9d57c89b3914c6c957317b908ea8bf11fec748.tar.xz rt.equinox.framework-6e9d57c89b3914c6c957317b908ea8bf11fec748.zip |
move location impl to org.eclipse.osgi.internal.location
27 files changed, 47 insertions, 14 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java index 00bf6da17..aa0219c5f 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/datalocation/LocationAreaSessionTest.java @@ -10,11 +10,12 @@ *******************************************************************************/ package org.eclipse.osgi.tests.services.datalocation; +import org.eclipse.osgi.internal.location.BasicLocation; + import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import junit.framework.*; -import org.eclipse.core.runtime.internal.adaptor.BasicLocation; import org.eclipse.core.tests.session.ConfigurationSessionTestSuite; import org.eclipse.core.tests.session.SetupManager.SetupException; import org.eclipse.osgi.service.datalocation.Location; diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF index 58a8719f4..e33940d15 100644 --- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF @@ -57,6 +57,7 @@ Export-Package: org.eclipse.osgi.container;version="1.0", org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true, org.eclipse.osgi.framework.util;x-internal:=true, org.eclipse.osgi.internal.baseadaptor;x-internal:=true, + org.eclipse.osgi.internal.location;x-internal:=true, org.eclipse.osgi.internal.loader;x-internal:=true, org.eclipse.osgi.internal.loader.buddy; x-internal:=true, org.eclipse.osgi.internal.module;x-internal:=true, diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java index 5783d5a9e..45a890cff 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java @@ -11,6 +11,9 @@ *******************************************************************************/ package org.eclipse.core.runtime.adaptor; +import org.eclipse.core.runtime.internal.adaptor.*; +import org.eclipse.osgi.internal.location.*; + import java.io.*; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -18,7 +21,6 @@ import java.net.*; import java.security.CodeSource; import java.security.ProtectionDomain; import java.util.*; -import org.eclipse.core.runtime.internal.adaptor.*; import org.eclipse.osgi.framework.adaptor.*; import org.eclipse.osgi.framework.internal.core.*; import org.eclipse.osgi.framework.internal.core.Constants; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/LocationManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/LocationManager.java index 2e06c32fc..ba3c9da69 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/LocationManager.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/LocationManager.java @@ -10,11 +10,13 @@ *******************************************************************************/ package org.eclipse.core.runtime.adaptor; +import org.eclipse.core.runtime.internal.adaptor.EclipseEnvironmentInfo; +import org.eclipse.osgi.internal.location.*; + import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; -import org.eclipse.core.runtime.internal.adaptor.*; import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor; import org.eclipse.osgi.framework.internal.core.Constants; import org.eclipse.osgi.framework.internal.core.FrameworkProperties; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/CachedManifest.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/CachedManifest.java index 550c2e24b..94f1cccc5 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/CachedManifest.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/CachedManifest.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.util.Dictionary; import java.util.Enumeration; import org.eclipse.osgi.framework.adaptor.BundleData; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java index 657e6be86..19bb3e9c3 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java @@ -11,6 +11,9 @@ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.BasicLocation; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.IOException; import java.net.URLConnection; import java.util.*; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java index a4106fdb6..faefac797 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java @@ -11,6 +11,8 @@ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.lang.reflect.Method; import java.util.Map; import org.eclipse.core.runtime.adaptor.EclipseStarter; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java index 0d091d7f4..ad31d5a50 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.util.*; import org.eclipse.osgi.framework.internal.core.FrameworkProperties; import org.eclipse.osgi.service.environment.Constants; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java index afad88113..0598fdd41 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseErrorHandler.java @@ -11,6 +11,8 @@ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.IOException; import java.net.URLConnection; import java.util.Properties; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java index e1c34d4df..4da8ca675 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseLazyStarter.java @@ -11,6 +11,8 @@ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.IOException; import java.net.URL; import java.net.URLConnection; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java index 78aa333aa..a239860c6 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java @@ -11,6 +11,8 @@ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.*; import java.net.URL; import java.security.*; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/MessageHelper.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/MessageHelper.java index e1cf601b1..f2b5de3c9 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/MessageHelper.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/MessageHelper.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.util.Date; import org.eclipse.osgi.service.resolver.*; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java index fe1447f2e..ca74b1d72 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.*; import java.util.*; import java.util.zip.ZipEntry; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java index 1448b28ff..e9b40d3d0 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/PluginParser.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.InputStream; import java.util.*; import javax.xml.parsers.SAXParserFactory; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/URLConverterImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/URLConverterImpl.java index c197861e9..d109b4e47 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/URLConverterImpl.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/URLConverterImpl.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.core.runtime.internal.adaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.IOException; import java.net.URL; import java.net.URLConnection; 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 3ff383ca4..877c49248 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 @@ -11,6 +11,8 @@ package org.eclipse.osgi.internal.baseadaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -18,7 +20,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Dictionary; import java.util.Hashtable; -import org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorMsg; import org.eclipse.osgi.baseadaptor.BaseData; import org.eclipse.osgi.framework.debug.Debug; import org.eclipse.osgi.framework.internal.core.Constants; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java index cd6845667..1b837e19f 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java @@ -12,6 +12,8 @@ package org.eclipse.osgi.internal.baseadaptor; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -19,7 +21,6 @@ import java.net.*; import java.util.*; import org.eclipse.core.runtime.adaptor.EclipseStarter; import org.eclipse.core.runtime.adaptor.LocationManager; -import org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorMsg; import org.eclipse.osgi.baseadaptor.BaseAdaptor; import org.eclipse.osgi.baseadaptor.BaseData; import org.eclipse.osgi.baseadaptor.bundlefile.*; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java index 7767c0512..c44045758 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java @@ -8,13 +8,14 @@ *******************************************************************************/ package org.eclipse.osgi.framework.internal.core; +import org.eclipse.osgi.internal.location.EclipseAdaptorMsg; + import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; import java.net.URL; import java.net.URLDecoder; import java.security.CodeSource; import java.util.*; -import org.eclipse.core.runtime.internal.adaptor.EclipseAdaptorMsg; import org.eclipse.osgi.util.NLS; /* diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java index 9582ee5f5..ccc07f32a 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java @@ -71,7 +71,7 @@ public class ReliableFile { */ public static final String PROP_MAX_GENERATIONS = "osgi.ReliableFile.maxGenerations"; //$NON-NLS-1$ /** - * @see org.eclipse.core.runtime.internal.adaptor.BasicLocation#PROP_OSGI_LOCKING + * @see org.eclipse.osgi.internal.location.BasicLocation#PROP_OSGI_LOCKING */ public static final String PROP_OSGI_LOCKING = "osgi.locking"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/BasicLocation.java index aa5d1f44b..9892e470c 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/BasicLocation.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/BasicLocation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.core.runtime.internal.adaptor; +package org.eclipse.osgi.internal.location; import java.io.File; import java.io.IOException; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMessages.properties index 4e67bcb00..4e67bcb00 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorMessages.properties +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMessages.properties diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorMsg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMsg.java index 4b965a35a..8676ac1d9 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorMsg.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/EclipseAdaptorMsg.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.core.runtime.internal.adaptor; +package org.eclipse.osgi.internal.location; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/LocationHelper.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java index 0180bf04c..a8ee6af5c 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/LocationHelper.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/LocationHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.core.runtime.internal.adaptor; +package org.eclipse.osgi.internal.location; import java.io.File; import java.net.MalformedURLException; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java index 0031f5ed6..91c224e7d 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.core.runtime.internal.adaptor; +package org.eclipse.osgi.internal.location; import java.io.IOException; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker_JavaIo.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java index a0e16699c..ebd96c94f 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker_JavaIo.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaIo.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.core.runtime.internal.adaptor; +package org.eclipse.osgi.internal.location; import java.io.*; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker_JavaNio.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java index 3009b12a9..69657b699 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/Locker_JavaNio.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/internal/location/Locker_JavaNio.java @@ -10,7 +10,7 @@ * Danail Nachev (Prosyst) - bug 185654 * Andrei Loskutov - bug 44735 *******************************************************************************/ -package org.eclipse.core.runtime.internal.adaptor; +package org.eclipse.osgi.internal.location; import java.io.*; import java.nio.channels.FileLock; diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java index 396e0e8fc..3ac630ac3 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java @@ -10,10 +10,11 @@ *******************************************************************************/ package org.eclipse.osgi.storagemanager; +import org.eclipse.osgi.internal.location.*; + import java.io.*; import java.security.AccessController; import java.util.*; -import org.eclipse.core.runtime.internal.adaptor.*; import org.eclipse.osgi.framework.internal.reliablefile.*; import org.eclipse.osgi.framework.util.SecureAction; |