Attachment 152205 Details for Bug 292691 – Patch to update PDE core and UI

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to update PDE core and UI

patch.txt (text/plain), 4.28 KB, created by John Arthorne

on 2009-11-13 15:43:56 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2009-11-13 15:43:56 EST

Size: 4.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.50.4.1
>diff -u -r1.50.4.1 MANIFEST.MF
>--- META-INF/MANIFEST.MF	10 Nov 2009 19:49:02 -0000	1.50.4.1
>+++ META-INF/MANIFEST.MF	13 Nov 2009 20:46:58 -0000
>@@ -57,7 +57,7 @@
>  org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
>- org.eclipse.equinox.p2.engine;bundle-version="[1.0.100,2.0.0)",
>+ org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.core;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
>Index: src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java,v
>retrieving revision 1.5
>diff -u -r1.5 IUBundleContainer.java
>--- src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	14 Oct 2009 14:55:38 -0000	1.5
>+++ src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	13 Nov 2009 20:46:58 -0000
>@@ -18,13 +18,15 @@
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IFileArtifactRepository;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
>-import org.eclipse.equinox.internal.provisional.p2.director.*;
>+import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
>+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.*;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
> 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.repository.IRepositoryManager;
>+import org.eclipse.equinox.p2.engine.IProvisioningPlan;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.pde.internal.core.PDECore;
> import org.eclipse.pde.internal.core.target.provisional.*;
>@@ -218,12 +220,12 @@
> 			return new IResolvedBundle[0];
> 		}
> 
>-		ProvisioningPlan plan = planner.getProvisioningPlan(request, context, new SubProgressMonitor(subMonitor, 10));
>+		IProvisioningPlan plan = planner.getProvisioningPlan(request, context, new SubProgressMonitor(subMonitor, 10));
> 		IStatus status = plan.getStatus();
> 		if (!status.isOK()) {
> 			throw new CoreException(status);
> 		}
>-		ProvisioningPlan installerPlan = plan.getInstallerPlan();
>+		IProvisioningPlan installerPlan = plan.getInstallerPlan();
> 		if (installerPlan != null) {
> 			// this plan requires an update to the installer first, log the fact and attempt
> 			// to continue, we don't want to update the running SDK while provisioning a target
>#P org.eclipse.pde.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.78.4.1
>diff -u -r1.78.4.1 MANIFEST.MF
>--- META-INF/MANIFEST.MF	10 Nov 2009 17:23:58 -0000	1.78.4.1
>+++ META-INF/MANIFEST.MF	13 Nov 2009 20:46:59 -0000
>@@ -96,7 +96,7 @@
>  org.eclipse.ui.navigator.resources;bundle-version="[3.3.100,4.0.0)",
>  org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
>- org.eclipse.equinox.p2.engine;bundle-version="[1.0.100,2.0.0)",
>+ org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
>  org.eclipse.equinox.p2.core;bundle-version="[1.0.0,2.0.0)",
>  org.eclipse.equinox.p2.director;bundle-version="[1.0.100,2.0.0)",
>  org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.100,2.0.0)",

Actions: View | Diff

Attachments on bug 292691: 152095 | 152205 | 152362 | 152365 | 152504 | 152544 | 152984 | 152986 | 153141 | 153282 | 153349 | 153895 | 153988 | 154541 | 154542 | 154883 | 155120 | 155154 | 155466 | 155547 | 155813 | 155814 | 155879 | 155912 | 155913 | 155979