Attachment 155813 Details for Bug 292691 – Fixes from Query API Move (Build)

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

[patch] Fixes from Query API Move (Build)

pdebuild.patch (text/plain), 7.03 KB, created by Ian Bull

on 2010-01-11 19:54:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2010-01-11 19:54:42 EST

Size: 7.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/META-INF/MANIFEST.MF,v
>retrieving revision 1.37.2.8
>diff -u -r1.37.2.8 MANIFEST.MF
>--- META-INF/MANIFEST.MF	9 Jan 2010 10:34:19 -0000	1.37.2.8
>+++ META-INF/MANIFEST.MF	12 Jan 2010 00:56:44 -0000
>@@ -36,11 +36,11 @@
>  org.eclipse.equinox.internal.provisional.frameworkadmin,
>  org.eclipse.equinox.internal.provisional.p2.core,
>  org.eclipse.equinox.internal.provisional.p2.metadata,
>- org.eclipse.equinox.internal.provisional.p2.metadata.query,
>  org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,
>  org.eclipse.equinox.p2.core,
>  org.eclipse.equinox.p2.metadata,
>  org.eclipse.equinox.p2.metadata.query,
>+ org.eclipse.equinox.p2.query,
>  org.eclipse.equinox.p2.repository,
>  org.eclipse.equinox.p2.repository.artifact,
>  org.eclipse.equinox.p2.repository.artifact.spi,
>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.4
>diff -u -r1.1.2.4 RootFileParentAction.java
>--- src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java	21 Dec 2009 17:17:56 -0000	1.1.2.4
>+++ src/org/eclipse/pde/internal/build/publisher/compatibility/RootFileParentAction.java	12 Jan 2010 00:56:44 -0000
>@@ -15,11 +15,11 @@
> 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.internal.provisional.p2.metadata.query.MatchQuery;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.p2.metadata.query.IQueryResult;
> import org.eclipse.equinox.p2.publisher.*;
> import org.eclipse.equinox.p2.publisher.actions.RootFilesAction;
>+import org.eclipse.equinox.p2.query.IQueryResult;
>+import org.eclipse.equinox.p2.query.MatchQuery;
> import org.eclipse.pde.internal.build.IPDEBuildConstants;
> 
> public class RootFileParentAction extends AbstractPublisherAction {
>#P org.eclipse.pde.build.tests
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF,v
>retrieving revision 1.12.2.4
>diff -u -r1.12.2.4 MANIFEST.MF
>--- META-INF/MANIFEST.MF	7 Dec 2009 04:35:21 -0000	1.12.2.4
>+++ META-INF/MANIFEST.MF	12 Jan 2010 00:56:45 -0000
>@@ -24,10 +24,10 @@
>  org.eclipse.equinox.internal.provisional.p2.artifact.repository,
>  org.eclipse.equinox.internal.provisional.p2.core,
>  org.eclipse.equinox.internal.provisional.p2.metadata,
>- org.eclipse.equinox.internal.provisional.p2.metadata.query,
>  org.eclipse.equinox.p2.internal.repository.tools,
>  org.eclipse.equinox.p2.metadata,
>  org.eclipse.equinox.p2.metadata.query,
>+ org.eclipse.equinox.p2.query,
>  org.eclipse.equinox.p2.repository,
>  org.eclipse.equinox.p2.repository.artifact,
>  org.eclipse.equinox.p2.repository.metadata
>Index: src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java,v
>retrieving revision 1.15.2.9
>diff -u -r1.15.2.9 P2TestCase.java
>--- src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java	30 Dec 2009 21:31:13 -0000	1.15.2.9
>+++ src/org/eclipse/pde/build/internal/tests/p2/P2TestCase.java	12 Jan 2010 00:56:45 -0000
>@@ -19,11 +19,11 @@
> import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository;
> import org.eclipse.equinox.internal.provisional.p2.metadata.*;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
> import org.eclipse.equinox.p2.internal.repository.tools.RepositoryUtilities;
> import org.eclipse.equinox.p2.metadata.IArtifactKey;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.p2.metadata.query.IQueryResult;
>+import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
>+import org.eclipse.equinox.p2.query.IQueryResult;
> import org.eclipse.equinox.p2.repository.artifact.*;
> import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
> import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
>Index: src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java,v
>retrieving revision 1.22.2.9
>diff -u -r1.22.2.9 P2Tests.java
>--- src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java	16 Dec 2009 19:12:05 -0000	1.22.2.9
>+++ src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java	12 Jan 2010 00:56:45 -0000
>@@ -21,7 +21,7 @@
> import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
> import org.eclipse.equinox.p2.metadata.IArtifactKey;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.p2.metadata.query.IQueryResult;
>+import org.eclipse.equinox.p2.query.IQueryResult;
> import org.eclipse.equinox.p2.repository.artifact.*;
> import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
> import org.eclipse.pde.build.internal.tests.Utils;
>Index: src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java,v
>retrieving revision 1.83.2.11
>diff -u -r1.83.2.11 PublishingTests.java
>--- src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java	5 Jan 2010 21:46:22 -0000	1.83.2.11
>+++ src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java	12 Jan 2010 00:56:45 -0000
>@@ -9,6 +9,8 @@
> 
> package org.eclipse.pde.build.internal.tests.p2;
> 
>+import org.eclipse.equinox.p2.metadata.query.InstallableUnitQuery;
>+
> import java.io.File;
> import java.io.FilenameFilter;
> import java.net.URI;
>@@ -24,9 +26,8 @@
> import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
> import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
> import org.eclipse.equinox.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.p2.metadata.query.IQueryResult;
>+import org.eclipse.equinox.p2.query.IQueryResult;
> import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
> import org.eclipse.osgi.util.ManifestElement;
> import org.eclipse.pde.build.internal.tests.Utils;

Flags:

pascal: review+

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