Move org.eclipse.osgi.baseadaptor.loader to org.eclipse.osgi.internal.loader.classpath

19 files changed, 37 insertions, 24 deletions

diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index aaa95b429..2abcdef64 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -44,7 +44,6 @@ Export-Package: org.eclipse.osgi.container;version="1.0",
  org.eclipse.core.runtime.internal.stats;x-friends:="org.eclipse.core.runtime",
  org.eclipse.osgi.baseadaptor;x-internal:=true,
  org.eclipse.osgi.baseadaptor.hooks;x-internal:=true,
- org.eclipse.osgi.baseadaptor.loader;x-internal:=true,
  org.eclipse.osgi.framework.adaptor;x-internal:=true,
  org.eclipse.osgi.framework.internal.core;x-internal:=true,
  org.eclipse.osgi.framework.internal.protocol;x-internal:=true,
@@ -58,6 +57,7 @@ Export-Package: org.eclipse.osgi.container;version="1.0",
  org.eclipse.osgi.internal.framework;x-internal:=true,
  org.eclipse.osgi.internal.location;x-internal:=true,
  org.eclipse.osgi.internal.loader;x-internal:=true,
+ org.eclipse.osgi.internal.loader.classpath;x-internal:=true,
  org.eclipse.osgi.internal.loader.buddy; x-internal:=true,
  org.eclipse.osgi.internal.loader.sources;x-internal:=true,
  org.eclipse.osgi.internal.module;x-internal:=true,
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ClasspathManifest.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ClasspathManifest.java
index e5f6c450c..411cbf21c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ClasspathManifest.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ClasspathManifest.java
@@ -11,13 +11,14 @@
 
 package org.eclipse.core.runtime.internal.adaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.jar.Manifest;
 import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.util.KeyedElement;
 
 public class ClasspathManifest implements KeyedElement {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java
index d56ff1d48..f62d138fd 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseClassLoadingHook.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.core.runtime.internal.adaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 import org.eclipse.osgi.storage.bundlefile.BundleFile;
 
@@ -24,7 +26,6 @@ import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import org.eclipse.osgi.baseadaptor.*;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingHook;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.adaptor.BundleProtectionDomain;
 import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegate;
 import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
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 8b3e35f82..4fe33eb41 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,9 @@
 
 package org.eclipse.core.runtime.internal.adaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.ClasspathEntry;
+import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import org.eclipse.osgi.internal.debug.Debug;
@@ -24,8 +27,6 @@ import java.util.*;
 import org.eclipse.osgi.baseadaptor.*;
 import org.eclipse.osgi.baseadaptor.hooks.AdaptorHook;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingStatsHook;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathEntry;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
 import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
 import org.eclipse.osgi.framework.adaptor.StatusException;
 import org.eclipse.osgi.framework.internal.core.*;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/stats/StatsManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/stats/StatsManager.java
index fe793b38d..7513a8d8c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/stats/StatsManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/stats/StatsManager.java
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.core.runtime.internal.stats;
 
+import org.eclipse.osgi.internal.loader.classpath.ClasspathEntry;
+import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import org.eclipse.osgi.internal.debug.Debug;
@@ -21,8 +24,6 @@ import java.util.*;
 import org.eclipse.osgi.baseadaptor.HookConfigurator;
 import org.eclipse.osgi.baseadaptor.HookRegistry;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingStatsHook;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathEntry;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
 import org.eclipse.osgi.framework.adaptor.BundleWatcher;
 import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
 import org.eclipse.osgi.util.ManifestElement;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/BaseData.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/BaseData.java
index 16888ab49..63fc1162f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/BaseData.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/BaseData.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.osgi.baseadaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.BaseClassLoader;
+import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 import org.eclipse.osgi.storage.bundlefile.BundleFile;
 
@@ -25,8 +28,6 @@ import java.security.PrivilegedAction;
 import java.util.*;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingHook;
 import org.eclipse.osgi.baseadaptor.hooks.StorageHook;
-import org.eclipse.osgi.baseadaptor.loader.BaseClassLoader;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
 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/osgi/baseadaptor/hooks/ClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingHook.java
index 9a0a5ea43..2547057a0 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingHook.java
@@ -11,13 +11,14 @@
 
 package org.eclipse.osgi.baseadaptor.hooks;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import org.eclipse.osgi.baseadaptor.BaseData;
 import org.eclipse.osgi.baseadaptor.HookRegistry;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.adaptor.*;
 
 /**
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java
index 8168f4d8a..ce553d565 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/hooks/ClassLoadingStatsHook.java
@@ -11,12 +11,13 @@
 
 package org.eclipse.osgi.baseadaptor.hooks;
 
+import org.eclipse.osgi.internal.loader.classpath.ClasspathEntry;
+import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import java.net.URL;
 import org.eclipse.osgi.baseadaptor.HookRegistry;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathEntry;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
 
 /**
  * A ClassLoadingStatsHook hooks into the <code>ClasspathManager</code> class.  This class allows 
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/BundleResourceHandler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/BundleResourceHandler.java
index 73294e5e9..57786b494 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/BundleResourceHandler.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/core/BundleResourceHandler.java
@@ -11,12 +11,13 @@
 
 package org.eclipse.osgi.framework.internal.core;
 
+import org.eclipse.osgi.internal.loader.classpath.BaseClassLoader;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import java.io.IOException;
 import java.net.*;
 import org.eclipse.osgi.baseadaptor.BaseAdaptor;
-import org.eclipse.osgi.baseadaptor.loader.BaseClassLoader;
 import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
 import org.eclipse.osgi.framework.internal.protocol.ProtocolActivator;
 import org.eclipse.osgi.internal.baseadaptor.AdaptorMsg;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/protocol/bundleresource/Handler.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/protocol/bundleresource/Handler.java
index 96cf8b1ae..6bc6ba471 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/protocol/bundleresource/Handler.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/framework/internal/protocol/bundleresource/Handler.java
@@ -11,14 +11,15 @@
 
 package org.eclipse.osgi.framework.internal.protocol.bundleresource;
 
+import org.eclipse.osgi.internal.loader.classpath.BaseClassLoader;
+import org.eclipse.osgi.internal.loader.classpath.ClasspathManager;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 import org.eclipse.osgi.baseadaptor.BaseAdaptor;
-import org.eclipse.osgi.baseadaptor.loader.BaseClassLoader;
-import org.eclipse.osgi.baseadaptor.loader.ClasspathManager;
 import org.eclipse.osgi.framework.internal.core.AbstractBundle;
 import org.eclipse.osgi.framework.internal.core.BundleResourceHandler;
 
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java
index 607ddd3a5..8efc935c8 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/BaseClassLoadingHook.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.osgi.internal.baseadaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import org.eclipse.osgi.internal.debug.Debug;
@@ -20,7 +22,6 @@ import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import org.eclipse.osgi.baseadaptor.BaseData;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingHook;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.adaptor.BundleProtectionDomain;
 import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegate;
 import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DefaultClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DefaultClassLoader.java
index f0df508dd..8a147d110 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DefaultClassLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DefaultClassLoader.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.osgi.internal.baseadaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -19,7 +21,6 @@ import java.security.*;
 import java.security.cert.Certificate;
 import java.util.*;
 import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.adaptor.*;
 import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
 import org.eclipse.osgi.internal.debug.Debug;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java
index 8043e830b..c93aa6dd7 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/DevClassLoadingHook.java
@@ -11,6 +11,8 @@
 
 package org.eclipse.osgi.internal.baseadaptor;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 import org.eclipse.osgi.storage.bundlefile.BundleFile;
 
@@ -19,7 +21,6 @@ import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import org.eclipse.osgi.baseadaptor.*;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingHook;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.adaptor.BundleProtectionDomain;
 import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegate;
 import org.eclipse.osgi.framework.util.KeyedElement;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/weaving/WeavingHookConfigurator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/weaving/WeavingHookConfigurator.java
index 0f6afe5d4..8c1789197 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/weaving/WeavingHookConfigurator.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/baseadaptor/weaving/WeavingHookConfigurator.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.osgi.internal.baseadaptor.weaving;
 
+import org.eclipse.osgi.internal.loader.classpath.*;
+
 import org.eclipse.osgi.storage.bundlefile.BundleEntry;
 
 import java.net.URL;
@@ -18,7 +20,6 @@ import java.util.*;
 import org.eclipse.osgi.baseadaptor.*;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingHook;
 import org.eclipse.osgi.baseadaptor.hooks.ClassLoadingStatsHook;
-import org.eclipse.osgi.baseadaptor.loader.*;
 import org.eclipse.osgi.framework.adaptor.BundleProtectionDomain;
 import org.eclipse.osgi.framework.adaptor.ClassLoaderDelegate;
 import org.eclipse.osgi.framework.internal.core.Framework;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/BaseClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/BaseClassLoader.java
index c125a7f9b..1a86bb86d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/BaseClassLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/BaseClassLoader.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.osgi.baseadaptor.loader;
+package org.eclipse.osgi.internal.loader.classpath;
 
 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/baseadaptor/loader/ClasspathEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
index 7d7f94791..b46ae5172 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/ClasspathEntry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.osgi.baseadaptor.loader;
+package org.eclipse.osgi.internal.loader.classpath;
 
 import org.eclipse.osgi.storage.bundlefile.BundleFile;
 
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
index 751d0e79b..de6f16dba 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/ClasspathManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.osgi.baseadaptor.loader;
+package org.eclipse.osgi.internal.loader.classpath;
 
 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/baseadaptor/loader/FragmentClasspath.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/FragmentClasspath.java
index db25e258c..3ba2b9f60 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/FragmentClasspath.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/FragmentClasspath.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.osgi.baseadaptor.loader;
+package org.eclipse.osgi.internal.loader.classpath;
 
 import java.io.IOException;
 import java.security.ProtectionDomain;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/ParallelClassLoader.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ParallelClassLoader.java
index fe26aca90..1e41ddb10 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/baseadaptor/loader/ParallelClassLoader.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ParallelClassLoader.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.osgi.baseadaptor.loader;
+package org.eclipse.osgi.internal.loader.classpath;
 
 /**
  * A parallel class loader.  Parallel class loaders are thread safe class loaders