Attachment 155912 Details for Bug 292691 – Patch to PDE build for moving Version/VersionRange to API package

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

Patch to PDE build for moving Version/VersionRange to API package

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

on 2010-01-12 15:29:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2010-01-12 15:29:06 EST

Size: 8.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java,v
>retrieving revision 1.6
>diff -u -r1.6 FeatureRootAdvice.java
>--- src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java	8 Oct 2009 13:35:50 -0000	1.6
>+++ src/org/eclipse/pde/internal/build/publisher/FeatureRootAdvice.java	12 Jan 2010 20:30:57 -0000
>@@ -11,10 +11,11 @@
> 
> package org.eclipse.pde.internal.build.publisher;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import java.util.*;
> import org.eclipse.equinox.internal.p2.core.helpers.FileUtils.IPathComputer;
> import org.eclipse.equinox.internal.p2.publisher.FileSetDescriptor;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.p2.publisher.AbstractAdvice;
> import org.eclipse.equinox.p2.publisher.actions.IFeatureRootAdvice;
> import org.eclipse.pde.internal.build.Config;
>Index: src/org/eclipse/pde/internal/build/publisher/GatherBundleAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/GatherBundleAction.java,v
>retrieving revision 1.6.2.1
>diff -u -r1.6.2.1 GatherBundleAction.java
>--- src/org/eclipse/pde/internal/build/publisher/GatherBundleAction.java	27 Nov 2009 21:37:24 -0000	1.6.2.1
>+++ src/org/eclipse/pde/internal/build/publisher/GatherBundleAction.java	12 Jan 2010 20:30:57 -0000
>@@ -11,11 +11,12 @@
> 
> package org.eclipse.pde.internal.build.publisher;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import java.io.File;
> import java.util.Dictionary;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.p2.publisher.IPublisherInfo;
> import org.eclipse.equinox.p2.publisher.IPublisherResult;
> import org.eclipse.equinox.p2.publisher.eclipse.*;
>Index: src/org/eclipse/pde/internal/build/publisher/GatherFeatureAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/GatherFeatureAction.java,v
>retrieving revision 1.9.2.6
>diff -u -r1.9.2.6 GatherFeatureAction.java
>--- src/org/eclipse/pde/internal/build/publisher/GatherFeatureAction.java	30 Dec 2009 17:20:41 -0000	1.9.2.6
>+++ src/org/eclipse/pde/internal/build/publisher/GatherFeatureAction.java	12 Jan 2010 20:30:57 -0000
>@@ -8,10 +8,11 @@
>  ******************************************************************************/
> package org.eclipse.pde.internal.build.publisher;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import java.io.File;
> import java.util.Collection;
> import org.eclipse.equinox.internal.p2.publisher.eclipse.FeatureParser;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.p2.metadata.IArtifactKey;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.p2.publisher.IPublisherInfo;
>Index: src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/Attic/AssembledConfigAdvice.java,v
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.2 AssembledConfigAdvice.java
>--- src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java	30 Dec 2009 10:44:39 -0000	1.1.2.2
>+++ src/org/eclipse/pde/internal/build/publisher/compatibility/AssembledConfigAdvice.java	12 Jan 2010 20:30:57 -0000
>@@ -10,12 +10,13 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.build.publisher.compatibility;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import java.io.File;
> import java.util.*;
> import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
> import org.eclipse.equinox.internal.p2.publisher.eclipse.DataLoader;
> import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.p2.publisher.eclipse.IConfigAdvice;
> import org.eclipse.equinox.p2.publisher.eclipse.IExecutableAdvice;
> import org.eclipse.pde.internal.build.IPDEBuildConstants;
>Index: src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/Attic/GeneratorApplication.java,v
>retrieving revision 1.1.2.3
>diff -u -r1.1.2.3 GeneratorApplication.java
>--- src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java	12 Jan 2010 16:18:50 -0000	1.1.2.3
>+++ src/org/eclipse/pde/internal/build/publisher/compatibility/GeneratorApplication.java	12 Jan 2010 20:30:57 -0000
>@@ -10,13 +10,14 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.build.publisher.compatibility;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import java.io.File;
> import java.net.URI;
> import java.util.ArrayList;
> import java.util.List;
> import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;
> import org.eclipse.equinox.internal.p2.updatesite.SiteXMLAction;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.p2.publisher.*;
> import org.eclipse.equinox.p2.publisher.actions.*;
>Index: src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/publisher/compatibility/Attic/RootFileParentAction.java,v
>retrieving revision 1.1.2.5
>diff -u -r1.1.2.5 RootFileParentAction.java
>--- src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java	12 Jan 2010 01:39:50 -0000	1.1.2.5
>+++ src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java	12 Jan 2010 20:30:57 -0000
>@@ -10,10 +10,11 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.build.publisher.compatibility;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import org.eclipse.core.runtime.*;
> import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.p2.publisher.*;
>Index: src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java,v
>retrieving revision 1.12.2.12
>diff -u -r1.12.2.12 BrandP2Task.java
>--- src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java	12 Jan 2010 16:18:50 -0000	1.12.2.12
>+++ src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java	12 Jan 2010 20:30:57 -0000
>@@ -9,6 +9,8 @@
> 
> package org.eclipse.pde.internal.build.publisher;
> 
>+import org.eclipse.equinox.p2.metadata.Version;
>+
> import java.io.File;
> import java.io.IOException;
> import java.net.URI;
>@@ -26,7 +28,6 @@
> import org.eclipse.equinox.internal.p2.engine.phases.Install;
> import org.eclipse.equinox.internal.p2.metadata.*;
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
> import org.eclipse.equinox.p2.core.ProvisionException;
> import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;

Actions: View

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