Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2007-11-07 22:01:15 +0000
committerJohn Arthorne2007-11-07 22:01:15 +0000
commit2c62dc03a40be6d5d6737c8cfdde07f5aec9b93d (patch)
treeb269173cd99285f55483f81e32fb5118829f19d6 /bundles
parent4d55bc338dfe3390b0268335ee2cf5a7a70b9f37 (diff)
downloadrt.equinox.p2-2c62dc03a40be6d5d6737c8cfdde07f5aec9b93d.tar.gz
rt.equinox.p2-2c62dc03a40be6d5d6737c8cfdde07f5aec9b93d.tar.xz
rt.equinox.p2-2c62dc03a40be6d5d6737c8cfdde07f5aec9b93d.zip
Move installer API into internal provisional package
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallApplication.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallerActivator.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/InstallDialog.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/SWTInstallAdvisor.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/IInstallOperation.java (renamed from bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallOperation.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/InstallAdvisor.java (renamed from bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallAdvisor.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/InstallDescription.java (renamed from bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallDescription.java)2
11 files changed, 14 insertions, 14 deletions
diff --git a/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF
index bce2a38b4..661433d6a 100644
--- a/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Export-Package: org.eclipse.equinox.internal.p2.installer;x-internal:=true,
org.eclipse.equinox.internal.p2.installer.ui;x-internal:=true,
- org.eclipse.equinox.p2.installer
+ org.eclipse.equinox.internal.provisional.p2.installer
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
index bc54c7b43..ab2302469 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
@@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.installer;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
-import org.eclipse.equinox.p2.installer.*;
+import org.eclipse.equinox.internal.provisional.p2.installer.*;
/**
* A headless install advisor that prints everything to a log.
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 a6d654708..f2c7710ee 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,8 +19,8 @@ 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.p2.installer.InstallAdvisor;
-import org.eclipse.equinox.p2.installer.InstallDescription;
+import org.eclipse.equinox.internal.provisional.p2.installer.InstallAdvisor;
+import org.eclipse.equinox.internal.provisional.p2.installer.InstallDescription;
/**
* This is a simple installer application built using P2. The application must be given
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
index dfcf217b9..d8b409ebd 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
@@ -15,7 +15,7 @@ import java.net.URL;
import java.util.Properties;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.equinox.p2.installer.InstallDescription;
+import org.eclipse.equinox.internal.provisional.p2.installer.InstallDescription;
import org.osgi.framework.Version;
/**
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 9f65ed8b9..8a08902d5 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
@@ -15,12 +15,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
+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.director.IDirector;
import org.eclipse.equinox.p2.engine.IProfileRegistry;
import org.eclipse.equinox.p2.engine.Profile;
-import org.eclipse.equinox.p2.installer.IInstallOperation;
-import org.eclipse.equinox.p2.installer.InstallDescription;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
@@ -174,7 +174,7 @@ public class InstallUpdateProductOperation implements IInstallOperation {
}
/* (non-Javadoc)
- * @see org.eclipse.equinox.p2.installer.IInstallOperation#install(org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.equinox.internal.provisional.p2.installer.IInstallOperation#install(org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus install(IProgressMonitor pm) {
SubMonitor monitor = SubMonitor.convert(pm, "Preparing to install", 100);
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallerActivator.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallerActivator.java
index b224b2eb9..e04269927 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallerActivator.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallerActivator.java
@@ -21,7 +21,7 @@ import org.osgi.service.packageadmin.PackageAdmin;
*/
public class InstallerActivator implements BundleActivator {
// The plug-in ID
- public static final String PI_INSTALLER = "org.eclipse.equinox.p2.installer";
+ public static final String PI_INSTALLER = "org.eclipse.equinox.internal.provisional.p2.installer";
// The shared instance
private static InstallerActivator plugin;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/InstallDialog.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/InstallDialog.java
index ebf56fe04..b7c1406f4 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/InstallDialog.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/InstallDialog.java
@@ -12,7 +12,7 @@ package org.eclipse.equinox.internal.p2.installer.ui;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.installer.InstallerActivator;
-import org.eclipse.equinox.p2.installer.IInstallOperation;
+import org.eclipse.equinox.internal.provisional.p2.installer.IInstallOperation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/SWTInstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/SWTInstallAdvisor.java
index 033ce5b7f..e596ff945 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/SWTInstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/ui/SWTInstallAdvisor.java
@@ -11,7 +11,7 @@
package org.eclipse.equinox.internal.p2.installer.ui;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.p2.installer.*;
+import org.eclipse.equinox.internal.provisional.p2.installer.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Display;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/IInstallOperation.java
index 67890067e..8bdd9b289 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallOperation.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/IInstallOperation.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.p2.installer;
+package org.eclipse.equinox.internal.provisional.p2.installer;
import org.eclipse.core.runtime.*;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/InstallAdvisor.java
index b03261f7a..dbb0b0f0a 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/InstallAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.p2.installer;
+package org.eclipse.equinox.internal.provisional.p2.installer;
import org.eclipse.core.runtime.*;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallDescription.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/InstallDescription.java
index 6a6287d91..205aa19ea 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallDescription.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/provisional/p2/installer/InstallDescription.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.p2.installer;
+package org.eclipse.equinox.internal.provisional.p2.installer;
import java.net.URL;
import org.eclipse.core.runtime.IPath;

Back to the top