diff options
author | John Arthorne | 2008-02-10 22:46:21 +0000 |
---|---|---|
committer | John Arthorne | 2008-02-10 22:46:21 +0000 |
commit | fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8 (patch) | |
tree | cbc0dd1a91f0f6079e9b8397e6e169c79490e40e | |
parent | e615dae2244101e844d0851f3d9c8c754ffaffe0 (diff) | |
download | rt.equinox.p2-fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8.tar.gz rt.equinox.p2-fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8.tar.xz rt.equinox.p2-fa3dae8f4fb19d14dd04f4e00669a215cc6a13c8.zip |
Bug 218451 [prov] Rename API packages to provisional API
472 files changed, 1756 insertions, 1797 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.optimizers/META-INF/MANIFEST.MF index 04d15234a..394e09269 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/META-INF/MANIFEST.MF @@ -10,14 +10,14 @@ Import-Package: ie.wombat.jbdiff, org.eclipse.equinox.app;version="1.0.0", org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.metadata, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.artifact.repository.processing, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.jarprocessor, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.sar, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.p2.sar, + org.eclipse.internal.provisional.equinox.p2.jarprocessor, org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0" Eclipse-LazyStart: true diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractBufferingStep.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractBufferingStep.java index c594065fa..c2c6986cf 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractBufferingStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractBufferingStep.java @@ -14,7 +14,7 @@ package org.eclipse.equinox.internal.p2.artifact.optimizers; import java.io.*; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; public abstract class AbstractBufferingStep extends ProcessingStep { protected static final String JAR_SUFFIX = ".jar"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java index be9158772..3af0f9bed 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/AbstractDeltaStep.java @@ -14,9 +14,9 @@ import java.io.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * The <code>AbstractDeltaDiffStep</code> is an abstract processing step that diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java index fcaf292f6..ff7f5e60b 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/VersionlessArtifactKey.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.artifact.optimizers; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.osgi.framework.Version; public class VersionlessArtifactKey extends ArtifactKey { diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Application.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Application.java index 0a51f72dc..09069629d 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Application.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Application.java @@ -15,9 +15,9 @@ import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.artifact.optimizers.Activator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * The optimizer <code>Application</code> for JBDiff based optimizations. diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/JarDeltaOptimizerStep.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/JarDeltaOptimizerStep.java index ffb2e626a..311bba673 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/JarDeltaOptimizerStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/JarDeltaOptimizerStep.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.optimizers.AbstractDeltaStep; import org.eclipse.equinox.internal.p2.artifact.optimizers.Activator; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; /** * The JAR delta expects an input containing normal ".jar" data. diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java index 75c00d6d1..81fa27574 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jardelta/Optimizer.java @@ -24,13 +24,9 @@ import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.osgi.framework.Version; public class Optimizer { diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Application.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Application.java index a88640902..bd2b08cb9 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Application.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Application.java @@ -15,9 +15,9 @@ import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.artifact.optimizers.Activator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * The optimizer <code>Application</code> for JBDiff based optimizations. diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffStep.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffStep.java index 5904b63be..4faae4fba 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffStep.java @@ -15,9 +15,9 @@ import ie.wombat.jbdiff.JBDiff; import java.io.*; import org.eclipse.equinox.internal.p2.artifact.optimizers.AbstractDeltaStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.sar.DirectByteArrayOutputStream; +import org.eclipse.equinox.internal.p2.sar.DirectByteArrayOutputStream; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; /** * diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffZipStep.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffZipStep.java index c53339f09..641a30b15 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffZipStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/JBDiffZipStep.java @@ -15,10 +15,10 @@ import ie.wombat.jbdiff.JBDiff; import java.io.ByteArrayInputStream; import java.io.IOException; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.sar.DirectByteArrayOutputStream; -import org.eclipse.equinox.p2.sar.SarUtil; +import org.eclipse.equinox.internal.p2.sar.DirectByteArrayOutputStream; +import org.eclipse.equinox.internal.p2.sar.SarUtil; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; public class JBDiffZipStep extends JBDiffStep { diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java index 995e39f2a..c70573617 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/jbdiff/Optimizer.java @@ -24,13 +24,9 @@ import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.VersionlessArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; public class Optimizer { diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Application.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Application.java index cd1ae2b4f..d67831804 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Application.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Application.java @@ -15,9 +15,9 @@ import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.artifact.optimizers.Activator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; public class Application implements IApplication { //Application return code diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java index 0ba403216..e87639c9d 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Optimizer.java @@ -12,9 +12,9 @@ import java.io.IOException; import java.io.OutputStream; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.osgi.util.NLS; public class Optimizer { diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Pack200OptimizerStep.java b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Pack200OptimizerStep.java index a1a00e38b..768a47e93 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Pack200OptimizerStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/src/org/eclipse/equinox/internal/p2/artifact/optimizers/pack200/Pack200OptimizerStep.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.optimizers.AbstractBufferingStep; import org.eclipse.equinox.internal.p2.artifact.optimizers.Activator; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor; -import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor.Options; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor.Options; /** * The Pack200Packer expects an input containing normal ".jar" data. diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF index b91977ac3..ba8d87fec 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF @@ -14,13 +14,13 @@ Import-Package: ie.wombat.jbdiff, org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.jarprocessor, org.eclipse.equinox.internal.p2.metadata, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.artifact.repository.processing, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.jarprocessor, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.sar + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.p2.sar, + org.eclipse.internal.provisional.equinox.p2.jarprocessor Bundle-Vendor: %providerName Export-Package: org.eclipse.equinox.internal.p2.artifact.processors;x-internal:=true, org.eclipse.equinox.internal.p2.artifact.processors.jardelta;x-internal:=true, diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java index eb7324e65..6a04f73bf 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java @@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.optimizers.AbstractDeltaStep; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * The <code>AbstractDeltaPatchStep</code> is an abstract processing step that diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/Activator.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/Activator.java index 9de6886df..847e5ab57 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/Activator.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/Activator.java @@ -15,7 +15,7 @@ import org.osgi.framework.BundleContext; public class Activator implements BundleActivator { - public static final String ID = "org.eclipse.equinox.p2.artifact.processor"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.equinox.p2.artifact.processors"; //$NON-NLS-1$ private static BundleContext context = null; public static BundleContext getContext() { diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java index e9e6fed37..1cdfcb16e 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.processors.AbstractDeltaProcessorStep; import org.eclipse.equinox.internal.p2.artifact.processors.Activator; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; /** * Processor that takes a JAR delta and applies it. diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchStep.java index c5d526217..f8589afc0 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchStep.java @@ -15,8 +15,8 @@ import ie.wombat.jbdiff.JBPatch; import java.io.*; import org.eclipse.equinox.internal.p2.artifact.processors.AbstractDeltaProcessorStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.sar.DirectByteArrayOutputStream; +import org.eclipse.equinox.internal.p2.sar.DirectByteArrayOutputStream; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; /** * The JBPatchStep patches a JBDiff based data. diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchZipStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchZipStep.java index 0f2865b6a..798a67b4b 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchZipStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jbdiff/JBPatchZipStep.java @@ -14,9 +14,9 @@ package org.eclipse.equinox.internal.p2.artifact.processors.jbdiff; import ie.wombat.jbdiff.JBPatch; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.sar.DirectByteArrayOutputStream; -import org.eclipse.equinox.p2.sar.SarUtil; +import org.eclipse.equinox.internal.p2.sar.DirectByteArrayOutputStream; +import org.eclipse.equinox.internal.p2.sar.SarUtil; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; /** * The <code>JBPatchZipStep</code> patches a JBDiff based diff of zips/jars. diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java index 3402cf240..a218fe511 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/pack200/Pack200ProcessorStep.java @@ -17,10 +17,10 @@ import org.eclipse.equinox.internal.p2.artifact.optimizers.AbstractBufferingStep import org.eclipse.equinox.internal.p2.artifact.processors.Activator; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor; -import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor.Options; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor.Options; /** diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/verifier/MD5Verifier.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/verifier/MD5Verifier.java index 4559d6d9b..ac42ba9c6 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/verifier/MD5Verifier.java +++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/verifier/MD5Verifier.java @@ -17,9 +17,9 @@ import java.security.NoSuchAlgorithmException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.processors.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; public class MD5Verifier extends ProcessingStep { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF index faeb77c5e..256bcf701 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Bundle-Version: 0.1.0.qualifier Export-Package: org.eclipse.equinox.internal.p2.artifact.mirror;x-internal:=true, org.eclipse.equinox.internal.p2.artifact.repository;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.tests", org.eclipse.equinox.internal.p2.artifact.repository.simple;x-friends:="org.eclipse.equinox.p2.selfhosting,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.tests", - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.artifact.repository.processing, - org.eclipse.equinox.spi.p2.artifact.repository + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, + org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository Import-Package: javax.xml.parsers, org.eclipse.core.runtime.jobs, org.eclipse.core.runtime.preferences;resolution:=optional, @@ -19,12 +19,12 @@ Import-Package: javax.xml.parsers, org.eclipse.equinox.internal.p2.jarprocessor;resolution:=optional, org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.persistence, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.jarprocessor;resolution:=optional, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.spi.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository, + org.eclipse.internal.provisional.equinox.p2.jarprocessor;resolution:=optional, org.eclipse.osgi.internal.provisional.verifier, org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.1.0", diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml b/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml index 08d9a0512..e588fda63 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml @@ -6,7 +6,7 @@ <extension id="simpleRepository" point="org.eclipse.equinox.p2.artifact.repository.artifactRepositories"> <filter suffix="artifacts.xml"/> - <factory class="org.eclipse.equinox.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory"/> + <factory class="org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory"/> </extension> <extension diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java index 92a87481a..a60438664 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/Mirror.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.p2.artifact.mirror; import java.io.IOException; import java.io.OutputStream; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; public class Mirror { private IArtifactRepository source; diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java index 2bbd4918b..c533ce1f6 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/mirror/MirrorApplication.java @@ -16,9 +16,9 @@ import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; public class MirrorApplication implements IApplication { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java index 12d377df9..2794b686a 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.artifact.repository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; import org.osgi.framework.*; public class Activator implements BundleActivator { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java index a9c69a0dd..4f67ea050 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java @@ -17,12 +17,12 @@ import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; import org.eclipse.equinox.internal.p2.core.helpers.*; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.spi.p2.artifact.repository.IArtifactRepositoryFactory; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.IArtifactRepositoryFactory; import org.eclipse.osgi.util.NLS; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -254,7 +254,7 @@ public class ArtifactRepositoryManager implements IArtifactRepositoryManager { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager#getRepositoryProperty(java.net.URL, java.lang.String) + * @see org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager#getRepositoryProperty(java.net.URL, java.lang.String) */ public String getRepositoryProperty(URL location, String key) { synchronized (repositoryLock) { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java index 3645c4f7d..3e9ffd1de 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.p2.artifact.repository; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * Base class for all requests on an {@link IArtifactRepository}. diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java index 12dd9d899..24bc69f4e 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java @@ -18,7 +18,7 @@ import org.eclipse.ecf.filetransfer.identity.FileCreateException; import org.eclipse.ecf.filetransfer.identity.FileIDFactory; import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; -import org.eclipse.equinox.p2.artifact.repository.IStateful; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful; import org.osgi.util.tracker.ServiceTracker; /** diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java index f3d34ff54..8c2b4fad9 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.artifact.repository; import java.io.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.osgi.util.NLS; public class FileDownloadRequest extends ArtifactRequest { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java index 1ff643c5d..9e9fac6d2 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java @@ -14,10 +14,10 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Properties; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.osgi.util.NLS; public class MirrorRequest extends ArtifactRequest { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java index 72f4c6adc..afa87c3a1 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.osgi.internal.provisional.verifier.CertificateVerifier; import org.eclipse.osgi.internal.provisional.verifier.CertificateVerifierFactory; diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/DownloadJob.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/DownloadJob.java index bd436ddc1..df12dc1e1 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/DownloadJob.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/DownloadJob.java @@ -13,7 +13,7 @@ import java.util.LinkedList; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRequest; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest; import org.eclipse.osgi.util.NLS; public class DownloadJob extends Job { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java index 38c20ebc2..04c5b099d 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java @@ -20,12 +20,12 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.p2.artifact.repository.*; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.spi.p2.artifact.repository.AbstractArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository; import org.eclipse.osgi.util.NLS; public class SimpleArtifactRepository extends AbstractArtifactRepository implements IArtifactRepository, IFileArtifactRepository { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java index de1179741..4990e05af 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepositoryIO.java @@ -22,11 +22,11 @@ import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.persistence.XMLParser; import org.eclipse.equinox.internal.p2.persistence.XMLWriter; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; import org.osgi.framework.BundleContext; diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/ArtifactDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/ArtifactDescriptor.java index 4bc3b66f0..2de893a4f 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/ArtifactDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/ArtifactDescriptor.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import java.util.Arrays; import java.util.Map; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * This represents information about a given artifact stored on a particular byte server. diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactDescriptor.java index eb12b8429..f6c1b9167 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactDescriptor.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import java.util.Map; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; public interface IArtifactDescriptor { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepository.java index bd4e5d6f0..f3560cda4 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepository.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import java.io.OutputStream; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.spi.p2.artifact.repository.AbstractArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository; /** * A repository containing artifacts. diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java index b4ad5460b..f63b327f9 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRepositoryManager.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import java.net.URL; import java.util.Properties; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; public interface IArtifactRepositoryManager { /** diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRequest.java index 50d863a47..16c039e9f 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRequest.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IArtifactRequest.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * This interface is not intended to be implemented by clients diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IFileArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IFileArtifactRepository.java index c23993441..c69754679 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IFileArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IFileArtifactRepository.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import java.io.File; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; public interface IFileArtifactRepository extends IArtifactRepository { /** diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IStateful.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IStateful.java index ffe59acc3..5d8d255c3 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IStateful.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/IStateful.java @@ -8,7 +8,7 @@ * Contributors: * compeople AG (Stefan Liebig) - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository; import org.eclipse.core.runtime.IStatus; diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStep.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java index 9d255cc0e..a9634f845 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStep.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStep.java @@ -9,15 +9,15 @@ * compeople AG (Stefan Liebig) - initial API and implementation * IBM Corporation - continuing development *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository.processing; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IStateful; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IStateful; /** * ProcessingSteps process the data written to them and pass the resultant data on diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepDescriptor.java index a2f91f048..4320fb00b 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepDescriptor.java @@ -8,7 +8,7 @@ * Contributors: * compeople AG (Stefan Liebig) - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository.processing; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing; /** * The description of a processor step. diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepHandler.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java index 23fc25014..bdf0a41ff 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepHandler.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/p2/artifact/repository/processing/ProcessingStepHandler.java @@ -9,12 +9,12 @@ * compeople AG (Stefan Liebig) - initial API and implementation * IBM - continuing development *******************************************************************************/ -package org.eclipse.equinox.p2.artifact.repository.processing; +package org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing; import java.io.OutputStream; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; /** * Creates processing step instances from extensions and executes them. diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/AbstractArtifactRepository.java index 2d683d949..832c0a301 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/AbstractArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/AbstractArtifactRepository.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository; import java.io.OutputStream; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.core.helpers.URLUtil; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.spi.p2.core.repository.AbstractRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository; public abstract class AbstractArtifactRepository extends AbstractRepository implements IArtifactRepository { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/IArtifactRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/IArtifactRepositoryFactory.java index 2c9b4ef54..21e4f8b48 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/IArtifactRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/IArtifactRepositoryFactory.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; public interface IArtifactRepositoryFactory { diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java index 56d29f129..ca4279e53 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/artifact/repository/SimpleArtifactRepositoryFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.artifact.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository; import java.io.*; import java.net.URL; @@ -19,8 +19,8 @@ import org.eclipse.equinox.internal.p2.artifact.repository.*; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepositoryIO; import org.eclipse.equinox.internal.p2.core.helpers.Tracing; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.osgi.util.NLS; public class SimpleArtifactRepositoryFactory implements IArtifactRepositoryFactory { diff --git a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF index e27bda731..74873e871 100644 --- a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF @@ -11,15 +11,15 @@ Export-Package: org.eclipse.equinox.internal.p2.console;x-friends:="org.eclipse. Import-Package: org.eclipse.core.runtime;common=split, org.eclipse.equinox.configurator, org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional, org.eclipse.osgi.service.environment;version="1.0.0", org.eclipse.osgi.service.resolver;version="1.1.0", diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java index 2d36bc894..611113616 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.console; -import org.eclipse.equinox.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java index ba6ba6636..c7dbd56e7 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java @@ -15,15 +15,15 @@ import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.CapabilityQuery; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.CapabilityQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; import org.eclipse.osgi.service.resolver.VersionRange; diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java index 1080cc285..16fa7e123 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java @@ -17,16 +17,16 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.configurator.Configurator; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF index 73b1217ff..cdda4fef6 100644 --- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF @@ -42,12 +42,12 @@ Export-Package: org.eclipse.equinox.internal.p2.core;x-internal:=true, org.eclipse.equinox.p2.console, org.eclipse.equinox.p2.updatesite", org.eclipse.equinox.internal.p2.persistence;x-friends:="org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.metadata.repository", - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.spi.p2.core.repository + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository Eclipse-LazyStart: true Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: J2SE-1.4, diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java index 293628924..568f28cfc 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java @@ -14,7 +14,7 @@ import java.net.URL; import java.util.Dictionary; import java.util.Hashtable; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; import org.eclipse.osgi.framework.log.FrameworkLog; import org.eclipse.osgi.service.datalocation.Location; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java index 541ce1ca7..8a4161dab 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java @@ -12,7 +12,7 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import org.eclipse.equinox.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; import org.eclipse.osgi.service.datalocation.Location; /** diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/LogHelper.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/LogHelper.java index d0553bdfd..cb3fd613a 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/LogHelper.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/LogHelper.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.core.helpers; import java.util.ArrayList; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.Activator; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.osgi.framework.log.FrameworkLog; import org.eclipse.osgi.framework.log.FrameworkLogEntry; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/ProvisionException.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/ProvisionException.java index 4b81dc967..be59b0d64 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/ProvisionException.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/ProvisionException.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core; +package org.eclipse.equinox.internal.provisional.p2.core; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.Activator; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningEventBus.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/eventbus/ProvisioningEventBus.java index e754ea6b0..421c33776 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningEventBus.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/eventbus/ProvisioningEventBus.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core.eventbus; +package org.eclipse.equinox.internal.provisional.p2.core.eventbus; import java.util.EventObject; import org.eclipse.osgi.framework.eventmgr.*; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningListener.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/eventbus/ProvisioningListener.java index 46e451208..edb96fa53 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/eventbus/ProvisioningListener.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core.eventbus; +package org.eclipse.equinox.internal.provisional.p2.core.eventbus; import java.util.EventListener; import java.util.EventObject; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/SynchronousProvisioningListener.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/eventbus/SynchronousProvisioningListener.java index db312a2a3..165aaf1a5 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/SynchronousProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/eventbus/SynchronousProvisioningListener.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core.eventbus; +package org.eclipse.equinox.internal.provisional.p2.core.eventbus; public interface SynchronousProvisioningListener extends ProvisioningListener { diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/location/AgentLocation.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/location/AgentLocation.java index 6f0988e1d..514a4d611 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/location/AgentLocation.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/location/AgentLocation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core.location; +package org.eclipse.equinox.internal.provisional.p2.core.location; import java.net.URL; import org.eclipse.osgi.service.datalocation.Location; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IRepository.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/repository/IRepository.java index 10206e141..597a69b57 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IRepository.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/repository/IRepository.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core.repository; +package org.eclipse.equinox.internal.provisional.p2.core.repository; import java.net.URL; import java.util.Map; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/RepositoryCreationException.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/repository/RepositoryCreationException.java index b121a4747..ddb54af4b 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/RepositoryCreationException.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/core/repository/RepositoryCreationException.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.core.repository; +package org.eclipse.equinox.internal.provisional.p2.core.repository; public class RepositoryCreationException extends Exception { diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/Collector.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/Collector.java index 33634602c..d1a336d45 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/Collector.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/Collector.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.query; +package org.eclipse.equinox.internal.provisional.p2.query; import java.lang.reflect.Array; import java.util.*; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/CompoundQuery.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/CompoundQuery.java index f755b7d49..92b40746b 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/CompoundQuery.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/CompoundQuery.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.query; +package org.eclipse.equinox.internal.provisional.p2.query; /** * A query that combines a group of other queries. diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/IQueryable.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/IQueryable.java index b40c3e111..c84fddbb5 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/IQueryable.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/IQueryable.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.query; +package org.eclipse.equinox.internal.provisional.p2.query; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/Query.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/Query.java index 3e619a55e..e357dd65c 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/query/Query.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/p2/query/Query.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.query; +package org.eclipse.equinox.internal.provisional.p2.query; import java.util.Iterator; diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/spi/p2/core/repository/AbstractRepository.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/spi/p2/core/repository/AbstractRepository.java index 6a2015208..db2f639c7 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/spi/p2/core/repository/AbstractRepository.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/provisional/spi/p2/core/repository/AbstractRepository.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.core.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.core.repository; import java.net.URL; import java.util.Map; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; -import org.eclipse.equinox.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; /** * AbstractRepository defines common properties that may be provided by various kinds diff --git a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF index 59529f5fe..6689959ca 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF @@ -8,15 +8,15 @@ Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.equinox.app, org.eclipse.equinox.internal.p2.console, org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.engine.phases, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.engine.phases, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, org.eclipse.osgi.service.environment, org.eclipse.osgi.service.resolver;version="1.1.0", org.osgi.framework diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java index 7fcf45852..bee6d5b41 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java +++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java @@ -16,13 +16,13 @@ import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.console.ProvisioningHelper; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.engine.phases.Sizing; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF index 14fe340e4..221a4bdef 100644 --- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF @@ -6,23 +6,23 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.spi.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository, org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.0.0", org.osgi.framework;version="1.3.0" Export-Package: org.eclipse.equinox.internal.p2.director;x-friends:="org.eclipse.equinox.p2.exemplarysetup", org.eclipse.equinox.internal.p2.resolution;x-internal:=true, org.eclipse.equinox.internal.p2.rollback;x-internal:=true, - org.eclipse.equinox.p2.director + org.eclipse.equinox.internal.provisional.p2.director Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java index 18f0d71b0..3d80b5440 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java @@ -8,7 +8,7 @@ ******************************************************************************/ package org.eclipse.equinox.internal.p2.director; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public class BasicIUFilter extends IUFilter { private IInstallableUnit[] accepted; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/HasMatchCollector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/HasMatchCollector.java index e2449f104..cd389ce43 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/HasMatchCollector.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/HasMatchCollector.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.director; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; /** * A collector that short-circuits on the first match. diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java index d3e12b97e..26385f770 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.director; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public abstract class IUFilter { public abstract boolean accept(IInstallableUnit iu); diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java index 8d0cea992..fa541d82f 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java @@ -10,7 +10,7 @@ package org.eclipse.equinox.internal.p2.director; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.osgi.service.resolver.VersionRange; public class IUTransformationHelper { diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java index 5dabcd487..d1a9af879 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java @@ -12,10 +12,10 @@ import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; import org.eclipse.equinox.internal.p2.resolution.UnsatisfiedCapability; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.query.CapabilityQuery; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.CapabilityQuery; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; import org.osgi.framework.InvalidSyntaxException; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java index cd8fbab7f..8a942239d 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java @@ -9,11 +9,11 @@ package org.eclipse.equinox.internal.p2.director; import java.util.*; -import org.eclipse.equinox.p2.engine.InstallableUnitOperand; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.engine.InstallableUnitOperand; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; public class OperationGenerator { private static final IInstallableUnit NULL_IU = MetadataFactory.createResolvedInstallableUnit(MetadataFactory.createInstallableUnit(new InstallableUnitDescription()), new IInstallableUnitFragment[0]); diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java index 570132408..6aaf20f11 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.director; import java.util.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.osgi.service.resolver.VersionRange; //The pickers goal is to find an installable unit that satisfies a search criteria diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Recommendation.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Recommendation.java index 4e6172f80..7015324e3 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Recommendation.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Recommendation.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.equinox.internal.p2.director; -import org.eclipse.equinox.p2.metadata.MetadataFactory; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java index dad73bee1..8504f1461 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java @@ -10,8 +10,8 @@ package org.eclipse.equinox.internal.p2.director; import java.util.*; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; import org.eclipse.osgi.service.resolver.VersionRange; public class RecommendationDescriptor { diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java index 41610de3d..348b8127b 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.equinox.internal.p2.director; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; public class RequirementBasedFilter extends IUFilter { private RequiredCapability[] reqs; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimpleDirector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimpleDirector.java index 1617365eb..7a3489275 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimpleDirector.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimpleDirector.java @@ -13,10 +13,10 @@ import java.net.URL; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.rollback.FormerState; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.osgi.util.NLS; public class SimpleDirector implements IDirector { diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java index 819675aec..4f4c4b23a 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/SimplePlanner.java @@ -15,15 +15,15 @@ import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; import org.eclipse.equinox.internal.p2.rollback.FormerState; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.query.UpdateQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.UpdateQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java index 21595c694..3f96672a4 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.resolution; import java.util.*; import org.eclipse.equinox.internal.p2.director.DirectorActivator; import org.eclipse.equinox.internal.p2.director.RecommendationDescriptor; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/StateMetadataMap.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/StateMetadataMap.java index d2216dbfa..fa249617e 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/StateMetadataMap.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/StateMetadataMap.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.resolution; import java.util.Map; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; //Instances of this class are stored in the user object slot of bundlescriptions to ease navigation between the two models. public class StateMetadataMap { diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/Transformer.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/Transformer.java index 39d83702a..706dfbab1 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/Transformer.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/Transformer.java @@ -13,7 +13,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.director.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.InvalidSyntaxException; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java index 462a27bea..2c7c5a443 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.equinox.internal.p2.resolution; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; /** * Represents a provisioning dependency that was not satisfied during diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java index 9b837eae2..9dadb9146 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java @@ -14,18 +14,18 @@ import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.director.DirectorActivator; import org.eclipse.equinox.internal.p2.director.IUTransformationHelper; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.MetadataFactory; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.osgi.framework.Version; public class FormerState { diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IDirector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/IDirector.java index 28172acb5..ce844edb0 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IDirector.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/IDirector.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.director; +package org.eclipse.equinox.internal.provisional.p2.director; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Directors are responsible for determining what should be done to a given diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IPlanner.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/IPlanner.java index 144e91348..25961d2d4 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IPlanner.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/IPlanner.java @@ -6,11 +6,11 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.director; +package org.eclipse.equinox.internal.provisional.p2.director; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Planners are responsible for determining what should be done to a given diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/ProfileChangeRequest.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/ProfileChangeRequest.java index 59954df4d..63369c6d8 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/ProfileChangeRequest.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/ProfileChangeRequest.java @@ -6,14 +6,14 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.director; +package org.eclipse.equinox.internal.provisional.p2.director; import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.director.DirectorActivator; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public class ProfileChangeRequest { diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/ProvisioningPlan.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/ProvisioningPlan.java index d0b546266..41af92217 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/ProvisioningPlan.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/ProvisioningPlan.java @@ -6,10 +6,10 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.director; +package org.eclipse.equinox.internal.provisional.p2.director; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.engine.Operand; +import org.eclipse.equinox.internal.provisional.p2.engine.Operand; public class ProvisioningPlan { private IStatus status; diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF index 94966c0e9..f0caa4434 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF @@ -6,14 +6,14 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.generator, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.generator, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, org.eclipse.osgi.service.resolver;version="1.1.0", org.osgi.framework;version="1.4.0", org.osgi.service.cm;version="1.2.0";resolution:=optional, @@ -22,5 +22,5 @@ Import-Package: org.eclipse.equinox.internal.p2.core.helpers, Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.3 Export-Package: org.eclipse.equinox.internal.p2.directorywatcher;x-internal:=true, - org.eclipse.equinox.p2.directorywatcher + org.eclipse.equinox.internal.provisional.p2.directorywatcher Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0)" diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/Activator.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/Activator.java index 6900fe440..97a80debc 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/Activator.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/Activator.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.directorywatcher; import java.util.*; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; import org.osgi.framework.*; import org.osgi.service.cm.*; import org.osgi.service.packageadmin.PackageAdmin; diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ConfigFileListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ConfigFileListener.java index 4786913a5..f4c97b1a2 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ConfigFileListener.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ConfigFileListener.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.directorywatcher; import java.io.*; import java.util.*; -import org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/JARFileListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/JARFileListener.java index 143d7dcc1..3c4800763 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/JARFileListener.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/JARFileListener.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.directorywatcher; import java.io.*; import java.util.HashMap; import java.util.Map; -import org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.service.packageadmin.PackageAdmin; diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java index 740933014..54040fad2 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java @@ -15,14 +15,14 @@ import java.net.URL; import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; -import org.eclipse.equinox.p2.metadata.generator.*; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; public class ProvisioningListener extends DirectoryChangeListener { diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/p2/directorywatcher/DirectoryChangeListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryChangeListener.java index 9773719dd..09fc7aba1 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/p2/directorywatcher/DirectoryChangeListener.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryChangeListener.java @@ -7,7 +7,7 @@ * Contributors: * IBM Corporation - initial implementation and ideas ******************************************************************************/ -package org.eclipse.equinox.p2.directorywatcher; +package org.eclipse.equinox.internal.provisional.p2.directorywatcher; import java.io.File; diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/p2/directorywatcher/DirectoryWatcher.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java index 9ff80ce86..10d97b8fd 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/p2/directorywatcher/DirectoryWatcher.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/DirectoryWatcher.java @@ -8,7 +8,7 @@ * aQute - initial implementation and ideas * IBM Corporation - initial adaptation to Equinox provisioning use ******************************************************************************/ -package org.eclipse.equinox.p2.directorywatcher; +package org.eclipse.equinox.internal.provisional.p2.directorywatcher; import java.io.File; import java.util.*; diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/p2/directorywatcher/RepositoryListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java index 2e4774a28..527365b3c 100644 --- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/p2/directorywatcher/RepositoryListener.java +++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/provisional/p2/directorywatcher/RepositoryListener.java @@ -7,25 +7,25 @@ * Contributors: * IBM Corporation - initial implementation and ideas ******************************************************************************/ -package org.eclipse.equinox.p2.directorywatcher; +package org.eclipse.equinox.internal.provisional.p2.directorywatcher; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.generator.BundleDescriptionFactory; -import org.eclipse.equinox.p2.metadata.generator.MetadataGeneratorHelper; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.BundleDescriptionFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.MetadataGeneratorHelper; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -128,7 +128,7 @@ public class RepositoryListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#added(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#added(java.io.File) */ public boolean added(File file) { if (isInteresting(file)) @@ -137,7 +137,7 @@ public class RepositoryListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#changed(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#changed(java.io.File) */ public boolean changed(File file) { if (isInteresting(file)) @@ -146,7 +146,7 @@ public class RepositoryListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#removed(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#removed(java.io.File) */ public boolean removed(File file) { // note that we can't call #isInteresting here because we can't tell if the file handle @@ -164,28 +164,28 @@ public class RepositoryListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) */ public boolean isInterested(File file) { return true; } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#getSeenFile(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#getSeenFile(java.io.File) */ public Long getSeenFile(File file) { return (Long) currentFiles.get(file); } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#startPoll() + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#startPoll() */ public void startPoll() { // do nothing } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#stopPoll() + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#stopPoll() */ public void stopPoll() { synchronizeMetadataRepository(); diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF index 2332f6cfb..71d2a445e 100644 --- a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF @@ -7,26 +7,26 @@ Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Export-Package: org.eclipse.equinox.internal.p2.engine;x-friends:="org.eclipse.equinox.p2.touchpoint.natives", org.eclipse.equinox.internal.p2.installregistry, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.engine.phases + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.engine.phases Import-Package: javax.xml.parsers, org.eclipse.equinox.internal.p2.core.helpers, + org.eclipse.equinox.internal.p2.download, org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.metadata.repository, org.eclipse.equinox.internal.p2.metadata.repository.io, org.eclipse.equinox.internal.p2.persistence, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.download, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.spi.p2.core.repository, - org.eclipse.equinox.spi.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository, + org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.0.0", diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java index f63ca6294..92741ebac 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.engine; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.engine.Engine; -import org.eclipse.equinox.p2.engine.IEngine; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.engine.Engine; +import org.eclipse.equinox.internal.provisional.p2.engine.IEngine; import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java index 54e879a08..880766bbe 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.engine; import java.util.*; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; public class InstructionParser { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java index ab4d55a12..e37918c59 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java @@ -13,9 +13,9 @@ package org.eclipse.equinox.internal.p2.engine; import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.equinox.p2.engine.ProvisioningAction; -import org.eclipse.equinox.p2.engine.Touchpoint; -import org.eclipse.equinox.p2.metadata.TouchpointType; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction; +import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint; +import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType; /** * A touchpoint that performs no processing. diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ParameterizedProvisioningAction.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ParameterizedProvisioningAction.java index 32953beb0..66b03c6a1 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ParameterizedProvisioningAction.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ParameterizedProvisioningAction.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.engine; import java.util.*; import java.util.Map.Entry; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.engine.ProvisioningAction; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction; public class ParameterizedProvisioningAction extends ProvisioningAction { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Profile.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Profile.java index 8a5a60823..7f573a331 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Profile.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Profile.java @@ -14,9 +14,9 @@ import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.installregistry.IInstallRegistry; import org.eclipse.equinox.internal.p2.installregistry.IProfileInstallRegistry; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.*; import org.eclipse.osgi.util.NLS; public class Profile implements IQueryable, IProfile { @@ -78,14 +78,14 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getProfileId() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getProfileId() */ public String getProfileId() { return profileId; } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getParentProfile() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getParentProfile() */ public IProfile getParentProfile() { return parentProfile; @@ -96,7 +96,7 @@ public class Profile implements IQueryable, IProfile { * of another profile. */ /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#isRootProfile() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#isRootProfile() */ public boolean isRootProfile() { return parentProfile == null; @@ -119,14 +119,14 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#hasSubProfiles() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#hasSubProfiles() */ public boolean hasSubProfiles() { return subProfileIds == null || subProfileIds.isEmpty(); } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getSubProfileIds() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getSubProfileIds() */ public String[] getSubProfileIds() { if (subProfileIds == null) @@ -136,7 +136,7 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getProperty(java.lang.String) + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getProperty(java.lang.String) */ public String getProperty(String key) { String value = storage.getProperty(key); @@ -147,7 +147,7 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getLocalProperty(java.lang.String) + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getLocalProperty(java.lang.String) */ public String getLocalProperty(String key) { return storage.getProperty(key); @@ -163,14 +163,14 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#query(org.eclipse.equinox.p2.query.Query, org.eclipse.equinox.p2.query.Collector, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#query(org.eclipse.equinox.internal.provisional.p2.query.Query, org.eclipse.equinox.internal.provisional.p2.query.Collector, org.eclipse.core.runtime.IProgressMonitor) */ public Collector query(Query query, Collector collector, IProgressMonitor monitor) { return query.perform(iuProperties.keySet().iterator(), collector); } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getInstallableUnitProperty(org.eclipse.equinox.p2.metadata.IInstallableUnit, java.lang.String) + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getInstallableUnitProperty(org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit, java.lang.String) */ public String getInstallableUnitProperty(IInstallableUnit iu, String key) { OrderedProperties properties = (OrderedProperties) iuProperties.get(iu); @@ -198,14 +198,14 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getLocalProperties() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getLocalProperties() */ public Map getLocalProperties() { return OrderedProperties.unmodifiableProperties(storage); } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getProperties() + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getProperties() */ public Map getProperties() { if (parentProfile == null) @@ -239,7 +239,7 @@ public class Profile implements IQueryable, IProfile { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.engine.IProfile#getInstallableUnitProperties(org.eclipse.equinox.p2.metadata.IInstallableUnit) + * @see org.eclipse.equinox.internal.provisional.p2.engine.IProfile#getInstallableUnitProperties(org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit) */ public OrderedProperties getInstallableUnitProperties(IInstallableUnit iu) { return (OrderedProperties) iuProperties.get(iu); diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileParser.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileParser.java index 8e4620629..8228ee01e 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileParser.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileParser.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.engine; import java.util.*; import org.eclipse.equinox.internal.p2.persistence.XMLParser; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.osgi.framework.BundleContext; import org.xml.sax.Attributes; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java index 8fca646b1..e82c63226 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ProfileWriter.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.engine; import java.io.IOException; import java.io.OutputStream; import org.eclipse.equinox.internal.p2.persistence.XMLWriter; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; public class ProfileWriter extends XMLWriter implements ProfileXMLConstants { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java index 6fda86feb..a6a3e1cb2 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java @@ -20,12 +20,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.*; import org.eclipse.equinox.internal.p2.installregistry.*; import org.eclipse.equinox.internal.p2.persistence.XMLWriter; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java index b57d3d624..73aef23d1 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java @@ -13,8 +13,8 @@ package org.eclipse.equinox.internal.p2.engine; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; -import org.eclipse.equinox.p2.engine.Touchpoint; -import org.eclipse.equinox.p2.metadata.TouchpointType; +import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint; +import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType; import org.eclipse.osgi.util.NLS; //TODO This needs to support multiple version of each touchpoint and have a lookup that supports version semantics diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/IProfileInstallRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/IProfileInstallRegistry.java index c8f73745f..a830c9729 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/IProfileInstallRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/IProfileInstallRegistry.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.installregistry; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public interface IProfileInstallRegistry { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/InstallRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/InstallRegistry.java index b69372633..a22d185a2 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/InstallRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/InstallRegistry.java @@ -24,8 +24,8 @@ import org.eclipse.equinox.internal.p2.engine.Messages; import org.eclipse.equinox.internal.p2.metadata.repository.io.MetadataParser; import org.eclipse.equinox.internal.p2.metadata.repository.io.MetadataWriter; import org.eclipse.equinox.internal.p2.persistence.XMLWriter; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; import org.osgi.framework.BundleContext; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/MetadataCache.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/MetadataCache.java index 9c11d29b2..9ad494bd1 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/MetadataCache.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/installregistry/MetadataCache.java @@ -16,15 +16,15 @@ import java.util.EventObject; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.engine.EngineActivator; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.osgi.framework.ServiceReference; public class MetadataCache { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/BeginOperationEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/BeginOperationEvent.java index b0867ea81..adc7e52ce 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/BeginOperationEvent.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/BeginOperationEvent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; public class BeginOperationEvent extends TransactionEvent { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/CommitOperationEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/CommitOperationEvent.java index fe3e93ca4..3d0cd924a 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/CommitOperationEvent.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/CommitOperationEvent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; public class CommitOperationEvent extends TransactionEvent { private static final long serialVersionUID = -523967775426133720L; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/DefaultPhaseSet.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/DefaultPhaseSet.java index 6aec15d00..4c49abe5b 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/DefaultPhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/DefaultPhaseSet.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; -import org.eclipse.equinox.p2.engine.phases.*; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.*; public class DefaultPhaseSet extends PhaseSet { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Engine.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Engine.java index 19747f2a1..b09b28715 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Engine.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Engine.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.engine.*; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; public class Engine implements IEngine { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/EngineSession.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/EngineSession.java index 0d5bd6552..b01c40294 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/EngineSession.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/EngineSession.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.*; import org.eclipse.core.runtime.*; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IEngine.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IEngine.java index f91ef36e8..e190321e9 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IEngine.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IEngine.java @@ -1,4 +1,4 @@ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfile.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java index a3d6744d4..5b98d92ce 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfile.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfile.java @@ -1,9 +1,9 @@ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.Map; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; public interface IProfile extends IQueryable { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfileRegistry.java index ca8874e39..46de20f12 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/IProfileRegistry.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.Map; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitEvent.java index e8c15ab26..a46fa7101 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitEvent.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitEvent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.EventObject; import org.eclipse.core.runtime.IStatus; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitOperand.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitOperand.java index efab3eed8..e3efa3954 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitOperand.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitOperand.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public class InstallableUnitOperand extends Operand { private final IInstallableUnit first; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitPropertyOperand.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPropertyOperand.java index 21c3ee9cb..613d64144 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitPropertyOperand.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPropertyOperand.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public class InstallableUnitPropertyOperand extends PropertyOperand { private final IInstallableUnit iu; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Memento.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Memento.java index 22b374e1e..d039ef6e3 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Memento.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Memento.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.*; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Operand.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Operand.java new file mode 100644 index 000000000..220a33f0a --- /dev/null +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Operand.java @@ -0,0 +1,5 @@ +package org.eclipse.equinox.internal.provisional.p2.engine; + +public class Operand { + +} diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Phase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Phase.java index 7003ea4c2..a894dde10 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Phase.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Phase.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.*; import java.util.Map.Entry; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.engine.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.osgi.util.NLS; public abstract class Phase { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PhaseSet.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/PhaseSet.java index fdf96cf28..13e2a6b0a 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/PhaseSet.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.engine.EngineActivator; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProfileEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ProfileEvent.java index b34c84550..f638459a6 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProfileEvent.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ProfileEvent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.EventObject; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PropertyOperand.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/PropertyOperand.java index 37c2421d7..24c536e66 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PropertyOperand.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/PropertyOperand.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import org.eclipse.core.runtime.Assert; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningAction.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ProvisioningAction.java index 65eb6dc0e..d91b1aebd 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningAction.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ProvisioningAction.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.Map; import org.eclipse.core.runtime.IStatus; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ProvisioningContext.java index 64a4ad438..c9935dd26 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/ProvisioningContext.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.net.URL; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/RollbackOperationEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/RollbackOperationEvent.java index f962c4eaa..0e122ce85 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/RollbackOperationEvent.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/RollbackOperationEvent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import org.eclipse.core.runtime.IStatus; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Touchpoint.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Touchpoint.java index 6360db320..63613f345 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Touchpoint.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/Touchpoint.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.Map; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.TouchpointType; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType; /** * A touchpoint is responsible for executing a given phase for a given diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/TransactionEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/TransactionEvent.java index 8d891b54a..0a1940f00 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/TransactionEvent.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/TransactionEvent.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine; +package org.eclipse.equinox.internal.provisional.p2.engine; import java.util.EventObject; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Collect.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java index 72d1375db..93206543b 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Collect.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine.phases; +package org.eclipse.equinox.internal.provisional.p2.engine.phases; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.equinox.internal.p2.download.DownloadManager; import org.eclipse.equinox.internal.p2.engine.Messages; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRequest; -import org.eclipse.equinox.p2.download.DownloadManager; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.*; /** * The goal of the collect phase is to ask the touchpoints if the artifacts associated with an IU need to be downloaded. diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Configure.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Configure.java index d0e60d0de..3d266d289 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Configure.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Configure.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine.phases; +package org.eclipse.equinox.internal.provisional.p2.engine.phases; import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.engine.Messages; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.osgi.util.NLS; public class Configure extends Phase { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Install.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Install.java index 89ce1bcb1..1d0cc5b78 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Install.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Install.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine.phases; +package org.eclipse.equinox.internal.provisional.p2.engine.phases; import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.engine.*; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.osgi.util.NLS; public class Install extends Phase { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Sizing.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java index 6bbf0b788..c3ae9209f 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Sizing.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine.phases; +package org.eclipse.equinox.internal.provisional.p2.engine.phases; import java.net.URL; import java.util.*; @@ -17,9 +17,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.engine.EngineActivator; import org.eclipse.equinox.internal.p2.engine.Messages; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.*; public class Sizing extends Phase { private static final String PHASE_ID = "collect"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Unconfigure.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Unconfigure.java index 69044df90..15c8dd472 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Unconfigure.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Unconfigure.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine.phases; +package org.eclipse.equinox.internal.provisional.p2.engine.phases; import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.engine.Messages; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public class Unconfigure extends Phase { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Uninstall.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Uninstall.java index d5cafbf29..e007682c8 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Uninstall.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Uninstall.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.engine.phases; +package org.eclipse.equinox.internal.provisional.p2.engine.phases; import java.util.Map; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.engine.*; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; public class Uninstall extends Phase { diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Operand.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Operand.java deleted file mode 100644 index f162cbd2b..000000000 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Operand.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.eclipse.equinox.p2.engine; - -public class Operand { - -} diff --git a/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF index 21c4958e3..11799d020 100644 --- a/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF @@ -7,15 +7,15 @@ Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.equinox.internal.p2.director, org.eclipse.equinox.internal.p2.engine, + org.eclipse.equinox.internal.p2.garbagecollector, org.eclipse.equinox.internal.p2.installregistry, org.eclipse.equinox.internal.p2.metadata.repository, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.garbagecollector, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, org.osgi.framework;version="1.3.0" Eclipse-LazyStart: true Bundle-Activator: org.eclipse.equinox.internal.p2.exemplarysetup.Activator diff --git a/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java b/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java index b77d1301f..0dbc5240c 100644 --- a/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java +++ b/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java @@ -13,14 +13,14 @@ package org.eclipse.equinox.internal.p2.exemplarysetup; import org.eclipse.equinox.internal.p2.director.SimpleDirector; import org.eclipse.equinox.internal.p2.director.SimplePlanner; import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry; +import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector; import org.eclipse.equinox.internal.p2.installregistry.*; import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.IPlanner; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.garbagecollector.GarbageCollector; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.osgi.framework.*; public class Activator implements BundleActivator { diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF index 476e22fa6..decff09fe 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF @@ -7,17 +7,16 @@ Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.core.runtime.preferences, org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.4.0", org.osgi.util.tracker;version="1.3.3" -Bundle-Activator: org.eclipse.equinox.p2.garbagecollector.GCActivator -Export-Package: org.eclipse.equinox.p2.garbagecollector, - org.eclipse.equinox.p2.garbagecollector.prefs +Bundle-Activator: org.eclipse.equinox.internal.p2.garbagecollector.GCActivator +Export-Package: org.eclipse.equinox.internal.p2.garbagecollector;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse" Eclipse-LazyStart: true Require-Bundle: org.eclipse.equinox.p2.engine, org.eclipse.osgi;bundle-version="[3.4.0,4.0.0)", diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/CoreGarbageCollector.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/CoreGarbageCollector.java index dee84c045..76cc15100 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/CoreGarbageCollector.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/CoreGarbageCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector; +package org.eclipse.equinox.internal.p2.garbagecollector; import org.eclipse.equinox.internal.p2.core.helpers.Tracing; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * Given a MarkSet, the CoreGarbageCollector removes any IArtifactDescriptors which diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/GCActivator.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GCActivator.java index 798c689d0..64b891e86 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/GCActivator.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GCActivator.java @@ -8,22 +8,22 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector; +package org.eclipse.equinox.internal.p2.garbagecollector; import java.util.EventObject; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.garbagecollector.prefs.GCPreferenceConstants; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.engine.*; import org.eclipse.osgi.service.debug.DebugOptions; import org.osgi.framework.*; public class GCActivator implements BundleActivator { - public static final String ID = "org.eclipse.equinox.p2.garbagecollector"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.equinox.internal.p2.garbagecollector"; //$NON-NLS-1$ + public static final String DISABLE_GARBAGE_COLLECT = "gc_disabled"; //$NON-NLS-1$ private static final String DEBUG_STRING = GCActivator.ID + "/debug"; //$NON-NLS-1$ private static final boolean DEFAULT_DEBUG = false; @@ -70,7 +70,7 @@ public class GCActivator implements BundleActivator { if (uninstallEventOccurred == true) { CommitOperationEvent event = (CommitOperationEvent) o; IPreferencesService prefService = (IPreferencesService) getService(context, IPreferencesService.class.getName()); - if (!(prefService.getBoolean(ID, GCPreferenceConstants.DISABLE_GARBAGE_COLLECT, false, null))) { + if (!(prefService.getBoolean(ID, DISABLE_GARBAGE_COLLECT, false, null))) { new GarbageCollector().runGC(event.getProfile()); } uninstallEventOccurred = false; diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/GarbageCollector.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GarbageCollector.java index 24bbd29dc..4153c53c4 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/GarbageCollector.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GarbageCollector.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector; +package org.eclipse.equinox.internal.p2.garbagecollector; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * The main control point for the p2 garbage collector. Takes a Profile and runs the CoreGarbageCollector with the diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/IMarkSetProvider.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/IMarkSetProvider.java index 3614ab776..0d4f2b8b6 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/IMarkSetProvider.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/IMarkSetProvider.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector; +package org.eclipse.equinox.internal.p2.garbagecollector; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** - * Any class which declares itself as an extension to the org.eclipse.equinox.p2.garbagecollector.marksetproviders + * Any class which declares itself as an extension to the org.eclipse.equinox.internal.p2.garbagecollector.marksetproviders * extension point must implement this interface. Given a Profile, implementors will need to provide an array of * MarkSet objects, each of which should contain an IArtifactRepository and the IArtifactKeys used by the given * Profile. diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/MarkSet.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/MarkSet.java index ca8da12fc..c24eb789a 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/MarkSet.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/MarkSet.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector; +package org.eclipse.equinox.internal.p2.garbagecollector; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * Wrapper class used to store an IArtifactRepository and its root set of IArtifactKeys. diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/Messages.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/Messages.java index 4c567ab00..636881188 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/Messages.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/Messages.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector; +package org.eclipse.equinox.internal.p2.garbagecollector; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.garbagecollector.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.garbagecollector.messages"; //$NON-NLS-1$ public static String Error_in_extension; public static String Missing_bus; diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/messages.properties b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/messages.properties index 1862311d7..1862311d7 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/messages.properties +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/messages.properties diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/prefs/GCPreferenceConstants.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/prefs/GCPreferenceConstants.java deleted file mode 100644 index a727124b7..000000000 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/p2/garbagecollector/prefs/GCPreferenceConstants.java +++ /dev/null @@ -1,15 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.equinox.p2.garbagecollector.prefs; - -public class GCPreferenceConstants { - public static final String DISABLE_GARBAGE_COLLECT = "gc_disabled"; //$NON-NLS-1$ -} diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java index 561e02346..761cc96bb 100644 --- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java +++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java @@ -19,9 +19,9 @@ import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.installer.ui.SWTInstallAdvisor; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.internal.provisional.p2.installer.InstallAdvisor; import org.eclipse.equinox.internal.provisional.p2.installer.InstallDescription; -import org.eclipse.equinox.p2.engine.IProfile; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java index ca1bb4cb1..9fd7c9015 100644 --- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java +++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java @@ -14,19 +14,19 @@ import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; import org.eclipse.equinox.internal.provisional.p2.installer.IInstallOperation; import org.eclipse.equinox.internal.provisional.p2.installer.InstallDescription; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.jarprocessor/META-INF/MANIFEST.MF index 4dd2bfcd3..23be04d69 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/META-INF/MANIFEST.MF @@ -9,4 +9,4 @@ Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 Export-Package: org.eclipse.equinox.internal.p2.jarprocessor;x-friends:="org.eclipse.equinox.p2.artifact.processors", org.eclipse.equinox.internal.p2.jarprocessor.verifier;x-internal:=true, - org.eclipse.equinox.p2.jarprocessor + org.eclipse.internal.provisional.equinox.p2.jarprocessor diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/CommandStep.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/CommandStep.java index 6b1d32db7..8456bb24d 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/CommandStep.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/CommandStep.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.jarprocessor; import java.io.File; import java.util.List; import java.util.Properties; -import org.eclipse.equinox.p2.jarprocessor.IProcessStep; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.IProcessStep; /** * @author aniefer@ca.ibm.com diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java index 1bd9f4869..9b06da109 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.p2.jarprocessor; import java.io.File; -import org.eclipse.equinox.p2.jarprocessor.JarProcessor; -import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor; public class Main { diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java index ea9fb4388..b6089c887 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java @@ -16,7 +16,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.zip.ZipException; -import org.eclipse.equinox.p2.jarprocessor.JarProcessor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessor; /** * @author aniefer@ca.ibm.com diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java index 6278a7775..ece6e813a 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/ZipProcessor.java @@ -13,8 +13,8 @@ package org.eclipse.equinox.internal.p2.jarprocessor; import java.io.*; import java.util.*; import java.util.zip.*; -import org.eclipse.equinox.p2.jarprocessor.IProcessStep; -import org.eclipse.equinox.p2.jarprocessor.JarProcessor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.IProcessStep; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessor; /** * @author aniefer@ca.ibm.com diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java index b46ee9e94..541b82445 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/verifier/Verifier.java @@ -15,8 +15,8 @@ import java.util.Properties; import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep; import org.eclipse.equinox.internal.p2.jarprocessor.Utils; -import org.eclipse.equinox.p2.jarprocessor.JarProcessor; -import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessor; +import org.eclipse.internal.provisional.equinox.p2.jarprocessor.JarProcessorExecutor; public class Verifier extends JarProcessorExecutor { diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/IProcessStep.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/IProcessStep.java index e5df8093c..ba87ab969 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/IProcessStep.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/IProcessStep.java @@ -8,7 +8,7 @@ * Contributors: * IBM - Initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.jarprocessor; +package org.eclipse.internal.provisional.equinox.p2.jarprocessor; import java.io.File; import java.util.List; diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java index e017ec974..622c157af 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessor.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java @@ -8,7 +8,7 @@ * Contributors: * IBM - Initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.jarprocessor; +package org.eclipse.internal.provisional.equinox.p2.jarprocessor; import java.io.*; import java.util.*; diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessorExecutor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessorExecutor.java index 117fd2b20..51a205528 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessorExecutor.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessorExecutor.java @@ -9,7 +9,7 @@ * IBM - Initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.jarprocessor; +package org.eclipse.internal.provisional.equinox.p2.jarprocessor; import java.io.*; import java.util.Properties; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/.externalToolBuilders/Build Metadata Generator Ant Tasks.launch b/bundles/org.eclipse.equinox.p2.metadata.generator/.externalToolBuilders/Build Metadata Generator Ant Tasks.launch index b515c413e..ec9c3e8df 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/.externalToolBuilders/Build Metadata Generator Ant Tasks.launch +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/.externalToolBuilders/Build Metadata Generator Ant Tasks.launch @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.equinox.p2.metadata.generator/scripts/buildExtraJAR.xml"/> +<listEntry value="/org.eclipse.equinox.p2.metadata.generator"/> </listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> +<listEntry value="4"/> </listAttribute> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF index 79bf92a85..f55bacddf 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF @@ -15,15 +15,15 @@ Import-Package: javax.xml.parsers, org.eclipse.equinox.internal.p2.artifact.repository, org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.metadata.repository, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.artifact.repository.processing, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, org.xml.sax Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.generator.Activator Export-Package: org.eclipse.equinox.internal.p2.metadata.generator;x-internal:=true, org.eclipse.equinox.internal.p2.metadata.generator.features;x-friends:="org.eclipse.equinox.p2.updatesite", - org.eclipse.equinox.p2.metadata.generator + org.eclipse.equinox.internal.provisional.p2.metadata.generator Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml b/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml index 151dd3ef5..b73a51f4d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml @@ -24,7 +24,7 @@ <antTask library="ant_tasks/generator-ant.jar" name="p2.generator" - class="org.eclipse.equinox.p2.metadata.generator.ant.GeneratorTask"> + class="org.eclipse.equinox.internal.p2.metadata.generator.ant.GeneratorTask"> </antTask> </extension> diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java index 7d3cb067d..b20c4ea0c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java @@ -19,14 +19,14 @@ import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.generator.*; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.eclipse.osgi.util.NLS; import org.osgi.framework.ServiceRegistration; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Messages.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java index 79c23f140..c28acd1e5 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Messages.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/Messages.java @@ -6,12 +6,12 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.p2.metadata.generator; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.metadata.generator.messages";//$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.metadata.generator.messages";//$NON-NLS-1$ public static String exception_errorConverting; public static String exception_outputStream; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DefaultSiteParser.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DefaultSiteParser.java index 87b09cb87..a95a648be 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DefaultSiteParser.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DefaultSiteParser.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.Tracing; import org.eclipse.equinox.internal.p2.metadata.repository.Activator; -import org.eclipse.equinox.p2.metadata.generator.URLEntry; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.URLEntry; import org.eclipse.osgi.util.NLS; import org.w3c.dom.*; import org.xml.sax.*; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DigestParser.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DigestParser.java index 7284f7fcb..51256d0e9 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DigestParser.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/DigestParser.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; import javax.xml.parsers.*; -import org.eclipse.equinox.p2.metadata.generator.Feature; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Feature; import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java index 127fc8fe5..38ccc8088 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java @@ -16,8 +16,8 @@ import java.util.Properties; import java.util.jar.JarEntry; import java.util.jar.JarFile; import javax.xml.parsers.*; -import org.eclipse.equinox.p2.metadata.generator.Feature; -import org.eclipse.equinox.p2.metadata.generator.FeatureEntry; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Feature; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.FeatureEntry; import org.eclipse.osgi.util.NLS; import org.xml.sax.*; import org.xml.sax.helpers.DefaultHandler; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteModel.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteModel.java index 9b0cbfd32..794b384dc 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteModel.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/SiteModel.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.metadata.generator.features; import java.net.MalformedURLException; import java.net.URL; import java.util.*; -import org.eclipse.equinox.p2.metadata.generator.URLEntry; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.URLEntry; /** * A model of an update site. diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/messages.properties b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties index 08affcbdc..08affcbdc 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/messages.properties +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/messages.properties diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/BundleDescriptionFactory.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/BundleDescriptionFactory.java index 79e7578e3..582167579 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/BundleDescriptionFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/BundleDescriptionFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.*; import java.net.URL; @@ -19,6 +19,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; +import org.eclipse.equinox.internal.p2.metadata.generator.Messages; import org.eclipse.equinox.internal.p2.metadata.repository.Activator; import org.eclipse.osgi.service.pluginconversion.PluginConversionException; import org.eclipse.osgi.service.pluginconversion.PluginConverter; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java index ab9aa935c..261da02eb 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.File; import java.io.IOException; @@ -17,9 +17,10 @@ import java.util.*; import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.metadata.generator.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.p2.metadata.generator.Messages; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Feature.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Feature.java index 9d7d53a81..bb120fe71 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Feature.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Feature.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.util.ArrayList; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/FeatureEntry.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/FeatureEntry.java index b22830719..9b8a676ad 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/FeatureEntry.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/FeatureEntry.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; /** */ diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java index aeede69ca..cc93b267e 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.*; import java.net.URL; @@ -16,16 +16,17 @@ import org.eclipse.core.runtime.*; import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.internal.p2.core.helpers.*; import org.eclipse.equinox.internal.p2.metadata.generator.Activator; +import org.eclipse.equinox.internal.p2.metadata.generator.Messages; import org.eclipse.equinox.internal.p2.metadata.generator.features.*; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; import org.eclipse.osgi.service.resolver.*; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/GeneratorBundleInfo.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java index 65ecc4662..0012bedc0 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/GeneratorBundleInfo.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.ByteArrayInputStream; import org.eclipse.equinox.frameworkadmin.BundleInfo; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IGeneratorInfo.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/IGeneratorInfo.java index b0223c77d..fa2fc24cc 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IGeneratorInfo.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/IGeneratorInfo.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.File; import java.net.URL; @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.Set; import org.eclipse.equinox.frameworkadmin.ConfigData; import org.eclipse.equinox.frameworkadmin.LauncherData; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; public interface IGeneratorInfo { public boolean addDefaultIUs(); diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/MetadataGeneratorHelper.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java index 034d3956d..1d6e1fb38 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/MetadataGeneratorHelper.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; import java.io.*; import java.util.*; @@ -18,12 +18,12 @@ import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.metadata.InstallableUnit; import org.eclipse.equinox.internal.p2.metadata.generator.Activator; import org.eclipse.equinox.internal.p2.metadata.generator.features.SiteCategory; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.eclipse.osgi.service.resolver.*; import org.eclipse.osgi.util.ManifestElement; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/URLEntry.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/URLEntry.java index dbccf5bd1..702b4f428 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/URLEntry.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/URLEntry.java @@ -7,7 +7,7 @@ * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator; +package org.eclipse.equinox.internal.provisional.p2.metadata.generator; public class URLEntry { private String annotation; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/p2/metadata/generator/ant/GeneratorTask.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/internal/p2/metadata/generator/ant/GeneratorTask.java index 1ef5e601a..8eb7b8a2c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/p2/metadata/generator/ant/GeneratorTask.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/internal/p2/metadata/generator/ant/GeneratorTask.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator.ant; +package org.eclipse.equinox.internal.p2.metadata.generator.ant; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.eclipse.equinox.internal.p2.metadata.generator.EclipseGeneratorApplication; -import org.eclipse.equinox.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; -import org.eclipse.equinox.p2.metadata.generator.Generator.GeneratorResult; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Generator.GeneratorResult; /** * An Ant task to call the p2 Metadata Generator application. diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/p2/metadata/generator/ant/TaskMessages.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/internal/p2/metadata/generator/ant/TaskMessages.java index c32015858..77e710363 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/p2/metadata/generator/ant/TaskMessages.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/internal/p2/metadata/generator/ant/TaskMessages.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.generator.ant; +package org.eclipse.equinox.internal.p2.metadata.generator.ant; import org.eclipse.osgi.util.NLS; public class TaskMessages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.metadata.generator.ant.messages";//$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.metadata.generator.ant.messages";//$NON-NLS-1$ public static String exception_errorOccurredCallingGenerator; public static String exception_errorArtifactRepo; diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/p2/metadata/generator/ant/messages.properties b/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/internal/p2/metadata/generator/ant/messages.properties index 2c2eb1c97..2c2eb1c97 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/p2/metadata/generator/ant/messages.properties +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src_ant/org/eclipse/equinox/internal/p2/metadata/generator/ant/messages.properties diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF index 26f0c6dd8..c006deee6 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF @@ -7,20 +7,20 @@ Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Export-Package: org.eclipse.equinox.internal.p2.metadata.repository;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.engine", org.eclipse.equinox.internal.p2.metadata.repository.io;x-friends:="org.eclipse.equinox.p2.engine", - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.spi.p2.metadata.repository + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository Import-Package: org.eclipse.core.runtime.preferences, org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.metadata, org.eclipse.equinox.internal.p2.persistence, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.spi.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.1.0", diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml b/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml index 8772d2256..468b6031c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml @@ -4,6 +4,6 @@ <extension-point id="metadataRepositories" name="Metadata Repositories" schema="schema/metadataRepositories.exsd"/> <extension id="simpleRepository" point="org.eclipse.equinox.p2.metadata.repository.metadataRepositories"> <filter suffix="content.xml"/> - <factory class="org.eclipse.equinox.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory"/> + <factory class="org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory"/> </extension> </plugin> diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java index 73abbc5b7..5aeb1571e 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java @@ -17,7 +17,6 @@ public class Activator implements BundleActivator { public static final String ID = "org.eclipse.equinox.p2.metadata.repository"; //$NON-NLS-1$ public static final String REPO_PROVIDER_XPT = ID + '.' + "metadataRepositories"; //$NON-NLS-1$ - public static final String PI_METADATA_REPOSITORY = "org.eclipse.equinox.p2.metadata.repository"; //$NON-NLS-1$ private static BundleContext bundleContext; public static BundleContext getContext() { diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java index d466ad7c1..373c79446 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java @@ -19,12 +19,12 @@ import java.util.jar.JarOutputStream; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.metadata.repository.AbstractMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository; /** * A metadata repository that resides in the local file system. If the repository @@ -161,7 +161,7 @@ public class LocalMetadataRepository extends AbstractMetadataRepository { } new MetadataRepositoryIO().write(this, output); } catch (IOException e) { - LogHelper.log(new Status(IStatus.ERROR, Activator.PI_METADATA_REPOSITORY, ProvisionException.REPOSITORY_FAILED_WRITE, "Error saving metadata repository: " + location, e)); //$NON-NLS-1$ + LogHelper.log(new Status(IStatus.ERROR, Activator.ID, ProvisionException.REPOSITORY_FAILED_WRITE, "Error saving metadata repository: " + location, e)); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java index 3284ef666..ddeab1ab2 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java @@ -20,13 +20,13 @@ import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.p2.metadata.repository.io.MetadataParser; import org.eclipse.equinox.internal.p2.metadata.repository.io.MetadataWriter; import org.eclipse.equinox.internal.p2.persistence.XMLWriter; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.spi.p2.metadata.repository.AbstractMetadataRepository; -import org.eclipse.equinox.spi.p2.metadata.repository.AbstractMetadataRepository.RepositoryState; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository.RepositoryState; import org.eclipse.osgi.service.resolver.VersionRange; import org.eclipse.osgi.util.NLS; import org.osgi.framework.BundleContext; diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java index bdcd4643f..2870c278f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java @@ -18,13 +18,13 @@ import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; import org.eclipse.equinox.internal.p2.core.helpers.URLUtil; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.metadata.repository.IMetadataRepositoryFactory; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.IMetadataRepositoryFactory; import org.eclipse.osgi.util.NLS; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -113,7 +113,7 @@ public class MetadataRepositoryManager implements IMetadataRepositoryManager { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager#createRepository(java.net.URL, java.lang.String, java.lang.String) + * @see org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager#createRepository(java.net.URL, java.lang.String, java.lang.String) */ public IMetadataRepository createRepository(URL location, String name, String type) throws ProvisionException { Assert.isNotNull(location); @@ -226,7 +226,7 @@ public class MetadataRepositoryManager implements IMetadataRepositoryManager { * Return the preference node which is the root for where we store the repository information. */ private Preferences getPreferences() { - return new ConfigurationScope().getNode(Activator.PI_METADATA_REPOSITORY).node(NODE_REPOSITORIES); + return new ConfigurationScope().getNode(Activator.ID).node(NODE_REPOSITORIES); } public IMetadataRepository getRepository(URL location) { @@ -251,7 +251,7 @@ public class MetadataRepositoryManager implements IMetadataRepositoryManager { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager#getRepositoryProperty(java.net.URL, java.lang.String) + * @see org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager#getRepositoryProperty(java.net.URL, java.lang.String) */ public String getRepositoryProperty(URL location, String key) { synchronized (repositoryLock) { @@ -315,7 +315,7 @@ public class MetadataRepositoryManager implements IMetadataRepositoryManager { } protected void log(String message, Throwable t) { - LogHelper.log(new Status(IStatus.ERROR, Activator.PI_METADATA_REPOSITORY, message, t)); + LogHelper.log(new Status(IStatus.ERROR, Activator.ID, message, t)); } private boolean matchesFlags(RepositoryInfo info, int flags) { diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java index ccff4fad2..8f645fe01 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java @@ -15,9 +15,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.metadata.repository.AbstractMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository; /** * A metadata repository backed by an arbitrary URL. diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataParser.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataParser.java index 244ab1196..0f1693925 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataParser.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataParser.java @@ -14,9 +14,9 @@ import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.persistence.XMLParser; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.BundleContext; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java index d0309ba9e..ab9016db6 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java @@ -15,7 +15,7 @@ import java.io.UnsupportedEncodingException; import java.util.Iterator; import java.util.Map; import org.eclipse.equinox.internal.p2.persistence.XMLWriter; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; public abstract class MetadataWriter extends XMLWriter implements XMLConstants { diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java index d876ead58..8f108899e 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepository.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.repository; +package org.eclipse.equinox.internal.provisional.p2.metadata.repository; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.metadata.repository.AbstractMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository; /** * A metadata repository stores information about a set of installable units diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java index c8e4c8466..e408a952c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/p2/metadata/repository/IMetadataRepositoryManager.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.repository; +package org.eclipse.equinox.internal.provisional.p2.metadata.repository; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; public interface IMetadataRepositoryManager extends IQueryable { diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/spi/p2/metadata/repository/AbstractMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java index 356297a3a..fa2a9f769 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/spi/p2/metadata/repository/AbstractMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/AbstractMetadataRepository.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.metadata.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository; import java.net.URL; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.core.repository.AbstractRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/spi/p2/metadata/repository/IMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/IMetadataRepositoryFactory.java index 7141be94d..ec3230e16 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/spi/p2/metadata/repository/IMetadataRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/IMetadataRepositoryFactory.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.metadata.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; public interface IMetadataRepositoryFactory { diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/spi/p2/metadata/repository/SimpleMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/SimpleMetadataRepositoryFactory.java index 86402ef68..cdc5ce89a 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/spi/p2/metadata/repository/SimpleMetadataRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/provisional/spi/p2/metadata/repository/SimpleMetadataRepositoryFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.spi.p2.metadata.repository; +package org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository; import java.io.*; import java.net.URL; @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.*; import org.eclipse.equinox.internal.p2.metadata.repository.*; import org.eclipse.equinox.internal.p2.metadata.repository.Messages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; import org.eclipse.osgi.util.NLS; public class SimpleMetadataRepositoryFactory implements IMetadataRepositoryFactory { @@ -96,7 +96,7 @@ public class SimpleMetadataRepositoryFactory implements IMetadataRepositoryFacto } /* (non-Javadoc) - * @see org.eclipse.equinox.spi.p2.metadata.repository.IMetadataRepositoryFactory#load(java.net.URL, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.IMetadataRepositoryFactory#load(java.net.URL, org.eclipse.core.runtime.IProgressMonitor) */ public IMetadataRepository load(URL location, IProgressMonitor monitor) throws ProvisionException { long time = 0; diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index d4213e9f5..9e25dde06 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Export-Package: org.eclipse.equinox.internal.p2.metadata; org.eclipse.equinox.p2.artifact.repository, org.eclipse.equinox.p2.artifact.optimizers, org.eclipse.equinox.p2.artifact.processors", - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query Import-Package: org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0" diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java index b88c4b41f..40ece0475 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.metadata; import java.util.ArrayList; import java.util.StringTokenizer; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java index 14e440c1e..ea30fdf35 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.metadata; import java.util.ArrayList; import java.util.Map; import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.osgi.framework.Version; public class InstallableUnit implements IInstallableUnit { diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java index 0e3ce4653..9270f413e 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.osgi.service.resolver.VersionRange; public class InstallableUnitFragment extends InstallableUnit implements IInstallableUnitFragment { diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java index c8a2ed2d8..f5792c36c 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java @@ -9,7 +9,7 @@ package org.eclipse.equinox.internal.p2.metadata; import java.util.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.osgi.framework.Version; public class ResolvedInstallableUnit implements IInstallableUnit { diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/UpdateDescriptor.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/UpdateDescriptor.java index eb87deac8..e379219fb 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/UpdateDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/UpdateDescriptor.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.IUpdateDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IUpdateDescriptor; import org.eclipse.osgi.service.resolver.VersionRange; public class UpdateDescriptor implements IUpdateDescriptor { diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IArtifactKey.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IArtifactKey.java index 5d1a4a1bf..2702c7210 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IArtifactKey.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IArtifactKey.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java index 163c77f24..2453f819d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import java.util.Map; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java index b9868e16d..80613aeac 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitFragment.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IUpdateDescriptor.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IUpdateDescriptor.java index bce2a324c..38b3f4a49 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IUpdateDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IUpdateDescriptor.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import org.eclipse.osgi.service.resolver.VersionRange; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java index 4f7832cf7..d7f49f591 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import java.util.*; import org.eclipse.core.runtime.Assert; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ProvidedCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java index 989b64f71..c3efb1402 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ProvidedCapability.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import org.eclipse.core.runtime.Assert; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RequiredCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java index ef9eea9d9..ae60bd755 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RequiredCapability.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import org.eclipse.core.runtime.Assert; import org.eclipse.osgi.service.resolver.VersionRange; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointData.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointData.java index 877ce7d1d..f131ad6a6 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointData.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointData.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import java.util.Collections; import java.util.Map; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointType.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java index 37e233a0b..5ad131795 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointType.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata; +package org.eclipse.equinox.internal.provisional.p2.metadata; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CapabilityQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java index 01692bdec..0ca0649aa 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/CapabilityQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.query; +package org.eclipse.equinox.internal.provisional.p2.metadata.query; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that searches for {@link IInstallableUnit} instances that provide diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/InstallableUnitQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/InstallableUnitQuery.java index f2a1c0690..04db9f8a9 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/InstallableUnitQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/InstallableUnitQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.metadata.query; +package org.eclipse.equinox.internal.provisional.p2.metadata.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.Query; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/UpdateQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java index 358fec761..cb70bf9de 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/query/UpdateQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/UpdateQuery.java @@ -6,11 +6,11 @@ * * Contributors: IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.metadata.query; +package org.eclipse.equinox.internal.provisional.p2.metadata.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.IUpdateDescriptor; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IUpdateDescriptor; +import org.eclipse.equinox.internal.provisional.p2.query.Query; public class UpdateQuery extends Query { private IInstallableUnit updateFrom; diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF index de870539d..2112bf7f7 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF @@ -11,16 +11,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 Import-Package: org.eclipse.equinox.configurator, org.eclipse.equinox.internal.p2.update, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.directorywatcher, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.directorywatcher, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0", @@ -29,3 +29,4 @@ Import-Package: org.eclipse.equinox.configurator, org.xml.sax Require-Bundle: org.eclipse.equinox.common, org.eclipse.equinox.p2.touchpoint.eclipse;bundle-version="0.1.0" +Export-Package: org.eclipse.equinox.internal.p2.reconciler.dropins;x-internal:=true diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java index 591d5e696..adcc5a71a 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java @@ -14,13 +14,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; -import org.eclipse.equinox.p2.directorywatcher.RepositoryListener; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.reconciler.dropins.ProfileSynchronizer; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; import org.osgi.framework.*; import org.osgi.service.packageadmin.PackageAdmin; diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java index ac4bca36a..ccce641a4 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java @@ -16,7 +16,7 @@ import java.net.URL; import java.util.Iterator; import java.util.Properties; import org.eclipse.equinox.internal.p2.update.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * @since 1.0 diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java index 72e3b8ebe..c0fc919a4 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java @@ -18,9 +18,9 @@ import java.util.*; import org.eclipse.core.runtime.FileLocator; import org.eclipse.equinox.internal.p2.reconciler.dropins.SiteDelta.Change; import org.eclipse.equinox.internal.p2.update.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; /** * @since 1.0 @@ -44,7 +44,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#added(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#added(java.io.File) */ public boolean added(File file) { changed = changed || PLATFORM_XML.equals(file.getName()); @@ -52,7 +52,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#changed(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#changed(java.io.File) */ public boolean changed(File file) { changed = changed || PLATFORM_XML.equals(file.getName()); @@ -60,7 +60,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#getSeenFile(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#getSeenFile(java.io.File) */ public Long getSeenFile(File file) { return new Long(0); @@ -75,7 +75,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) */ public boolean isInterested(File file) { return file.getName().equals(PLATFORM_XML) && lastModified != file.lastModified(); @@ -190,7 +190,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#removed(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#removed(java.io.File) */ public boolean removed(File file) { changed = changed || PLATFORM_XML.equals(file.getName()); @@ -198,14 +198,14 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#startPoll() + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#startPoll() */ public void startPoll() { changed = false; } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#stopPoll() + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#stopPoll() */ public void stopPoll() { if (changed) diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java index bb53994f9..b752f4c9e 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/p2/reconciler/dropins/ProfileSynchronizer.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java @@ -7,21 +7,20 @@ * Contributors: * IBM Corporation - initial implementation and ideas ******************************************************************************/ -package org.eclipse.equinox.p2.reconciler.dropins; +package org.eclipse.equinox.internal.p2.reconciler.dropins; import java.io.IOException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.configurator.Configurator; -import org.eclipse.equinox.internal.p2.reconciler.dropins.Activator; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java index d12f623bf..9b6509bde 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.reconciler.dropins; import org.eclipse.equinox.internal.p2.update.Site; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; /* * Internal class contains information about watchers and sites. Used for caching. diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java index b4237be94..6e4cfe228 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.reconciler.dropins; import java.io.File; import org.eclipse.equinox.internal.p2.update.Site; -import org.eclipse.equinox.p2.directorywatcher.RepositoryListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener; /** * @since 1.0 @@ -42,7 +42,7 @@ public class SiteListener extends RepositoryListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) */ public boolean isInterested(File file) { String policy = site.getPolicy(); diff --git a/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF index de870539d..2112bf7f7 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.reconciler/META-INF/MANIFEST.MF @@ -11,16 +11,16 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 Import-Package: org.eclipse.equinox.configurator, org.eclipse.equinox.internal.p2.update, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.directorywatcher, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.directorywatcher, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0", @@ -29,3 +29,4 @@ Import-Package: org.eclipse.equinox.configurator, org.xml.sax Require-Bundle: org.eclipse.equinox.common, org.eclipse.equinox.p2.touchpoint.eclipse;bundle-version="0.1.0" +Export-Package: org.eclipse.equinox.internal.p2.reconciler.dropins;x-internal:=true diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java index 591d5e696..adcc5a71a 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/Activator.java @@ -14,13 +14,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; -import org.eclipse.equinox.p2.directorywatcher.RepositoryListener; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.reconciler.dropins.ProfileSynchronizer; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; import org.osgi.framework.*; import org.osgi.service.packageadmin.PackageAdmin; diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java index ac4bca36a..ccce641a4 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/LinksManager.java @@ -16,7 +16,7 @@ import java.net.URL; import java.util.Iterator; import java.util.Properties; import org.eclipse.equinox.internal.p2.update.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * @since 1.0 diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java index 72e3b8ebe..c0fc919a4 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java @@ -18,9 +18,9 @@ import java.util.*; import org.eclipse.core.runtime.FileLocator; import org.eclipse.equinox.internal.p2.reconciler.dropins.SiteDelta.Change; import org.eclipse.equinox.internal.p2.update.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; /** * @since 1.0 @@ -44,7 +44,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#added(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#added(java.io.File) */ public boolean added(File file) { changed = changed || PLATFORM_XML.equals(file.getName()); @@ -52,7 +52,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#changed(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#changed(java.io.File) */ public boolean changed(File file) { changed = changed || PLATFORM_XML.equals(file.getName()); @@ -60,7 +60,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#getSeenFile(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#getSeenFile(java.io.File) */ public Long getSeenFile(File file) { return new Long(0); @@ -75,7 +75,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) */ public boolean isInterested(File file) { return file.getName().equals(PLATFORM_XML) && lastModified != file.lastModified(); @@ -190,7 +190,7 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#removed(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#removed(java.io.File) */ public boolean removed(File file) { changed = changed || PLATFORM_XML.equals(file.getName()); @@ -198,14 +198,14 @@ public class PlatformXmlListener extends DirectoryChangeListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#startPoll() + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#startPoll() */ public void startPoll() { changed = false; } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener#stopPoll() + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.IDirectoryChangeListener#stopPoll() */ public void stopPoll() { if (changed) diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java index bb53994f9..b752f4c9e 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/p2/reconciler/dropins/ProfileSynchronizer.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java @@ -7,21 +7,20 @@ * Contributors: * IBM Corporation - initial implementation and ideas ******************************************************************************/ -package org.eclipse.equinox.p2.reconciler.dropins; +package org.eclipse.equinox.internal.p2.reconciler.dropins; import java.io.IOException; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.configurator.Configurator; -import org.eclipse.equinox.internal.p2.reconciler.dropins.Activator; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java index d12f623bf..9b6509bde 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteInfo.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.reconciler.dropins; import org.eclipse.equinox.internal.p2.update.Site; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; /* * Internal class contains information about watchers and sites. Used for caching. diff --git a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java index b4237be94..6e4cfe228 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java +++ b/bundles/org.eclipse.equinox.p2.reconciler/src/org/eclipse/equinox/internal/p2/reconciler/dropins/SiteListener.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.reconciler.dropins; import java.io.File; import org.eclipse.equinox.internal.p2.update.Site; -import org.eclipse.equinox.p2.directorywatcher.RepositoryListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener; /** * @since 1.0 @@ -42,7 +42,7 @@ public class SiteListener extends RepositoryListener { } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) + * @see org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener#isInterested(java.io.File) */ public boolean isInterested(File file) { String policy = site.getPolicy(); diff --git a/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF index 67d5d97ca..a4d621e5a 100644 --- a/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.sar/META-INF/MANIFEST.MF @@ -7,4 +7,4 @@ Import-Package: org.osgi.framework;version="1.3.0" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, J2SE-1.4 -Export-Package: org.eclipse.equinox.p2.sar +Export-Package: org.eclipse.equinox.internal.p2.sar;x-friends:="org.eclipse.equinox.p2.artifact.optimizers,org.eclipse.equinox.p2.artifact.processors" diff --git a/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/p2/sar/DirectByteArrayOutputStream.java b/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/DirectByteArrayOutputStream.java index 3086fede2..d7a633c16 100644 --- a/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/p2/sar/DirectByteArrayOutputStream.java +++ b/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/DirectByteArrayOutputStream.java @@ -9,7 +9,7 @@ * compeople AG (Stefan Liebig) - initial API and implementation * IBM Corporation - bug fixes and enhancements *******************************************************************************/ -package org.eclipse.equinox.p2.sar; +package org.eclipse.equinox.internal.p2.sar; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/SarOutputStream.java b/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/SarOutputStream.java index ad3608843..eeacdbf9d 100644 --- a/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/SarOutputStream.java +++ b/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/SarOutputStream.java @@ -12,7 +12,6 @@ package org.eclipse.equinox.internal.p2.sar; import java.io.*; -import org.eclipse.equinox.p2.sar.DirectByteArrayOutputStream; /** * The SarOutputStream writes a stream archive as an OutputStream. Methods are diff --git a/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/p2/sar/SarUtil.java b/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/SarUtil.java index 32ed418ee..29b54e71f 100644 --- a/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/p2/sar/SarUtil.java +++ b/bundles/org.eclipse.equinox.p2.sar/src/org/eclipse/equinox/internal/p2/sar/SarUtil.java @@ -9,11 +9,10 @@ * compeople AG (Stefan Liebig) - initial API and implementation * IBM Corporation - bug fixes and enhancements *******************************************************************************/ -package org.eclipse.equinox.p2.sar; +package org.eclipse.equinox.internal.p2.sar; import java.io.*; import java.util.zip.*; -import org.eclipse.equinox.internal.p2.sar.*; /** * Helper class for converting Zips/Jars to Sars and vice versa. diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index ab0157560..322505250 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -27,22 +27,22 @@ Import-Package: ie.wombat.jbdiff, org.eclipse.equinox.internal.p2.persistence, org.eclipse.equinox.internal.p2.resolution, org.eclipse.equinox.internal.p2.touchpoint.eclipse, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.artifact.repository.processing, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.directorywatcher, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.p2.sar, - org.eclipse.equinox.spi.p2.artifact.repository, - org.eclipse.equinox.spi.p2.core.repository, - org.eclipse.equinox.spi.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.directorywatcher, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository, + org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository, + org.eclipse.equinox.internal.p2.sar, org.eclipse.osgi.service.environment;version="1.0.0", org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.service.urlconversion;version="1.0.0", diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java index 39cc935c0..8068efcb3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java @@ -14,16 +14,16 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.IPlanner; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java index 283bfe7ae..3fbfdb4d1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java @@ -15,11 +15,11 @@ import junit.framework.Assert; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest; import org.eclipse.equinox.internal.p2.artifact.repository.Transport; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler; -import org.eclipse.equinox.p2.core.repository.RepositoryCreationException; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.spi.p2.artifact.repository.AbstractArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler; +import org.eclipse.equinox.internal.provisional.p2.core.repository.RepositoryCreationException; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository; /** * A simple artifact repository implementation used for testing purposes. diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java index a3164ca61..0a90349d2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java @@ -13,13 +13,13 @@ import java.net.URL; import java.util.*; import junit.framework.Assert; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.metadata.repository.AbstractMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.AbstractMetadataRepository; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java index 7c77620d2..a0a545ce9 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffStepTest.java @@ -17,10 +17,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff.JBDiffStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.TestData; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java index 6fd5e184b..610c35a7c 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JBDiffZipStepTest.java @@ -16,10 +16,10 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.jbdiff.JBDiffZipStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestData; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java index 611aacec5..3697abe81 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/JarDeltaOptimizerTest.java @@ -18,11 +18,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.jardelta.JarDeltaOptimizerStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.TestData; import org.eclipse.equinox.p2.tests.artifact.processors.ArtifactRepositoryMock; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java index 01e17472d..b1d081b9a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/optimizers/Pack200OptimizerTest.java @@ -16,7 +16,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.optimizers.pack200.Pack200OptimizerStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java index 462bff2dd..85c85c1e1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/ArtifactRepositoryMock.java @@ -14,8 +14,8 @@ import java.io.*; import java.lang.reflect.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; import org.eclipse.equinox.p2.tests.TestActivator; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java index ecccf486a..45c996ecf 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchStepTest.java @@ -17,11 +17,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.jbdiff.JBPatchStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.TestData; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java index bcbcb18c6..03dde90f6 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JBPatchZipStepTest.java @@ -16,11 +16,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.jbdiff.JBPatchZipStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestData; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java index 278c0a7a2..200563543 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/JarDeltaProcessorTest.java @@ -17,11 +17,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.jardelta.JarDeltaProcessorStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.TestData; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java index 4349159bb..589985476 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/processors/Pack200ProcessorTest.java @@ -16,7 +16,7 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.artifact.processors.pack200.Pack200ProcessorStep; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java index b0789cfcb..f3bd873be 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactOutputStreamTest.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository.ArtifactOutputStream; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.osgi.framework.Version; public class ArtifactOutputStreamTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java index 3b94788fa..cabff695b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/FoldersRepositoryTest.java @@ -16,8 +16,8 @@ import java.net.URL; import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java index 3a4e585b0..6882962dd 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java @@ -14,9 +14,9 @@ import java.net.MalformedURLException; import java.net.URL; import junit.framework.TestCase; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java index 286ca7b7a..766bc8bd7 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/SimpleArtifactRepositoryTest.java @@ -16,12 +16,12 @@ import java.net.URL; import junit.framework.TestCase; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; -import org.eclipse.equinox.p2.metadata.generator.Generator; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Generator; import org.eclipse.equinox.p2.tests.TestActivator; public class SimpleArtifactRepositoryTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java index 6854545eb..a52c1ac6f 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java @@ -15,9 +15,9 @@ import java.io.IOException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; public class Adder extends ProcessingStep { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java index bcf307119..90fee18a3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java @@ -15,9 +15,9 @@ import java.io.IOException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; public class ByteShifter extends ProcessingStep { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java index c13e22b13..9e1302107 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java @@ -14,9 +14,9 @@ import java.io.IOException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; public class Counter extends ProcessingStep { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java index 05f0550b8..0b48817d5 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java @@ -15,9 +15,9 @@ import java.io.IOException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.artifact.repository.Activator; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; public class Multiplier extends ProcessingStep { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java index d99dcc69f..766255908 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.artifact.processors.pack200.Pack200ProcessorStep; import org.eclipse.equinox.internal.p2.artifact.processors.verifier.MD5Verifier; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.artifact.repository.processing.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.*; import org.eclipse.equinox.p2.tests.TestActivator; public class ProcessingStepHandlerTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java index 5fe79cad5..c77e074fc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepTest.java @@ -14,8 +14,8 @@ import java.io.IOException; import java.io.OutputStream; import junit.framework.TestCase; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStep; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepHandler; public class ProcessingStepTest extends TestCase { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java index 6b59a6acf..4312a4846 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java @@ -14,10 +14,10 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.core.helpers.LogHelper; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java index 5745910aa..e3c3bb581 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java @@ -8,10 +8,10 @@ ******************************************************************************/ package org.eclipse.equinox.p2.tests.director; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java index 3431443ca..d8ca1b231 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.equinox.internal.p2.director.OperationGenerator; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java index a810ee8ed..d77463c71 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java @@ -9,11 +9,11 @@ package org.eclipse.equinox.p2.tests.director; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java index e3764d71e..7c6aaf1ba 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java @@ -9,11 +9,11 @@ package org.eclipse.equinox.p2.tests.director; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java index c51c14b2a..09d8954aa 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.p2.tests.director; import org.eclipse.equinox.internal.p2.director.Picker; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RecommendationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RecommendationTest.java index 7e7bafafe..0135fdc30 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RecommendationTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RecommendationTest.java @@ -15,7 +15,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.director.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java index 278919759..fbfb3ec61 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ReplacePlanTest.java @@ -11,10 +11,10 @@ package org.eclipse.equinox.p2.tests.director; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java index c011b603f..eb79e4a00 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java @@ -13,7 +13,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; import org.eclipse.equinox.internal.p2.resolution.UnsatisfiedCapability; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java index 18a1971d6..3ac13e90c 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java @@ -13,16 +13,16 @@ import java.net.URL; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.director.DirectorActivator; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java index 8847ead5d..fc14dd1c8 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java @@ -10,10 +10,10 @@ package org.eclipse.equinox.p2.tests.director; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java index 89f5f8e27..f236215b1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java @@ -8,10 +8,10 @@ ******************************************************************************/ package org.eclipse.equinox.p2.tests.director; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class UninstallTest extends AbstractProvisioningTest { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTest.java index c3bb6da6e..229e52881 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTest.java @@ -11,11 +11,11 @@ package org.eclipse.equinox.p2.tests.director; import java.util.Iterator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/DirectoryWatcherTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/DirectoryWatcherTest.java index 5f001dd81..3ee32ee47 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/DirectoryWatcherTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/DirectoryWatcherTest.java @@ -14,8 +14,8 @@ import java.io.File; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.p2.directorywatcher.DirectoryChangeListener; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryChangeListener; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java index 3e2ecd027..a3a692010 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java @@ -15,13 +15,13 @@ import java.io.IOException; import java.net.URL; import java.util.Hashtable; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.equinox.p2.artifact.repository.IFileArtifactRepository; -import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher; -import org.eclipse.equinox.p2.directorywatcher.RepositoryListener; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.DirectoryWatcher; +import org.eclipse.equinox.internal.provisional.p2.directorywatcher.RepositoryListener; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java index a615da4dc..d8e70af57 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java @@ -10,7 +10,7 @@ package org.eclipse.equinox.p2.tests.download; import junit.framework.*; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.download.DownloadManager; +import org.eclipse.equinox.internal.p2.download.DownloadManager; /** * Simple tests of {@link DownloadManager} API. diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java index d8d2fdef1..b1488758c 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java @@ -14,10 +14,10 @@ import java.io.File; import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/InstallRegistryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/InstallRegistryTest.java index a0e6949f4..984134422 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/InstallRegistryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/InstallRegistryTest.java @@ -13,10 +13,10 @@ package org.eclipse.equinox.p2.tests.engine; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.installregistry.IInstallRegistry; import org.eclipse.equinox.internal.p2.installregistry.IProfileInstallRegistry; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.MetadataFactory; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java index ecb4b46b2..f440e33ed 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.p2.tests.engine; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java index e524aa922..004bd02b8 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java @@ -12,8 +12,8 @@ package org.eclipse.equinox.p2.tests.engine; import java.util.Map; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java index 21beb38e6..cf1e0f442 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileRegistryTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.p2.tests.engine; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java index 954a61425..001d356c4 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; import javax.xml.parsers.ParserConfigurationException; import org.eclipse.equinox.internal.p2.engine.*; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.BundleContext; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/TouchpointTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/TouchpointTest.java index 6c7e07834..303d1af77 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/TouchpointTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/TouchpointTest.java @@ -12,9 +12,9 @@ package org.eclipse.equinox.p2.tests.engine; import java.util.Map; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.equinox.p2.tests.engine.PhaseTest.TestPhaseSet; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java index 5893ecb1a..816f09135 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java @@ -14,16 +14,16 @@ import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.director.IDirector; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.director.IDirector; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.osgi.service.environment.EnvironmentInfo; @@ -92,7 +92,7 @@ public class DirectorTest extends AbstractProvisioningTest { request.removeInstallableUnits(allRoots); operationStatus = director.provision(request, null, null); } else { - operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.p2.director.test", "The installable unit '" + System.getProperty("eclipse.p2.autoInstall") + "' has not been found"); + operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.internal.provisional.p2.director.test", "The installable unit '" + System.getProperty("eclipse.p2.autoInstall") + "' has not been found"); } if (!operationStatus.isOK()) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java index bf8e68eb6..2ba85e15d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java @@ -12,12 +12,12 @@ import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.osgi.service.environment.EnvironmentInfo; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/EclipseSDK33Test.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/EclipseSDK33Test.java index 1a9ca8f07..fe5d0ef65 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/EclipseSDK33Test.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/EclipseSDK33Test.java @@ -17,10 +17,10 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.generator.Generator; -import org.eclipse.equinox.p2.metadata.generator.IGeneratorInfo; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Generator; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.IGeneratorInfo; import org.eclipse.equinox.p2.tests.*; import org.osgi.framework.Bundle; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java index 16a25cb94..d315cd9be 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/TestGeneratorInfo.java @@ -16,10 +16,10 @@ import java.util.ArrayList; import java.util.Set; import org.eclipse.equinox.frameworkadmin.ConfigData; import org.eclipse.equinox.frameworkadmin.LauncherData; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.generator.IGeneratorInfo; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.IGeneratorInfo; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; import org.eclipse.equinox.p2.tests.TestArtifactRepository; import org.eclipse.equinox.p2.tests.TestMetadataRepository; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ArtifactKeyParsingTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ArtifactKeyParsingTest.java index 18b4acd7b..2938f0f54 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ArtifactKeyParsingTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ArtifactKeyParsingTest.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.p2.tests.metadata; import junit.framework.TestCase; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java index e71701212..f315d5ed3 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java @@ -14,9 +14,9 @@ import java.util.*; import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; import org.eclipse.osgi.service.resolver.VersionRange; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java index 517cf9ff1..2fe9b8c0d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.p2.tests.metadata; import java.util.*; import junit.framework.AssertionFailedError; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; public class FragmentTest extends AbstractProvisioningTest { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java index 315d28261..e24b97fc9 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java @@ -17,7 +17,7 @@ import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties; import org.eclipse.equinox.internal.p2.metadata.InstallableUnit; import org.eclipse.equinox.internal.p2.metadata.repository.io.MetadataParser; import org.eclipse.equinox.internal.p2.metadata.repository.io.MetadataWriter; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; import org.eclipse.osgi.service.resolver.VersionRange; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java index f6dee4507..7b59cf1d0 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.p2.tests.metadata; import java.util.*; import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.osgi.service.resolver.VersionRange; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java index 8d094e3ac..d6e3ad4a1 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java @@ -17,13 +17,13 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; -import org.eclipse.equinox.p2.metadata.generator.Generator; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Generator; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; import org.eclipse.equinox.p2.tests.TestActivator; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java index e3f47f775..be9396593 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/LocalMetadataRepositoryTest.java @@ -14,12 +14,12 @@ import java.io.File; import java.net.MalformedURLException; import java.util.Map; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; -import org.eclipse.equinox.p2.metadata.generator.Generator; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.EclipseInstallGeneratorInfoProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.Generator; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java index c78d88513..37268b4ef 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java @@ -17,10 +17,10 @@ import java.util.*; import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.eclipse.equinox.p2.tests.AbstractProvisioningTest; import org.eclipse.equinox.p2.tests.TestActivator; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java index 77f5a5708..d98ae78e7 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/DirectByteArrayOutputStreamTest.java @@ -13,10 +13,8 @@ package org.eclipse.equinox.p2.tests.sar; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Arrays; - -import org.eclipse.equinox.p2.sar.DirectByteArrayOutputStream; - import junit.framework.TestCase; +import org.eclipse.equinox.internal.p2.sar.DirectByteArrayOutputStream; /** * Test the <code>DirectByteArrayOutputStream</code> @@ -38,8 +36,7 @@ public class DirectByteArrayOutputStreamTest extends TestCase { assertEquals(ELEVEN, out.toByteArray().length); assertNotSame(out.toByteArray(), out.getBuffer()); assertEquals(1024, out.getBuffer().length); - assertEquals(JUST11BYTES, new String(out.getBuffer(), 0, out - .getBufferLength())); + assertEquals(JUST11BYTES, new String(out.getBuffer(), 0, out.getBufferLength())); ByteArrayInputStream in = out.getInputStream(); assertEquals(ELEVEN, in.available()); byte[] elevenBytes = new byte[ELEVEN]; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/SarTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/SarTest.java index 0831e76a9..4d172388a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/SarTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sar/SarTest.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.p2.tests.sar; import java.io.*; import java.util.Arrays; import junit.framework.TestCase; -import org.eclipse.equinox.p2.sar.SarUtil; +import org.eclipse.equinox.internal.p2.sar.SarUtil; import org.eclipse.equinox.p2.tests.TestData; /** diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF index b92e68006..7b7780d11 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF @@ -8,18 +8,18 @@ Bundle-Version: 0.1.0.qualifier Import-Package: org.eclipse.core.runtime;common=split, org.eclipse.equinox.frameworkadmin, org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.garbagecollector, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.generator;resolution:=optional, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.p2.garbagecollector, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.generator;resolution:=optional, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository, org.eclipse.equinox.simpleconfigurator.manipulator.internal, - org.eclipse.equinox.spi.p2.artifact.repository, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.service.environment;version="1.0.0", org.eclipse.osgi.service.resolver;version="1.2.0";resolution:=optional, diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java index c95be1e42..4562d088f 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java @@ -15,9 +15,9 @@ import java.io.OutputStream; import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.spi.p2.artifact.repository.AbstractArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository; public class AggregatedBundleRepository extends AbstractArtifactRepository implements IFileArtifactRepository { diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java index 6d9a30735..316f07d32 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java @@ -16,10 +16,10 @@ import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.frameworkadmin.BundleInfo; import org.eclipse.equinox.frameworkadmin.Manipulator; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.osgi.framework.Version; public class EclipseTouchpoint extends Touchpoint { @@ -794,7 +794,7 @@ public class EclipseTouchpoint extends Touchpoint { Class c = null; try { - c = Class.forName("org.eclipse.equinox.p2.metadata.generator.MetadataGeneratorHelper"); //$NON-NLS-1$ + c = Class.forName("org.eclipse.equinox.internal.provisional.p2.metadata.generator.MetadataGeneratorHelper"); //$NON-NLS-1$ if (c != null) c = Class.forName("org.eclipse.osgi.service.resolver.PlatformAdmin"); //$NON-NLS-1$ } catch (ClassNotFoundException e) { diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java index 1ccc78641..b38126271 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.touchpoint.eclipse; import java.io.File; import java.io.IOException; import org.eclipse.equinox.frameworkadmin.*; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.osgi.framework.*; import org.osgi.util.tracker.ServiceTracker; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MarkSetProvider.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MarkSetProvider.java index a5e125680..e134f38b1 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MarkSetProvider.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MarkSetProvider.java @@ -11,14 +11,14 @@ package org.eclipse.equinox.internal.p2.touchpoint.eclipse; import java.util.*; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.garbagecollector.IMarkSetProvider; -import org.eclipse.equinox.p2.garbagecollector.MarkSet; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.p2.garbagecollector.IMarkSetProvider; +import org.eclipse.equinox.internal.p2.garbagecollector.MarkSet; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; /** * IMarkSetProvider implementation for the EclipseTouchPoint. diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MetadataGeneratorUtils.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MetadataGeneratorUtils.java index 42d901c1d..8771a413f 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MetadataGeneratorUtils.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/MetadataGeneratorUtils.java @@ -2,10 +2,10 @@ package org.eclipse.equinox.internal.p2.touchpoint.eclipse; import java.io.File; import java.util.Map; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.generator.BundleDescriptionFactory; -import org.eclipse.equinox.p2.metadata.generator.MetadataGeneratorHelper; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.BundleDescriptionFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.MetadataGeneratorHelper; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java index 03d41f554..8a94839a9 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java @@ -17,7 +17,7 @@ import java.util.List; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.update.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * This class provides a wrapper for reading and writing platform.xml. diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java index 0872d79af..12428979e 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java @@ -14,7 +14,7 @@ import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; import org.eclipse.equinox.frameworkadmin.BundleInfo; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; import org.eclipse.equinox.simpleconfigurator.manipulator.internal.SimpleConfiguratorManipulatorImpl; import org.osgi.framework.Version; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java index 7f1a22212..0373a32e4 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java @@ -22,13 +22,13 @@ import org.eclipse.core.runtime.Path; import org.eclipse.equinox.frameworkadmin.BundleInfo; import org.eclipse.equinox.frameworkadmin.FrameworkAdmin; import org.eclipse.equinox.internal.p2.core.helpers.*; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.TouchpointData; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointData; import org.eclipse.osgi.service.environment.EnvironmentInfo; import org.eclipse.osgi.util.ManifestElement; import org.osgi.framework.BundleException; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java index 702b54e1a..bb455a9a5 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.update; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * @since 1.0 diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java index 3c519c50f..e775715ba 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java @@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.update; import java.io.*; import java.util.StringTokenizer; import javax.xml.parsers.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.w3c.dom.*; import org.xml.sax.SAXException; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java index 38bd84ae1..09421d212 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.update; import java.io.*; import java.util.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * @since 1.0 diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF index 9f6b264b4..4844f0fc5 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF @@ -8,13 +8,12 @@ Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.natives.Activator Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.engine, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.location, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.download, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.location, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, org.eclipse.osgi.service.datalocation;version="1.0.0", org.eclipse.osgi.util;version="1.0.0", org.osgi.framework;version="1.3.0", diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java index b6f5fda65..a74d2742e 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java @@ -16,12 +16,12 @@ import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.engine.Profile; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.location.AgentLocation; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; import org.osgi.framework.Version; public class NativeTouchpoint extends Touchpoint { diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF index 512631255..296aca5fa 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF @@ -5,12 +5,10 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.p2.ui.admin.rcp; singleton:=true Bundle-Version: 0.1.0.qualifier -Bundle-Activator: org.eclipse.equinox.p2.ui.admin.rcp.Activator +Bundle-Activator: org.eclipse.equinox.internal.p2.ui.admin.rcp.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Eclipse-LazyStart: true -Import-Package: org.eclipse.equinox.p2.ui.admin -Export-Package: org.eclipse.equinox.internal.p2.ui.admin.rcp;x-internal:=true, - org.eclipse.equinox.p2.ui.admin.rcp +Export-Package: org.eclipse.equinox.internal.p2.ui.admin.rcp;x-internal:=true diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml index f585d1cf5..aa8349e1d 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml @@ -7,7 +7,7 @@ point="org.eclipse.core.runtime.applications"> <application> <run - class="org.eclipse.equinox.p2.ui.admin.rcp.Application"> + class="org.eclipse.equinox.internal.p2.ui.admin.rcp.Application"> </run> </application> </extension> @@ -45,7 +45,7 @@ point="org.eclipse.ui.perspectives"> <perspective name="%perspectiveName" - class="org.eclipse.equinox.p2.ui.admin.rcp.ProvisioningRCPPerspective" + class="org.eclipse.equinox.internal.p2.ui.admin.rcp.ProvisioningRCPPerspective" id="org.eclipse.equinox.p2.ui.admin.rcp.ProvisioningRCPPerspective"> </perspective> </extension> diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Activator.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/Activator.java index 339227418..fb122d23a 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Activator.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/Activator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin.rcp; +package org.eclipse.equinox.internal.p2.ui.admin.rcp; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Application.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/Application.java index 3daa5adfe..0405033c5 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Application.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/Application.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin.rcp; +package org.eclipse.equinox.internal.p2.ui.admin.rcp; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java index 71ba9b66e..918005351 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java @@ -8,9 +8,8 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin.rcp; +package org.eclipse.equinox.internal.p2.ui.admin.rcp; -import org.eclipse.equinox.internal.p2.ui.admin.rcp.ProvAdminUIMessages; import org.eclipse.jface.action.*; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.actions.ActionFactory; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java index ba37a335e..a353f806f 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin.rcp; +package org.eclipse.equinox.internal.p2.ui.admin.rcp; import org.eclipse.ui.application.*; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java index 3c6a84a22..170ed13a8 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java @@ -8,9 +8,8 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin.rcp; +package org.eclipse.equinox.internal.p2.ui.admin.rcp; -import org.eclipse.equinox.internal.p2.ui.admin.rcp.ProvAdminUIMessages; import org.eclipse.swt.graphics.Point; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.application.*; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ProvisioningRCPPerspective.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ProvisioningRCPPerspective.java index 08f3d266d..d48313d3c 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ProvisioningRCPPerspective.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ProvisioningRCPPerspective.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin.rcp; +package org.eclipse.equinox.internal.p2.ui.admin.rcp; import org.eclipse.ui.*; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF index 3823e0d16..9cf3b451d 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF @@ -5,35 +5,34 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.p2.ui.admin;singleton:=true Bundle-Version: 0.1.0.qualifier -Bundle-Activator: org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator +Bundle-Activator: org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.1/Foundation-1.1 Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.ui.model, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.p2.ui, - org.eclipse.equinox.p2.ui.actions, - org.eclipse.equinox.p2.ui.dialogs, - org.eclipse.equinox.p2.ui.model, - org.eclipse.equinox.p2.ui.operations, - org.eclipse.equinox.p2.ui.query, - org.eclipse.equinox.p2.ui.viewers, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.p2.ui, + org.eclipse.equinox.internal.provisional.p2.ui.actions, + org.eclipse.equinox.internal.provisional.p2.ui.dialogs, + org.eclipse.equinox.internal.provisional.p2.ui.model, + org.eclipse.equinox.internal.provisional.p2.ui.operations, + org.eclipse.equinox.internal.provisional.p2.ui.query, + org.eclipse.equinox.internal.provisional.p2.ui.viewers, org.eclipse.equinox.p2.updatechecker, org.eclipse.osgi.service.environment;version="1.0.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0" Export-Package: org.eclipse.equinox.internal.p2.ui.admin;x-internal:=true, org.eclipse.equinox.internal.p2.ui.admin.dialogs;x-internal:=true, - org.eclipse.equinox.internal.p2.ui.admin.preferences;x-internal:=true, - org.eclipse.equinox.p2.ui.admin + org.eclipse.equinox.internal.p2.ui.admin.preferences;x-internal:=true Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui Eclipse-LazyStart: true diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml index 1a840007f..9acdf9763 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml @@ -66,7 +66,7 @@ class="org.eclipse.equinox.internal.p2.ui.admin.dialogs.ProfilePropertyPage" id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.ProfilePropertyPage"> <enabledWhen> - <adapt type="org.eclipse.equinox.p2.engine.IProfile"/> + <adapt type="org.eclipse.equinox.internal.provisional.p2.engine.IProfile"/> </enabledWhen> </page> <page @@ -74,7 +74,7 @@ class="org.eclipse.equinox.internal.p2.ui.admin.dialogs.IUImplementationPropertyPage" id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.IUImplementationPropertyPage"> <enabledWhen> - <adapt type="org.eclipse.equinox.p2.metadata.IInstallableUnit"/> + <adapt type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"/> </enabledWhen> </page> <page @@ -83,7 +83,7 @@ id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.InstalledIUPropertyPage"> <enabledWhen> <instanceof - value="org.eclipse.equinox.p2.ui.model.InstalledIUElement"> + value="org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement"> </instanceof> </enabledWhen> </page> @@ -92,7 +92,7 @@ class="org.eclipse.equinox.internal.p2.ui.admin.dialogs.RepositoryImplementationPropertyPage" id="org.eclipse.equinox.internal.p2.ui.admin.dialogs.RepositoryImplementationPropertyPage"> <enabledWhen> - <adapt type="org.eclipse.equinox.p2.core.repository.IRepository"/> + <adapt type="org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository"/> </enabledWhen> </page> diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java index 286975a58..4ce5871c0 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java @@ -14,10 +14,10 @@ import java.net.URL; import java.util.ArrayList; import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddArtifactRepositoryDialog; import org.eclipse.equinox.internal.p2.ui.model.ArtifactRepositoryElement; -import org.eclipse.equinox.p2.ui.model.ArtifactRepositories; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; -import org.eclipse.equinox.p2.ui.operations.RemoveArtifactRepositoryOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ArtifactRepositories; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.RemoveArtifactRepositoryOperation; import org.eclipse.swt.widgets.Shell; /** diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java index f4b7a9d85..a8ab5f2ff 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java @@ -14,16 +14,15 @@ import java.net.URL; import java.util.ArrayList; import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddMetadataRepositoryDialog; import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddProfileDialog; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.IProfileChooser; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.actions.InstallAction; -import org.eclipse.equinox.p2.ui.actions.RevertAction; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.model.*; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; -import org.eclipse.equinox.p2.ui.operations.RemoveMetadataRepositoryOperation; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.IProfileChooser; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.InstallAction; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.RevertAction; +import org.eclipse.equinox.internal.provisional.p2.ui.model.*; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.RemoveMetadataRepositoryOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.TreeViewer; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java index 3fa98a132..e38185758 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java @@ -15,16 +15,15 @@ import java.util.List; import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddProfileDialog; import org.eclipse.equinox.internal.p2.ui.admin.dialogs.UpdateAndInstallDialog; import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.actions.UninstallAction; -import org.eclipse.equinox.p2.ui.actions.UpdateAction; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.model.Profiles; -import org.eclipse.equinox.p2.ui.operations.*; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.UninstallAction; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.UpdateAction; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.Profiles; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.action.*; import org.eclipse.jface.viewers.*; import org.eclipse.swt.dnd.DND; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminQueryProvider.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminQueryProvider.java index fa6835ad3..d99d1706a 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminQueryProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminQueryProvider.java @@ -11,20 +11,19 @@ package org.eclipse.equinox.internal.p2.ui.admin; import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.MetadataFactory; -import org.eclipse.equinox.p2.metadata.query.CapabilityQuery; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.model.*; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.CapabilityQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.*; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.*; import org.eclipse.equinox.p2.updatechecker.UpdateEvent; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/p2/ui/admin/ProvAdminUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java index 5868a5058..2abd09093 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/p2/ui/admin/ProvAdminUIActivator.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java @@ -8,10 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.admin; +package org.eclipse.equinox.internal.p2.ui.admin; -import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminQueryProvider; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -24,8 +23,8 @@ public class ProvAdminUIActivator extends AbstractUIPlugin { private static ProvAdminUIActivator plugin; private static BundleContext context; - public static final String PLUGIN_ID = "org.eclipse.equinox.p2.ui.admin"; //$NON-NLS-1$ - public static final String PERSPECTIVE_ID = "org.eclipse.equinox.p2.ui.admin.ProvisioningPerspective"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.equinox.internal.provisional.p2.ui.admin"; //$NON-NLS-1$ + public static final String PERSPECTIVE_ID = "org.eclipse.equinox.internal.provisional.p2.ui.admin.ProvisioningPerspective"; //$NON-NLS-1$ private IQueryProvider queryProvider; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java index 808bd64fd..fd8692b09 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java @@ -13,9 +13,8 @@ package org.eclipse.equinox.internal.p2.ui.admin; import java.util.ArrayList; import java.util.List; import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.action.*; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java index 16950553f..ce0241d91 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java @@ -14,13 +14,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; -import org.eclipse.equinox.p2.ui.viewers.RepositoryContentProvider; -import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.RepositoryContentProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.StructuredViewerProvisioningListener; import org.eclipse.jface.action.*; import org.eclipse.jface.viewers.*; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java index a73e6bab6..ee04907ae 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java @@ -12,9 +12,9 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import java.net.URL; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.ui.dialogs.AddRepositoryDialog; -import org.eclipse.equinox.p2.ui.operations.AddArtifactRepositoryOperation; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AddRepositoryDialog; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddArtifactRepositoryOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.swt.widgets.Shell; /** diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java index 4427b8b7e..da54e92db 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java @@ -12,9 +12,9 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import java.net.URL; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.ui.dialogs.AddRepositoryDialog; -import org.eclipse.equinox.p2.ui.operations.AddMetadataRepositoryOperation; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AddRepositoryDialog; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddMetadataRepositoryOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.swt.widgets.Shell; /** diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java index f640754d4..2b45ecaa7 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java @@ -13,11 +13,11 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.operations.AddProfileOperation; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddProfileOperation; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.events.ModifyEvent; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java index 2740a4742..689c3486b 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUGroup.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Composite; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java index 910d54af5..77e431ade 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java @@ -12,10 +12,10 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java index a025950eb..b1ab2de42 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationPropertyPage.java @@ -12,8 +12,8 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java index 828caceb9..02586a724 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUProfilePropertiesGroup.java @@ -11,12 +11,12 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyListener; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java index 1c3df71f8..a6f10953f 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUPropertiesGroup.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java index 4a1fa07fc..184b66c44 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/InstalledIUPropertyPage.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java index e7dbb5357..bad107b3c 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfileGroup.java @@ -16,10 +16,10 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.ProfileFactory; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.ProfileFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java index fe293b552..ad66de291 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/ProfilePropertyPage.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.*; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java index d76dc855a..17beac41c 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/RepositoryImplementationPropertyPage.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; import java.util.Map; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.ui.dialogs.RepositoryPropertyPage; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositoryPropertyPage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java index 888906d4a..88cf0c818 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.dialogs; +import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; -import org.eclipse.equinox.p2.ui.dialogs.UpdateAndInstallGroup; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UpdateAndInstallGroup; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.resource.JFaceResources; diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java index 1f1a7281c..66b9336f7 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java @@ -15,9 +15,9 @@ package org.eclipse.equinox.internal.p2.ui.admin.preferences; */ public class PreferenceConstants { - public static final String PREF_SHOW_GROUPS_ONLY = "org.eclipse.equinox.p2.ui.admin.showGroupsOnly"; //$NON-NLS-1$ - public static final String PREF_HIDE_SYSTEM_REPOS = "org.eclipse.equinox.p2.ui.admin.hideSystemRepos"; //$NON-NLS-1$ - public static final String PREF_COLLAPSE_IU_VERSIONS = "org.eclipse.equinox.p2.ui.admin.collapseIUVersions"; //$NON-NLS-1$ - public static final String PREF_USE_CATEGORIES = "org.eclipse.equinox.p2.ui.admin.useCategories"; //$NON-NLS-1$ - public static final String PREF_SHOW_INSTALL_ROOTS_ONLY = "org.eclipse.equinox.p2.ui.admin.showInstallRoots"; //$NON-NLS-1$ + public static final String PREF_SHOW_GROUPS_ONLY = "org.eclipse.equinox.internal.provisional.p2.ui.admin.showGroupsOnly"; //$NON-NLS-1$ + public static final String PREF_HIDE_SYSTEM_REPOS = "org.eclipse.equinox.internal.provisional.p2.ui.admin.hideSystemRepos"; //$NON-NLS-1$ + public static final String PREF_COLLAPSE_IU_VERSIONS = "org.eclipse.equinox.internal.provisional.p2.ui.admin.collapseIUVersions"; //$NON-NLS-1$ + public static final String PREF_USE_CATEGORIES = "org.eclipse.equinox.internal.provisional.p2.ui.admin.useCategories"; //$NON-NLS-1$ + public static final String PREF_SHOW_INSTALL_ROOTS_ONLY = "org.eclipse.equinox.internal.provisional.p2.ui.admin.showInstallRoots"; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java index 359e3ba66..043a68f51 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.ui.admin.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; +import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.jface.preference.IPreferenceStore; /** diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java index 04ba92132..a825b3bce 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.admin.preferences; +import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages; -import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF index 0be1e4e9c..8769e7945 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF @@ -7,23 +7,23 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.ui.sdk;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator Import-Package: org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.p2.ui, - org.eclipse.equinox.p2.ui.actions, - org.eclipse.equinox.p2.ui.dialogs, - org.eclipse.equinox.p2.ui.model, - org.eclipse.equinox.p2.ui.operations, - org.eclipse.equinox.p2.ui.query, - org.eclipse.equinox.p2.ui.viewers, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.p2.ui, + org.eclipse.equinox.internal.provisional.p2.ui.actions, + org.eclipse.equinox.internal.provisional.p2.ui.dialogs, + org.eclipse.equinox.internal.provisional.p2.ui.model, + org.eclipse.equinox.internal.provisional.p2.ui.operations, + org.eclipse.equinox.internal.provisional.p2.ui.query, + org.eclipse.equinox.internal.provisional.p2.ui.viewers, org.eclipse.equinox.p2.updatechecker, org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.1.0", diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml index 652fb29fc..52e3cec8c 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml @@ -14,42 +14,42 @@ point="org.eclipse.ui.propertyPages"> <page name="%IU.copyright" - class="org.eclipse.equinox.p2.ui.dialogs.IUCopyrightPropertyPage" + class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.IUCopyrightPropertyPage" id="org.eclipse.equinox.p2.ui.sdk.IUCopyrightPropertyPage"> <enabledWhen> <adapt - type="org.eclipse.equinox.p2.metadata.IInstallableUnit"> + type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"> </adapt> </enabledWhen> </page> <page name="%IU.general" - class="org.eclipse.equinox.p2.ui.dialogs.IUGeneralInfoPropertyPage" + class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.IUGeneralInfoPropertyPage" id="org.eclipse.equinox.p2.ui.sdk.IUGeneralInfoPropertyPage"> <enabledWhen> <adapt - type="org.eclipse.equinox.p2.metadata.IInstallableUnit"> + type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"> </adapt> </enabledWhen> </page> <page name="%IU.license" - class="org.eclipse.equinox.p2.ui.dialogs.IULicensePropertyPage" + class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.IULicensePropertyPage" id="org.eclipse.equinox.p2.ui.sdk.IULicensePropertyPage"> <enabledWhen> <adapt - type="org.eclipse.equinox.p2.metadata.IInstallableUnit"> + type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"> </adapt> </enabledWhen> </page> <page name="%Repository.name" - class="org.eclipse.equinox.p2.ui.dialogs.RepositoryPropertyPage" + class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositoryPropertyPage" id="org.eclipse.equinox.internal.p2.ui.sdk.RepositoryPropertyPage"> <enabledWhen> <adapt - type="org.eclipse.equinox.p2.ui.model.RepositoryElement"> + type="org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement"> </adapt> </enabledWhen> </page> diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AddColocatedRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AddColocatedRepositoryDialog.java index 79f4aa412..608252e29 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AddColocatedRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AddColocatedRepositoryDialog.java @@ -12,9 +12,9 @@ package org.eclipse.equinox.internal.p2.ui.sdk; import java.net.MalformedURLException; import java.net.URL; -import org.eclipse.equinox.p2.ui.dialogs.AddRepositoryDialog; -import org.eclipse.equinox.p2.ui.operations.AddColocatedRepositoryOperation; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.AddRepositoryDialog; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.AddColocatedRepositoryOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.swt.widgets.Shell; /** diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AutomaticUpdateScheduler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AutomaticUpdateScheduler.java index ae4c24808..df5934326 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AutomaticUpdateScheduler.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/AutomaticUpdateScheduler.java @@ -14,7 +14,7 @@ import java.util.Calendar; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.p2.updatechecker.IUpdateListener; import org.eclipse.equinox.p2.updatechecker.UpdateChecker; import org.eclipse.ui.IStartup; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKQueryProvider.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKQueryProvider.java index d33fb37e9..bd68e815d 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKQueryProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKQueryProvider.java @@ -11,19 +11,19 @@ package org.eclipse.equinox.internal.p2.ui.sdk; import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.MetadataFactory; -import org.eclipse.equinox.p2.metadata.query.CapabilityQuery; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.*; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.*; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.CapabilityQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.*; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.*; import org.eclipse.equinox.p2.updatechecker.UpdateEvent; /** diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java index af31b5f92..b371267cb 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java @@ -13,13 +13,13 @@ package org.eclipse.equinox.internal.p2.ui.sdk; import java.io.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.sdk.updates.AutomaticUpdater; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.statushandlers.StatusManager; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java index d4a611a6c..09a579472 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java @@ -13,15 +13,15 @@ package org.eclipse.equinox.internal.p2.ui.sdk; import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.model.MetadataRepositories; -import org.eclipse.equinox.p2.ui.model.MetadataRepositoryElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.operations.RemoveColocatedRepositoryOperation; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.model.MetadataRepositories; +import org.eclipse.equinox.internal.provisional.p2.ui.model.MetadataRepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.RemoveColocatedRepositoryOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.*; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java index 0283a8999..cf9be3180 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java @@ -11,10 +11,10 @@ package org.eclipse.equinox.internal.p2.ui.sdk; import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants; -import org.eclipse.equinox.p2.ui.IProfileChooser; -import org.eclipse.equinox.p2.ui.IRepositoryManipulator; -import org.eclipse.equinox.p2.ui.dialogs.RevertWizard; -import org.eclipse.equinox.p2.ui.dialogs.UpdateAndInstallGroup; +import org.eclipse.equinox.internal.provisional.p2.ui.IProfileChooser; +import org.eclipse.equinox.internal.provisional.p2.ui.IRepositoryManipulator; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RevertWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UpdateAndInstallGroup; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java index dd698166b..a9842c5e6 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java @@ -11,7 +11,7 @@ package org.eclipse.equinox.internal.p2.ui.sdk; import org.eclipse.core.commands.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java index 30744c568..05c40b5b7 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdater.java @@ -17,20 +17,20 @@ import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; import org.eclipse.equinox.internal.p2.ui.sdk.*; import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProfileEvent; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.dialogs.UpdateWizard; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.operations.*; -import org.eclipse.equinox.p2.ui.query.ElementQueryDescriptor; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProfileEvent; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UpdateWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; +import org.eclipse.equinox.internal.provisional.p2.ui.query.ElementQueryDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.equinox.p2.updatechecker.IUpdateListener; import org.eclipse.equinox.p2.updatechecker.UpdateEvent; import org.eclipse.jface.action.IStatusLineManager; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdatesPopup.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdatesPopup.java index 46b696812..2f0569e2f 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdatesPopup.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/updates/AutomaticUpdatesPopup.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKMessages; import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator; import org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceConstants; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.PopupDialog; import org.eclipse.jface.layout.GridDataFactory; diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/p2/ui/sdk/ProvSDKUI.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/p2/ui/sdk/ProvSDKUI.java index 34f46a871..ae4d191d4 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/p2/ui/sdk/ProvSDKUI.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/p2/ui/sdk/ProvSDKUI.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.p2.ui.sdk; import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * ProvSDKUI provides API for accessing the configurable p2 UI components diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF index c231a794c..d568c3fa1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF @@ -8,19 +8,19 @@ Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.ui.ProvUIActivator Import-Package: org.eclipse.equinox.configurator, org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.artifact.repository.processing, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.eventbus, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.engine.phases, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.eventbus, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.engine.phases, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository, org.eclipse.equinox.p2.updatechecker, - org.eclipse.equinox.spi.p2.core.repository, org.eclipse.osgi.service.resolver;version="1.1.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0", @@ -30,13 +30,13 @@ Export-Package: org.eclipse.equinox.internal.p2.ui;x-internal:=true, org.eclipse.equinox.internal.p2.ui.dialogs;x=internal:=true, org.eclipse.equinox.internal.p2.ui.model;x=internal:=true, org.eclipse.equinox.internal.p2.ui.viewers;x=internal:=true, - org.eclipse.equinox.p2.ui, - org.eclipse.equinox.p2.ui.actions, - org.eclipse.equinox.p2.ui.dialogs, - org.eclipse.equinox.p2.ui.model, - org.eclipse.equinox.p2.ui.operations, - org.eclipse.equinox.p2.ui.query, - org.eclipse.equinox.p2.ui.viewers + org.eclipse.equinox.internal.provisional.p2.ui, + org.eclipse.equinox.internal.provisional.p2.ui.actions, + org.eclipse.equinox.internal.provisional.p2.ui.dialogs, + org.eclipse.equinox.internal.provisional.p2.ui.model, + org.eclipse.equinox.internal.provisional.p2.ui.operations, + org.eclipse.equinox.internal.provisional.p2.ui.query, + org.eclipse.equinox.internal.provisional.p2.ui.viewers Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.equinox.simpleconfigurator diff --git a/bundles/org.eclipse.equinox.p2.ui/plugin.xml b/bundles/org.eclipse.equinox.p2.ui/plugin.xml index c70329808..0e5d23313 100644 --- a/bundles/org.eclipse.equinox.p2.ui/plugin.xml +++ b/bundles/org.eclipse.equinox.p2.ui/plugin.xml @@ -6,11 +6,11 @@ <factory adaptableType="org.eclipse.equinox.internal.p2.ui.model.ProvElement" class="org.eclipse.equinox.internal.p2.ui.ProvUIAdapterFactory"> - <adapter type="org.eclipse.equinox.p2.metadata.IInstallableUnit"/> - <adapter type="org.eclipse.equinox.p2.engine.IProfile"/> - <adapter type="org.eclipse.equinox.p2.core.repository.IRepository"/> - <adapter type="org.eclipse.equinox.p2.metadata.repository.IMetadataRepository"/> - <adapter type="org.eclipse.equinox.p2.artifact.repository.IArtifactRepository"/> + <adapter type="org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit"/> + <adapter type="org.eclipse.equinox.internal.provisional.p2.engine.IProfile"/> + <adapter type="org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository"/> + <adapter type="org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository"/> + <adapter type="org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository"/> </factory> </extension> diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java index 7750fd2fb..1f79038ca 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/IProvisioningListener.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; /** * A tagging listener used to distinguish listeners diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java index 8f1123254..b2ca759c0 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIActivator.java @@ -14,14 +14,14 @@ import java.net.URL; import java.util.EventObject; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus; -import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningEventBus; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.ProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.StructuredViewerProvisioningListener; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java index 2933d439e..5f23424e9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIAdapterFactory.java @@ -11,12 +11,12 @@ package org.eclipse.equinox.internal.p2.ui; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * Adapter factory for provisioning elements diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java index 85d97124c..aa7782658 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/actions/ProfileModificationAction.java @@ -17,9 +17,9 @@ import java.util.List; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ISelectionProvider; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java index 3b1101ff6..433afe5ef 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java @@ -15,10 +15,10 @@ import java.util.List; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; import org.eclipse.equinox.internal.p2.ui.viewers.StaticContentProvider; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.*; import org.eclipse.jface.wizard.WizardPage; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java index 0ae86e9bc..24ad43f9e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IUPropertyPage.java @@ -11,8 +11,8 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.FontMetrics; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java index cc5058fe2..dd0a2d5c7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/InstallWizardPage.java @@ -12,12 +12,12 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; public class InstallWizardPage extends UpdateOrInstallWizardPage { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java index f53b6b183..96e41e4dc 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProfileModificationWizardPage.java @@ -19,17 +19,17 @@ import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.AvailableIUElement; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; import org.eclipse.equinox.internal.p2.ui.viewers.StaticContentProvider; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.model.IUElement; -import org.eclipse.equinox.p2.ui.operations.ProfileModificationOperation; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProfileModificationOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java index 645cc2836..a9813216a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RevertProfileWizardPage.java @@ -16,16 +16,16 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.viewers.StaticContentProvider; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.model.RollbackProfileElement; -import org.eclipse.equinox.p2.ui.model.RollbackRepositoryElement; -import org.eclipse.equinox.p2.ui.operations.*; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RollbackProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RollbackRepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java index 80e0cc572..88a5c52f8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/StructuredIUGroup.java @@ -12,10 +12,10 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import java.util.ArrayList; import java.util.List; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java index 425f8b4ef..555d65366 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UninstallWizardPage.java @@ -12,12 +12,12 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; public class UninstallWizardPage extends ProfileModificationWizardPage { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java index 8f0397885..bc8905ad3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizard.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.dialogs; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java index 6362d550f..477293da9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateOrInstallWizardPage.java @@ -11,9 +11,9 @@ package org.eclipse.equinox.internal.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; public abstract class UpdateOrInstallWizardPage extends ProfileModificationWizardPage { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java index e72429e7b..e72187012 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizardPage.java @@ -14,15 +14,15 @@ import java.util.*; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.AvailableUpdateElement; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProfileChangeRequest; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.IUpdateDescriptor; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.ElementQueryDescriptor; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IUpdateDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.ElementQueryDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.equinox.p2.updatechecker.UpdateEvent; import org.eclipse.swt.widgets.Text; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java index 9b8d45b2a..af5285472 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactElement.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.model; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; /** * Element wrapper class for an artifact key and its repository @@ -31,7 +31,7 @@ public class ArtifactElement extends ProvElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java index 807231454..ff3c5b095 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ArtifactRepositoryElement.java @@ -14,14 +14,14 @@ import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IElementCollector; @@ -104,7 +104,7 @@ public class ArtifactRepositoryElement extends ProvElement implements IDeferredW } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getURL() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getURL() */ public URL getLocation() { return url; @@ -112,7 +112,7 @@ public class ArtifactRepositoryElement extends ProvElement implements IDeferredW /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getName() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getName() */ public String getName() { try { @@ -127,7 +127,7 @@ public class ArtifactRepositoryElement extends ProvElement implements IDeferredW /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getDescription() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getDescription() */ public String getDescription() { try { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java index e430148db..7f2c673f9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java @@ -11,15 +11,15 @@ package org.eclipse.equinox.internal.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.engine.phases.Sizing; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.IUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; /** * Element wrapper class for IU's that are available for installation. @@ -42,7 +42,7 @@ public class AvailableIUElement extends ProvElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_UNINSTALLED_IU; @@ -58,7 +58,7 @@ public class AvailableIUElement extends ProvElement implements IUElement { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getParent(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getParent(java.lang.Object) */ public Object getParent(Object o) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java index 2214f4e13..a9bbdfa67 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableUpdateElement.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.ui.model; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; /** * Element wrapper class for IU's that are available for installation. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java index 5f0e7779a..82847b6dc 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/ProvElement.java @@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.ui.model; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.model.IWorkbenchAdapter; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java index 226b11038..bc77fb708 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RemoteQueriedElement.java @@ -12,8 +12,8 @@ package org.eclipse.equinox.internal.p2.ui.model; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.equinox.p2.ui.query.ElementQueryDescriptor; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.ElementQueryDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; import org.eclipse.ui.progress.IElementCollector; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java index ad166de06..e2e1b3438 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/AvailableIUContentProvider.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.jobs.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.RepositoryContentProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.RepositoryContentProvider; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osgi.util.NLS; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java index e021500eb..f3c2aad39 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/viewers/IUDetailsLabelProvider.java @@ -17,11 +17,11 @@ import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.IUElement; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; import org.eclipse.jface.viewers.*; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProfileChooser.java index 6deb8db4b..21bcf5168 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IProfileChooser.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IRepositoryManipulator.java index 9b2df4f01..56c829817 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IRepositoryManipulator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LicenseManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/LicenseManager.java index 72cdef824..3472a8511 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/LicenseManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/LicenseManager.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Abstract class for a manager which tracks which licenses have been accepted. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProfileFactory.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProfileFactory.java index efaa0400f..9ccb5e549 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProfileFactory.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProfileFactory.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.Platform; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.osgi.service.environment.EnvironmentInfo; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java index c25e925fa..bd09699cb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUI.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -21,8 +21,8 @@ import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.ApplyProfileChangesDialog; -import org.eclipse.equinox.p2.ui.viewers.IUColumnConfig; -import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.IUColumnConfig; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.StructuredViewerProvisioningListener; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java index 96a7b456d..a1b7e30a1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvUIImages.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.jface.resource.ImageDescriptor; @@ -16,7 +16,7 @@ import org.eclipse.swt.graphics.Image; /** * ProvUIImages provides convenience methods for accessing shared images - * provided by the <i>org.eclipse.equinox.p2.ui</i> plug-in. + * provided by the <i>org.eclipse.equinox.internal.provisional.p2.ui</i> plug-in. * <p> * This class provides <code>ImageDescriptor</code>s for each named image in * {@link ProvUIImages}. All <code>Image</code> objects created from the diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningOperationRunner.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvisioningOperationRunner.java index 1bcbf46a4..f4c6a5914 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningOperationRunner.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/ProvisioningOperationRunner.java @@ -9,14 +9,14 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoableOperation; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.WorkbenchJob; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/SimpleLicenseManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/SimpleLicenseManager.java index 55ecb077d..79f34c0a6 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/SimpleLicenseManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/SimpleLicenseManager.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui; +package org.eclipse.equinox.internal.provisional.p2.ui; import java.io.*; import java.util.HashSet; import java.util.Set; import javax.xml.parsers.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.w3c.dom.*; import org.xml.sax.SAXException; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java index 150c091dc..78cb89a00 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/InstallAction.java @@ -9,18 +9,18 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.dialogs.InstallWizard; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.InstallWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/RevertAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/RevertAction.java index 9985fe1df..c967de07a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/RevertAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/RevertAction.java @@ -9,16 +9,16 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.operations.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.*; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Shell; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java index 20d429692..0d6462673 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UninstallAction.java @@ -9,20 +9,20 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.IProfileChooser; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.dialogs.UninstallWizard; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.IProfileChooser; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UninstallWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java index d36dea0fb..67e216d81 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/actions/UpdateAction.java @@ -9,21 +9,21 @@ * IBM Corporation - initial API and implementation ******************************************************************************/ -package org.eclipse.equinox.p2.ui.actions; +package org.eclipse.equinox.internal.provisional.p2.ui.actions; import java.util.ArrayList; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.dialogs.UpdateWizard; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.UpdateWizard; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; @@ -78,7 +78,7 @@ public class UpdateAction extends ProfileModificationAction { * a plan until the dialog is launched. The dialog uses preferences * to determine which updates to show and which are selected by default. * (non-Javadoc) - * @see org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction#validatePlan(org.eclipse.equinox.p2.director.ProvisioningPlan) + * @see org.eclipse.equinox.internal.p2.ui.actions.ProfileModificationAction#validatePlan(org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan) */ protected boolean validatePlan(ProvisioningPlan plan) { if (status != null) { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java index 70f4178e7..f757e46b5 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AddRepositoryDialog.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import java.net.MalformedURLException; import java.net.URL; @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.ui.ProvisioningOperationRunner; -import org.eclipse.equinox.p2.ui.operations.ProvisioningOperation; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvisioningOperationRunner; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningOperation; import org.eclipse.jface.dialogs.*; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AvailableIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUGroup.java index 864c486dd..b78664bb9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AvailableIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/AvailableIUGroup.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.dialogs.StructuredIUGroup; import org.eclipse.equinox.internal.p2.ui.viewers.AvailableIUContentProvider; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.MetadataRepositories; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.MetadataRepositories; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUCopyrightPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java index d65c78223..248ed1d20 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUCopyrightPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGeneralInfoPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java index 05c577657..f916345e6 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGeneralInfoPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUGeneralInfoPropertyPage.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IULicensePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java index 5da8a6a80..df55dd204 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IULicensePropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstallWizard.java index 0188ff533..effb00f62 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstallWizard.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.*; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; /** * @since 3.4 diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstalledIUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstalledIUGroup.java index f84baee23..b4b444549 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/InstalledIUGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/InstalledIUGroup.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.dialogs.StructuredIUGroup; import org.eclipse.equinox.internal.p2.ui.viewers.IUDetailsLabelProvider; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.viewers.*; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.viewers.*; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositoryPropertyPage.java index 5e956703c..3b40e816e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RepositoryPropertyPage.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RevertWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RevertWizard.java index 2226e0786..28cc8fd4d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RevertWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/RevertWizard.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.RevertProfileWizardPage; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.wizard.Wizard; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UninstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UninstallWizard.java index 20273af62..4e3efd678 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UninstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UninstallWizard.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.UninstallWizardPage; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; import org.eclipse.jface.wizard.Wizard; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateAndInstallGroup.java index 6ae45ed4a..c7135cf2b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateAndInstallGroup.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.core.runtime.Assert; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.actions.PropertyDialogAction; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.ui.*; -import org.eclipse.equinox.p2.ui.actions.*; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.ui.*; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.*; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateWizard.java index 8598d0ccc..b531996fb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/UpdateWizard.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.dialogs; +package org.eclipse.equinox.internal.provisional.p2.ui.dialogs; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.dialogs.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * @since 3.4 diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositories.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ArtifactRepositories.java index ac2e5d547..7e240a2a3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositories.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ArtifactRepositories.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Element class that represents the root of an artifact diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/CategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/CategoryElement.java index 7c4fe6a71..2d55e03ad 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/CategoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/CategoryElement.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * Element wrapper class for IU's that represent categories of @@ -32,7 +32,7 @@ public class CategoryElement extends RemoteQueriedElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_CATEGORY; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUElement.java index b1a857ff3..e454d45bf 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUElement.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Interface for elements that represent IU's. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUVersionsElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUVersionsElement.java index f504aee01..5716bf714 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/IUVersionsElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/IUVersionsElement.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.model.CachedQueryElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * Element wrapper class for a particular IU version, whose diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java index e118fdcff..eff87bbf8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; /** * Element wrapper class for installed IU's. Used instead of the plain IU when @@ -33,7 +33,7 @@ public class InstalledIUElement extends ProvElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_IU; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositories.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositories.java index d516275df..f31ee5dfa 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositories.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositories.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Element class that represents the root of a metadata @@ -37,7 +37,7 @@ public class MetadataRepositories extends QueriedElement { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#getQueryType() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#getQueryType() */ protected int getQueryType() { return IQueryProvider.METADATA_REPOS; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositoryElement.java index 83f9dd000..9c1a3422f 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/MetadataRepositoryElement.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.osgi.util.NLS; /** @@ -65,7 +65,7 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R /* * overridden to lazily fetch repository * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#getQueryable() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#getQueryable() */ public IQueryable getQueryable() { if (queryable == null) @@ -92,14 +92,14 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R * overridden to check whether url is specified rather * than loading the repo via getQueryable() * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#knowsQueryable() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#knowsQueryable() */ public boolean knowsQueryable() { return url != null; } /* (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getURL() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getURL() */ public URL getLocation() { return url; @@ -107,7 +107,7 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getName() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getName() */ public String getName() { try { @@ -122,7 +122,7 @@ public class MetadataRepositoryElement extends RemoteQueriedElement implements R /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getDescription() + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getDescription() */ public String getDescription() { try { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ProfileElement.java index 73af862ca..3f2bc457c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/ProfileElement.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.osgi.util.NLS; /** @@ -64,7 +64,7 @@ public class ProfileElement extends RemoteQueriedElement { * Overridden to check whether we know the profile id rather * than fetch the profile from the registry using getQueryable() * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.query.QueriedElement#knowsQueryable() + * @see org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement#knowsQueryable() */ public boolean knowsQueryable() { return profileId != null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/Profiles.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/Profiles.java index 721689324..df1077e68 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/Profiles.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/Profiles.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Element class that represents the root of a profile @@ -35,7 +35,7 @@ public class Profiles extends QueriedElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getParent(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement#getParent(java.lang.Object) */ public Object getParent(Object o) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/QueriedElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/QueriedElementCollector.java index 3340e26b7..e756b1193 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/QueriedElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/QueriedElementCollector.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; /** * Collector that assigns a query provider and the queryable diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RepositoryElement.java index 83a9ce1ad..bc28597d4 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RepositoryElement.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; /** * Interface for elements that represent repositories. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackProfileElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackProfileElement.java index 84bc2cff2..1fcc1a060 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackProfileElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackProfileElement.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.text.DateFormat; import java.util.*; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.RequiredCapability; -import org.eclipse.equinox.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; /** * Element wrapper class for IU's that represent categories of @@ -34,7 +34,7 @@ public class RollbackProfileElement extends ProvElement implements IUElement { /* * (non-Javadoc) * - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getImageID(java.lang.Object) */ protected String getImageId(Object obj) { return ProvUIImages.IMG_PROFILE; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackRepositoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackRepositoryElement.java index 54c5623a5..0695bdfa7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/RollbackRepositoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/RollbackRepositoryElement.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; import java.net.URL; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/UncategorizedCategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/UncategorizedCategoryElement.java index 92e375c1c..f12896d1b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/UncategorizedCategoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/UncategorizedCategoryElement.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.model; +package org.eclipse.equinox.internal.provisional.p2.ui.model; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * Element wrapper class for an IU that shows all uncategorized IU's. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddArtifactRepositoryOperation.java index ac4de7e40..50a384671 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddArtifactRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation which adds an artifact repository given its URL. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java index 69a7119c7..f76d327c3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddColocatedRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that adds colocated artifact and metadata repositories diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddMetadataRepositoryOperation.java index cf7d38b48..704f9a3f8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddMetadataRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that adds a metadata repository given its URL. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddProfileOperation.java index 6ba7fc40b..806c259b0 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/AddProfileOperation.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.util.Map; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** * Operation that adds the given profile to the profile registry. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/DownloadPhaseSet.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/DownloadPhaseSet.java index 357ba2af0..3267c2a5e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/DownloadPhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/DownloadPhaseSet.java @@ -11,11 +11,11 @@ /** * */ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; -import org.eclipse.equinox.p2.engine.Phase; -import org.eclipse.equinox.p2.engine.PhaseSet; -import org.eclipse.equinox.p2.engine.phases.Collect; +import org.eclipse.equinox.internal.provisional.p2.engine.Phase; +import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Collect; public class DownloadPhaseSet extends PhaseSet { public DownloadPhaseSet() { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallAndConfigurePhaseSet.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/InstallAndConfigurePhaseSet.java index 89bef7901..8bceb1af2 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallAndConfigurePhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/InstallAndConfigurePhaseSet.java @@ -11,11 +11,11 @@ /** * */ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; -import org.eclipse.equinox.p2.engine.Phase; -import org.eclipse.equinox.p2.engine.PhaseSet; -import org.eclipse.equinox.p2.engine.phases.*; +import org.eclipse.equinox.internal.provisional.p2.engine.Phase; +import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.*; public class InstallAndConfigurePhaseSet extends PhaseSet { public InstallAndConfigurePhaseSet() { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileModificationOperation.java index 50ba53504..705030a01 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileModificationOperation.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.ProvisioningPlan; -import org.eclipse.equinox.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan; +import org.eclipse.equinox.internal.provisional.p2.engine.*; /** * Class representing a provisioning profile plan diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileOperation.java index 15d1077bf..8b3df312d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProfileOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.runtime.Assert; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** * Abstract class representing provisioning profile operations diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningOperation.java index fea193b4a..b7a7d549d 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningOperation.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.osgi.util.NLS; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningUtil.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java index 5cc6e47a2..0ecf155a1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningUtil.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/ProvisioningUtil.java @@ -9,22 +9,22 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.*; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.director.*; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.engine.phases.Sizing; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.director.*; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; import org.eclipse.osgi.util.NLS; /** @@ -219,8 +219,8 @@ public class ProvisioningUtil { return getEngine().perform(profile, set, plan.getOperands(), null, monitor); } - private static Engine getEngine() throws ProvisionException { - Engine engine = (Engine) ServiceHelper.getService(ProvUIActivator.getContext(), Engine.class.getName()); + private static IEngine getEngine() throws ProvisionException { + IEngine engine = (IEngine) ServiceHelper.getService(ProvUIActivator.getContext(), IEngine.SERVICE_NAME); if (engine == null) { throw new ProvisionException(ProvUIMessages.ProvisioningUtil_NoEngineFound); } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveArtifactRepositoryOperation.java index 14b62f274..ef5645251 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveArtifactRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation which removes the artifact repository with the given URL. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveColocatedRepositoryOperation.java index 48dd678ea..c7fb1cb26 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveColocatedRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that removes the colocated repositories with the given URLs. * diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveMetadataRepositoryOperation.java index 0ee904176..662e86517 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveMetadataRepositoryOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; /** * Operation that removes the metadata repository with the given URL. * diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveProfilesOperation.java index d3c5e95e6..50323817b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RemoveProfilesOperation.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; /** * Operation that removes a profile diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RepositoryOperation.java index 816b7f6fc..f4c637b60 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/RepositoryOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.net.URL; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/SizingPhaseSet.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/SizingPhaseSet.java index bec3431f5..ff7a3ee83 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/SizingPhaseSet.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/SizingPhaseSet.java @@ -11,12 +11,12 @@ /** * */ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.engine.Phase; -import org.eclipse.equinox.p2.engine.PhaseSet; -import org.eclipse.equinox.p2.engine.phases.Sizing; +import org.eclipse.equinox.internal.provisional.p2.engine.Phase; +import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet; +import org.eclipse.equinox.internal.provisional.p2.engine.phases.Sizing; public class SizingPhaseSet extends PhaseSet { private static Sizing sizing; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UndoableProvisioningOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/UndoableProvisioningOperation.java index 1940d69b1..b427ae485 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UndoableProvisioningOperation.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/operations/UndoableProvisioningOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.operations; +package org.eclipse.equinox.internal.provisional.p2.ui.operations; import java.util.ArrayList; import java.util.List; @@ -17,8 +17,8 @@ import org.eclipse.core.commands.operations.*; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.osgi.util.NLS; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AnyRequiredCapabilityQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AnyRequiredCapabilityQuery.java index ebf0bc9db..8ad1df159 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AnyRequiredCapabilityQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AnyRequiredCapabilityQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that searches a repository for all {@link IInstallableUnit} instances that diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AvailableIUCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AvailableIUCollector.java index 42e900559..aae5e55d9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/AvailableIUCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/AvailableIUCollector.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import org.eclipse.equinox.internal.p2.ui.model.AvailableIUElement; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.CategoryElement; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; -import org.eclipse.equinox.p2.ui.operations.ProvisioningUtil; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.CategoryElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil; /** * Collector that examines available IU's and wraps them in an diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/CategoryElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/CategoryElementCollector.java index 439caab8c..a048d3b5b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/CategoryElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/CategoryElementCollector.java @@ -8,15 +8,15 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.util.*; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.*; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.*; import org.osgi.framework.Version; /** diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ElementQueryDescriptor.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ElementQueryDescriptor.java index f478dd41b..17c598d26 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ElementQueryDescriptor.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ElementQueryDescriptor.java @@ -8,9 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.query.*; /** * Data class representing everything needed to run a query, including diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/FilteredRepositoryQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/FilteredRepositoryQuery.java index 8f2c26adc..2d649a01a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/FilteredRepositoryQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/FilteredRepositoryQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that provides flags for filtering out which repositories diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IQueryProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IQueryProvider.java index 603fbd09b..c92d5a6a0 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IQueryProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IQueryProvider.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; /** * An interface for an object that provides element queries diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUProfilePropertyQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUProfilePropertyQuery.java index 2b6265451..f40fc46c1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUProfilePropertyQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUProfilePropertyQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * A query that searches for {@link IInstallableUnit} instances that have diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUPropertyQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyQuery.java index 0cc9b5723..cbdf576c8 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/IUPropertyQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/IUPropertyQuery.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.Query; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.Query; /** * A query that searches for {@link IInstallableUnit} instances that have diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/InstalledIUCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/InstalledIUCollector.java index ca3a64a4b..1ebe6ad2b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/InstalledIUCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/InstalledIUCollector.java @@ -8,12 +8,12 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; /** * Collectors that accepts the matched IU's and diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionCollector.java index 9de77535b..6a0c1fd94 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.util.HashMap; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; /** * Collector that only accepts categories or the latest version of each diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionElementCollector.java index 610a96837..08a2b3855 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/LatestIUVersionElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/LatestIUVersionElementCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.IUVersionsElement; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUVersionsElement; /** * Collector that only accepts categories or the latest version of each diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/OtherIUVersionsCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/OtherIUVersionsCollector.java index 20fd6706e..1ace2726b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/OtherIUVersionsCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/OtherIUVersionsCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; /** * Collector that includes only those versions of an IU other than the diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ProfileElementCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ProfileElementCollector.java index 094ede3c0..3a753ecfd 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/ProfileElementCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/ProfileElementCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.model.QueriedElementCollector; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.QueriedElementCollector; /** * Collector that accepts the matched Profiles and diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueriedElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueriedElement.java index 1080e532f..f0d9edb38 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueriedElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueriedElement.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; /** * Element class that represents an element that gets its children @@ -45,7 +45,7 @@ public abstract class QueriedElement extends ProvElement { /* * (non-Javadoc) - * @see org.eclipse.equinox.p2.ui.model.ProvElement#getParent(java.lang.Object) + * @see org.eclipse.equinox.internal.provisional.p2.ui.model.ProvElement#getParent(java.lang.Object) */ public Object getParent(Object o) { return null; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableArtifactRepositoryManager.java index b7513af9c..cccc9eaa3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableArtifactRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableArtifactRepositoryManager.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.net.URL; import org.eclipse.core.runtime.*; @@ -16,9 +16,9 @@ import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; import org.eclipse.equinox.internal.p2.ui.model.ArtifactRepositoryElement; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * An object that adds queryable support to an artifact repository diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableMetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableMetadataRepositoryManager.java index 0991a9135..bf859c225 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableMetadataRepositoryManager.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableMetadataRepositoryManager.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.net.URL; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.MetadataRepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.MetadataRepositoryElement; /** * An object that adds queryable support to a metadata repository diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableProfileRegistry.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableProfileRegistry.java index 941520dca..77842ca1e 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableProfileRegistry.java @@ -8,16 +8,16 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.engine.IProfileRegistry; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * An object that adds queryable support to the profile registry. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableUpdates.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableUpdates.java index fe0985585..1e58f50fb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/QueryableUpdates.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/QueryableUpdates.java @@ -8,18 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; import java.util.ArrayList; import org.eclipse.core.runtime.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.director.IPlanner; -import org.eclipse.equinox.p2.engine.ProvisioningContext; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.*; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.*; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; /** * An object that adds queryable support to the profile registry. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/RollbackIUCollector.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/RollbackIUCollector.java index 15a666957..068af5f5c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/query/RollbackIUCollector.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/query/RollbackIUCollector.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.query; +package org.eclipse.equinox.internal.provisional.p2.ui.query; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.query.IQueryable; -import org.eclipse.equinox.p2.ui.model.RollbackProfileElement; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.query.IQueryable; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RollbackProfileElement; /** * Collector that examines available IU's and wraps them in an diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/DeferredQueryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/DeferredQueryContentProvider.java index 562421be2..359d94c8c 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/DeferredQueryContentProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/DeferredQueryContentProvider.java @@ -9,11 +9,11 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; -import org.eclipse.equinox.p2.ui.query.QueriedElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.ui.query.QueriedElement; import org.eclipse.jface.viewers.*; import org.eclipse.ui.progress.DeferredTreeContentManager; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUColumnConfig.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUColumnConfig.java index f022ad5a6..acdbc68db 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUColumnConfig.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUColumnConfig.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; /** * Data structure describing a column to be shown in an IU view. diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUComparator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java index 907363761..5b6752c4b 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUComparator.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUComparator.java @@ -8,10 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java index 7c0997e5f..0f173fcd7 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/IUDragAdapter.java @@ -8,11 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.util.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.*; import org.eclipse.swt.dnd.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/InstallIUDropAdapter.java index 585d299f8..5e9eda6fd 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/InstallIUDropAdapter.java @@ -8,19 +8,19 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.util.*; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; import org.eclipse.equinox.internal.p2.ui.ProvUIMessages; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.LicenseManager; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.actions.InstallAction; -import org.eclipse.equinox.p2.ui.model.InstalledIUElement; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.LicenseManager; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.actions.InstallAction; +import org.eclipse.equinox.internal.provisional.p2.ui.model.InstalledIUElement; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.*; import org.eclipse.swt.dnd.*; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementComparer.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementComparer.java index f8687f4a6..9c58f3aa5 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementComparer.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementComparer.java @@ -8,14 +8,14 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.net.URL; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.model.RepositoryElement; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.model.RepositoryElement; import org.eclipse.jface.viewers.IElementComparer; public class ProvElementComparer implements IElementComparer { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java index a2635aaba..9517dfae9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java @@ -9,18 +9,18 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import org.eclipse.equinox.internal.p2.ui.model.ProvElement; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.engine.IProfile; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.ui.ProvUI; -import org.eclipse.equinox.p2.ui.ProvUIImages; -import org.eclipse.equinox.p2.ui.model.IUElement; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.engine.IProfile; +import org.eclipse.equinox.internal.provisional.p2.metadata.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI; +import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages; +import org.eclipse.equinox.internal.provisional.p2.ui.model.IUElement; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/RepositoryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/RepositoryContentProvider.java index 77eefac79..ac85b9c6a 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/RepositoryContentProvider.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/RepositoryContentProvider.java @@ -9,10 +9,10 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; -import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; /** * Content provider for provisioning repositories. The repositories are the diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/StructuredViewerProvisioningListener.java index 6245d5e77..b81c184e1 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/StructuredViewerProvisioningListener.java @@ -9,14 +9,14 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.equinox.p2.ui.viewers; +package org.eclipse.equinox.internal.provisional.p2.ui.viewers; import java.util.EventObject; import org.eclipse.equinox.internal.p2.ui.IProvisioningListener; -import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener; -import org.eclipse.equinox.p2.engine.ProfileEvent; -import org.eclipse.equinox.p2.ui.model.ProfileElement; -import org.eclipse.equinox.p2.ui.query.IQueryProvider; +import org.eclipse.equinox.internal.provisional.p2.core.eventbus.SynchronousProvisioningListener; +import org.eclipse.equinox.internal.provisional.p2.engine.ProfileEvent; +import org.eclipse.equinox.internal.provisional.p2.ui.model.ProfileElement; +import org.eclipse.equinox.internal.provisional.p2.ui.query.IQueryProvider; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.swt.widgets.Display; diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF index bec9d4cdc..5f2aa5618 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.updatechecker/META-INF/MANIFEST.MF @@ -7,14 +7,14 @@ Bundle-Localization: plugin Bundle-Version: 0.1.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.updatechecker.Activator Import-Package: org.eclipse.equinox.internal.p2.core.helpers, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.director, - org.eclipse.equinox.p2.engine, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.query, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.director, + org.eclipse.equinox.internal.provisional.p2.engine, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.query, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, org.osgi.framework;version="1.4.0" Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, J2SE-1.3 diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateChecker.java b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateChecker.java index 0750b3130..407ef5775 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateChecker.java +++ b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateChecker.java @@ -14,11 +14,11 @@ import java.text.SimpleDateFormat; import java.util.*; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; import org.eclipse.equinox.internal.p2.updatechecker.Activator; -import org.eclipse.equinox.p2.director.IPlanner; -import org.eclipse.equinox.p2.engine.*; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery; -import org.eclipse.equinox.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.director.IPlanner; +import org.eclipse.equinox.internal.provisional.p2.engine.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; /** * An UpdateChecker periodically polls for updates to specified profiles and diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateEvent.java b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateEvent.java index 4c49913e5..959da9123 100644 --- a/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateEvent.java +++ b/bundles/org.eclipse.equinox.p2.updatechecker/src/org/eclipse/equinox/p2/updatechecker/UpdateEvent.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.equinox.p2.updatechecker; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; /** * An UpdateEvent describes what IU's have updates for a given profile. diff --git a/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF index 9fa34d325..0a3765b76 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF @@ -8,22 +8,22 @@ Bundle-Activator: org.eclipse.equinox.internal.p2.updatesite.Activator Eclipse-LazyStart: true Import-Package: org.eclipse.equinox.internal.p2.core.helpers, org.eclipse.equinox.internal.p2.metadata.generator.features, - org.eclipse.equinox.p2.artifact.repository, - org.eclipse.equinox.p2.core, - org.eclipse.equinox.p2.core.repository, - org.eclipse.equinox.p2.metadata, - org.eclipse.equinox.p2.metadata.generator, - org.eclipse.equinox.p2.metadata.repository, - org.eclipse.equinox.p2.query, - org.eclipse.equinox.spi.p2.artifact.repository, - org.eclipse.equinox.spi.p2.core.repository, - org.eclipse.equinox.spi.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.p2.core, + org.eclipse.equinox.internal.provisional.p2.core.repository, + org.eclipse.equinox.internal.provisional.p2.metadata, + org.eclipse.equinox.internal.provisional.p2.metadata.generator, + org.eclipse.equinox.internal.provisional.p2.metadata.repository, + org.eclipse.equinox.internal.provisional.p2.query, + org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository, + org.eclipse.equinox.internal.provisional.spi.p2.core.repository, + org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository, org.eclipse.osgi.service.resolver;version="1.2.0", org.eclipse.osgi.util;version="1.1.0", org.osgi.framework;version="1.3.0", org.xml.sax, org.xml.sax.helpers -Require-Bundle: org.eclipse.equinox.common;bundle-version="3.4.0", +Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.3.0,4.0.0)", org.eclipse.equinox.p2.metadata.repository;bundle-version="0.1.0", org.eclipse.equinox.p2.artifact.repository;bundle-version="0.1.0" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/Activator.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/Activator.java index e44774298..93d6b16e7 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/Activator.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/Activator.java @@ -15,7 +15,7 @@ import org.osgi.framework.BundleContext; public class Activator implements BundleActivator { - public static String ID = "org.eclipse.equinox.internal.p2.updatesite"; + public static String ID = "org.eclipse.equinox.p2.updatesite"; //$NON-NLS-1$ private static BundleContext bundleContext; public void start(BundleContext context) throws Exception { diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java index 344372a42..3f1a974e6 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepository.java @@ -20,13 +20,13 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.generator.features.*; import org.eclipse.equinox.internal.p2.updatesite.Activator; -import org.eclipse.equinox.p2.artifact.repository.*; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.generator.*; -import org.eclipse.equinox.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory; -import org.eclipse.equinox.spi.p2.core.repository.AbstractRepository; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.*; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.SimpleArtifactRepositoryFactory; +import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository; import org.osgi.framework.BundleContext; import org.xml.sax.SAXException; diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java index e4840ad32..77ad0b343 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/artifact/UpdateSiteArtifactRepositoryFactory.java @@ -12,8 +12,8 @@ package org.eclipse.equinox.internal.p2.updatesite.artifact; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository; -import org.eclipse.equinox.spi.p2.artifact.repository.IArtifactRepositoryFactory; +import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository; +import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.IArtifactRepositoryFactory; public class UpdateSiteArtifactRepositoryFactory implements IArtifactRepositoryFactory { diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java index 8003ba1f9..3f109c078 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepository.java @@ -19,16 +19,16 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.equinox.internal.p2.core.helpers.FileUtils; import org.eclipse.equinox.internal.p2.metadata.generator.features.*; import org.eclipse.equinox.internal.p2.updatesite.Activator; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.core.repository.IRepository; -import org.eclipse.equinox.p2.metadata.IArtifactKey; -import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.equinox.p2.metadata.generator.*; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.p2.query.Collector; -import org.eclipse.equinox.p2.query.Query; -import org.eclipse.equinox.spi.p2.core.repository.AbstractRepository; -import org.eclipse.equinox.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository; +import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; +import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.generator.*; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.p2.query.Collector; +import org.eclipse.equinox.internal.provisional.p2.query.Query; +import org.eclipse.equinox.internal.provisional.spi.p2.core.repository.AbstractRepository; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.SimpleMetadataRepositoryFactory; import org.eclipse.osgi.service.resolver.*; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java index c0769cf7f..d182627cf 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/metadata/UpdateSiteMetadataRepositoryFactory.java @@ -12,9 +12,9 @@ package org.eclipse.equinox.internal.p2.updatesite.metadata; import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.equinox.p2.core.ProvisionException; -import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository; -import org.eclipse.equinox.spi.p2.metadata.repository.IMetadataRepositoryFactory; +import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; +import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository; +import org.eclipse.equinox.internal.provisional.spi.p2.metadata.repository.IMetadataRepositoryFactory; public class UpdateSiteMetadataRepositoryFactory implements IMetadataRepositoryFactory { |