Attachment #153988 for bug #292691

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

View | Details | Raw Unified | Return to bug 292691 | Differences between

and this patch

Collapse All | Expand All




 org.eclipse.pde.internal.swt.tools;x-internal:=true
Import-Package: com.ibm.icu.util,
 org.eclipse.equinox.internal.p2.core.helpers,
 org.eclipse.equinox.internal.p2.engine,
 org.eclipse.equinox.internal.p2.engine.phases,
 org.eclipse.equinox.internal.p2.metadata,
 org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,
 org.eclipse.equinox.internal.provisional.frameworkadmin,
 org.eclipse.equinox.internal.provisional.p2.core,
 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.simpleconfigurator.manipulator,




 *******************************************************************************/
package org.eclipse.pde.build.internal.tests.p2;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import java.io.File;
import java.net.URI;
import java.util.*;

import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
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.*;
import org.eclipse.equinox.p2.metadata.IRequirement;
import org.eclipse.equinox.p2.repository.artifact.*;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;

	}

	public IInstallableUnit getIU(IMetadataRepository repository, String name, boolean assertNotNull) {
		Collector collector = repository.query(new InstallableUnitQuery(name), null);

		IInstallableUnit unit = null;
		if (collector.size() > 0)

Lines 9-18 Link Here

(-)src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java (-5 / +3 lines)
9		9
10	package org.eclipse.pde.build.internal.tests.p2;	10	package org.eclipse.pde.build.internal.tests.p2;
11		11
12	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
13
14	import org.eclipse.equinox.p2.metadata.IArtifactKey;
15
16	import java.io.*;	12	import java.io.*;
17	import java.net.URL;	13	import java.net.URL;
18	import java.util.*;	14	import java.util.*;
Lines 24-29 Link Here
24	import org.eclipse.core.runtime.*;	20	import org.eclipse.core.runtime.*;
25	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;	21	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
		23	import org.eclipse.equinox.p2.metadata.IArtifactKey;
		24	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
27	import org.eclipse.equinox.p2.repository.artifact.*;	25	import org.eclipse.equinox.p2.repository.artifact.*;
28	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;	26	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
29	import org.eclipse.pde.build.internal.tests.Utils;	27	import org.eclipse.pde.build.internal.tests.Utils;
Lines 514-520 Link Here
514	Map repoProps = repository.getProperties();	512	Map repoProps = repository.getProperties();
515	assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");	513	assertEquals(repoProps.get("publishPackFilesAsSiblings"), "true");
516	final String PACKED_FORMAT = "packed"; //$NON-NLS-1$	514	final String PACKED_FORMAT = "packed"; //$NON-NLS-1$
517	Collector keys = repository.query(ArtifactKeyQuery.ALL_KEYS, new Collector(), null);	515	Collector keys = repository.query(ArtifactKeyQuery.ALL_KEYS, null);
518	for (Iterator iterator = keys.iterator(); iterator.hasNext();) {	516	for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
519	IArtifactKey key = (IArtifactKey) iterator.next();	517	IArtifactKey key = (IArtifactKey) iterator.next();
520	IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);	518	IArtifactDescriptor[] descriptors = repository.getArtifactDescriptors(key);

Lines 9-18 Link Here

(-)src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java (-6 / +5 lines)
9		9
10	package org.eclipse.pde.build.internal.tests.p2;	10	package org.eclipse.pde.build.internal.tests.p2;
11		11
12	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
13
14	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
15
16	import java.io.File;	12	import java.io.File;
17	import java.io.FilenameFilter;	13	import java.io.FilenameFilter;
18	import java.net.URI;	14	import java.net.URI;
Lines 25-33 Link Here
25	import org.eclipse.core.resources.*;	21	import org.eclipse.core.resources.*;
26	import org.eclipse.core.runtime.*;	22	import org.eclipse.core.runtime.*;
27	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;	23	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	24	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
		25	import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
		26	import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
30	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
		29	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
31	import org.eclipse.equinox.p2.metadata.IRequirement;	30	import org.eclipse.equinox.p2.metadata.IRequirement;
32	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;	31	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
33	import org.eclipse.osgi.util.ManifestElement;	32	import org.eclipse.osgi.util.ManifestElement;
Lines 1322-1328 Link Here
1322		1321
1323	URI repoURI = URIUtil.fromString("file:" + buildFolder.getFolder("buildRepo").getLocation().toOSString());	1322	URI repoURI = URIUtil.fromString("file:" + buildFolder.getFolder("buildRepo").getLocation().toOSString());
1324	IMetadataRepository metadata = loadMetadataRepository(repoURI);	1323	IMetadataRepository metadata = loadMetadataRepository(repoURI);
1325	Collector collector = metadata.query(new InstallableUnitQuery("a"), new Collector(), null);	1324	Collector collector = metadata.query(new InstallableUnitQuery("a"), null);
1326	assertTrue(collector.size() == 0);	1325	assertTrue(collector.size() == 0);
1327	getIU(metadata, "b");	1326	getIU(metadata, "b");
1328	}	1327	}




 *******************************************************************************/
package org.eclipse.pde.internal.core;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.engine.PhaseSet;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
import org.eclipse.equinox.internal.provisional.p2.engine.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
import org.eclipse.equinox.p2.engine.*;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.IRequirement;
import org.eclipse.osgi.service.resolver.*;
import org.eclipse.pde.core.plugin.IPluginBase;

Lines 10-21 Link Here

(-)src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.core.target;	11	package org.eclipse.pde.internal.core.target;
12		12
		13	import org.eclipse.equinox.p2.engine.IProfile;
		14	import org.eclipse.equinox.p2.engine.IProfileRegistry;
		15
13	import java.io.File;	16	import java.io.File;
14	import java.io.InputStream;	17	import java.io.InputStream;
15	import org.eclipse.core.runtime.CoreException;	18	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.IPath;	19	import org.eclipse.core.runtime.IPath;
17	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
18	import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
19	import org.eclipse.pde.internal.core.PDECore;	20	import org.eclipse.pde.internal.core.PDECore;
20	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;	21	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
21	import org.eclipse.pde.internal.core.target.provisional.ITargetHandle;	22	import org.eclipse.pde.internal.core.target.provisional.ITargetHandle;




 *******************************************************************************/
package org.eclipse.pde.internal.core.target;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import java.io.File;
import java.net.URI;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.director.PermissiveSlicer;
import org.eclipse.equinox.internal.p2.engine.PhaseSet;
import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
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.Version;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
import org.eclipse.equinox.p2.engine.*;
import org.eclipse.equinox.p2.engine.IProvisioningPlan;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.repository.IRepositoryManager;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
import org.eclipse.equinox.p2.repository.artifact.IFileArtifactRepository;


		// query for bundles
		OSGiBundleQuery query = new OSGiBundleQuery();
		Collector collector = slice.query(query, new SubProgressMonitor(subMonitor, 10));
		slice.query(query, collector, new SubProgressMonitor(subMonitor, 10));

		if (subMonitor.isCanceled()) {
			return new IResolvedBundle[0];

			slicer = new PermissiveSlicer(allMetadata, props, true, false, false, true, false);
		}
		IQueryable slice = slicer.slice(units, new SubProgressMonitor(subMonitor, 10));
		Collector collector = slice.query(InstallableUnitQuery.ANY, new SubProgressMonitor(subMonitor, 10));

		if (subMonitor.isCanceled() || collector.isEmpty()) {
			return new IResolvedBundle[0];

		}

		// query for bundles
		collector = slice.query(new OSGiBundleQuery(), new SubProgressMonitor(subMonitor, 10));

		if (subMonitor.isCanceled()) {
			return new IResolvedBundle[0];

			fUnits = new IInstallableUnit[fIds.length];
			for (int i = 0; i < fIds.length; i++) {
				InstallableUnitQuery query = new InstallableUnitQuery(fIds[i], fVersions[i]);
				Collector collector = profile.query(query, null);
				if (collector.isEmpty()) {
					// try repositories
					URI[] repositories = resolveRepositories();
					for (int j = 0; j < repositories.length; j++) {
						IMetadataRepository repository = getRepository(repositories[j]);
						collector = repository.query(query, null);
						if (!collector.isEmpty()) {
							break;
						}




 *******************************************************************************/
package org.eclipse.pde.internal.core.target;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import java.io.*;
import java.net.*;
import java.util.*;

import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.garbagecollector.GarbageCollector;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.engine.IProfileRegistry;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.plugin.IPluginModelBase;




 *******************************************************************************/
package org.eclipse.pde.internal.ui.build;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;

import java.io.File;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
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.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
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.IRequirement;
import org.eclipse.equinox.p2.operations.*;
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;


				// Check if the right version exists in the new meta repo
				Version newVersion = Version.parseVersion(version);
				Collector queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), monitor);
				if (queryMatches.size() == 0) {
					return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), NLS.bind(PDEUIMessages.RuntimeInstallJob_ErrorCouldNotFindUnitInRepo, new String[] {id, version}));
				}

				IInstallableUnit iuToInstall = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];

				// Find out if the profile already has that iu installed												
				queryMatches = profile.query(new InstallableUnitQuery(id), new SubProgressMonitor(monitor, 0));
				if (queryMatches.size() == 0) {
					// Just install the new iu into the profile
					toInstall.add(iuToInstall);

				}
				return false;
			}
		}, monitor);
		if (!queryMatches.isEmpty()) {
			IInstallableUnit lifecycleUnit = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];
			iuPatchDescription.setLifeCycle(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, lifecycleUnit.getId(), new VersionRange(lifecycleUnit.getVersion(), true, lifecycleUnit.getVersion(), true), null, false, false, false));

Lines 10-20 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/AddBundleContainerSelectionPage.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.shared.target;	11	package org.eclipse.pde.internal.ui.shared.target;
12		12
		13	import org.eclipse.equinox.p2.engine.IProfile;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.util.ArrayList;	16	import java.util.ArrayList;
15	import java.util.List;	17	import java.util.List;
16	import org.eclipse.core.runtime.*;	18	import org.eclipse.core.runtime.*;
17	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
18	import org.eclipse.jface.dialogs.*;	19	import org.eclipse.jface.dialogs.*;
19	import org.eclipse.jface.viewers.*;	20	import org.eclipse.jface.viewers.*;
20	import org.eclipse.jface.wizard.*;	21	import org.eclipse.jface.wizard.*;




 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.core.runtime.*;

import org.eclipse.equinox.internal.p2.ui.actions.PropertyDialogAction;
import org.eclipse.equinox.internal.p2.ui.dialogs.*;
import org.eclipse.equinox.internal.p2.ui.query.IUViewQueryContext;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.ui.Policy;
import org.eclipse.equinox.p2.ui.ProvisioningUI;
import org.eclipse.jface.action.IAction;




 *******************************************************************************/
package org.eclipse.pde.internal.ui.shared.target;

import org.eclipse.equinox.p2.metadata.IInstallableUnit;

import com.ibm.icu.text.MessageFormat;
import java.net.URI;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.equinox.p2.common.TranslationSupport;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.internal.core.target.*;

Lines 10-18 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/TargetLocationsGroup.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.shared.target;	11	package org.eclipse.pde.internal.ui.shared.target;
12		12
		13	import org.eclipse.equinox.p2.engine.IProfile;
		14
13	import java.util.*;	15	import java.util.*;
14	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
16	import org.eclipse.jface.viewers.*;	17	import org.eclipse.jface.viewers.*;
17	import org.eclipse.jface.window.Window;	18	import org.eclipse.jface.window.Window;
18	import org.eclipse.jface.wizard.WizardDialog;	19	import org.eclipse.jface.wizard.WizardDialog;

Lines 74-80 Link Here

(-)src/org/eclipse/pde/ui/tests/target/IUBundleContainerTests.java (-1 / +1 lines)
74	* @return installable unit	74	* @return installable unit
75	*/	75	*/
76	protected IInstallableUnit getUnit(String id, IMetadataRepository repository) {	76	protected IInstallableUnit getUnit(String id, IMetadataRepository repository) {
77	Collector result = repository.query(new InstallableUnitQuery(id), new Collector(), null);	77	Collector result = repository.query(new InstallableUnitQuery(id), null);
78	IInstallableUnit[] units = (IInstallableUnit[]) result.toArray(IInstallableUnit.class);	78	IInstallableUnit[] units = (IInstallableUnit[]) result.toArray(IInstallableUnit.class);
79	if (units.length == 1) {	79	if (units.length == 1) {
80	return units[0];	80	return units[0];




import java.util.SortedSet;
import java.util.TreeSet;

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;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
import org.eclipse.equinox.p2.engine.IProfile;
import org.eclipse.equinox.p2.engine.IProfileRegistry;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.PlatformAdmin;
import org.eclipse.osgi.service.resolver.State;

			// Since this code is only called in the Help -> About -> Configuration Details case we
			// won't worry too much about performance here and we will sort the query results
			// afterwards, but before printing them out.
			Collector collector = profile.available(InstallableUnitQuery.ANY,  null);
			SortedSet sorted = new TreeSet();
			for (Iterator iter = collector.iterator(); iter.hasNext();) {
				IInstallableUnit unit = (IInstallableUnit) iter.next();

Return to bug 292691

Lines 28-39 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
28	org.eclipse.pde.internal.swt.tools;x-internal:=true	28	org.eclipse.pde.internal.swt.tools;x-internal:=true
29	Import-Package: com.ibm.icu.util,	29	Import-Package: com.ibm.icu.util,
30	org.eclipse.equinox.internal.p2.core.helpers,	30	org.eclipse.equinox.internal.p2.core.helpers,
		31	org.eclipse.equinox.internal.p2.engine,
31	org.eclipse.equinox.internal.p2.engine.phases,	32	org.eclipse.equinox.internal.p2.engine.phases,
32	org.eclipse.equinox.internal.p2.metadata,	33	org.eclipse.equinox.internal.p2.metadata,
33	org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,	34	org.eclipse.equinox.internal.p2.updatesite;resolution:=optional,
34	org.eclipse.equinox.internal.provisional.frameworkadmin,	35	org.eclipse.equinox.internal.provisional.frameworkadmin,
35	org.eclipse.equinox.internal.provisional.p2.core,	36	org.eclipse.equinox.internal.provisional.p2.core,
36	org.eclipse.equinox.internal.provisional.p2.engine,
37	org.eclipse.equinox.internal.provisional.p2.metadata,	37	org.eclipse.equinox.internal.provisional.p2.metadata,
38	org.eclipse.equinox.internal.provisional.p2.metadata.query,	38	org.eclipse.equinox.internal.provisional.p2.metadata.query,
39	org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,	39	org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,

Lines 20-31 Link Here

(-)src_ant/org/eclipse/pde/internal/build/publisher/BrandP2Task.java (-2 / +2 lines)
20	import org.eclipse.core.runtime.Path;	20	import org.eclipse.core.runtime.Path;
21	import org.eclipse.core.runtime.URIUtil;	21	import org.eclipse.core.runtime.URIUtil;
22	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;	22	import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
		23	import org.eclipse.equinox.internal.p2.engine.Phase;
		24	import org.eclipse.equinox.internal.p2.engine.PhaseSet;
23	import org.eclipse.equinox.internal.p2.engine.phases.Collect;	25	import org.eclipse.equinox.internal.p2.engine.phases.Collect;
24	import org.eclipse.equinox.internal.p2.engine.phases.Install;	26	import org.eclipse.equinox.internal.p2.engine.phases.Install;
25	import org.eclipse.equinox.internal.p2.metadata.*;	27	import org.eclipse.equinox.internal.p2.metadata.*;
26	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	28	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
27	import org.eclipse.equinox.internal.provisional.p2.engine.Phase;
28	import org.eclipse.equinox.internal.provisional.p2.engine.PhaseSet;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	29	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
30	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	30	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
31	import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;	31	import org.eclipse.equinox.p2.internal.repository.tools.Repo2Runnable;

Lines 11-34 Link Here

(-)src/org/eclipse/pde/internal/core/P2Utils.java (-4 / +3 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.pde.internal.core;	12	package org.eclipse.pde.internal.core;
13		13
14	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
15
16	import java.io.File;	14	import java.io.File;
17	import java.io.IOException;	15	import java.io.IOException;
18	import java.net.MalformedURLException;	16	import java.net.MalformedURLException;
19	import java.net.URL;	17	import java.net.URL;
20	import java.util.*;	18	import java.util.*;
21	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
		20	import org.eclipse.equinox.internal.p2.engine.PhaseSet;
22	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;	21	import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
23	import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;	22	import org.eclipse.equinox.internal.provisional.p2.director.PlannerHelper;
24	import org.eclipse.equinox.internal.provisional.p2.engine.*;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
28	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;	26	import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
29	import org.eclipse.equinox.p2.core.IProvisioningAgent;	27	import org.eclipse.equinox.p2.core.IProvisioningAgent;
30	import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;	28	import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
31	import org.eclipse.equinox.p2.engine.IEngine;	29	import org.eclipse.equinox.p2.engine.*;
		30	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
32	import org.eclipse.equinox.p2.metadata.IRequirement;	31	import org.eclipse.equinox.p2.metadata.IRequirement;
33	import org.eclipse.osgi.service.resolver.*;	32	import org.eclipse.osgi.service.resolver.*;
34	import org.eclipse.pde.core.plugin.IPluginBase;	33	import org.eclipse.pde.core.plugin.IPluginBase;

Lines 10-32 Link Here

(-)src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java (-9 / +7 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.build;	11	package org.eclipse.pde.internal.ui.build;
12		12
13	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
14
15	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
16
17	import java.io.File;	13	import java.io.File;
18	import java.net.URI;	14	import java.net.URI;
19	import java.util.ArrayList;	15	import java.util.ArrayList;
20	import java.util.List;	16	import java.util.List;
21	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
22	import org.eclipse.core.runtime.jobs.Job;	18	import org.eclipse.core.runtime.jobs.Job;
		19	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	20	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
24	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
25	import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
28	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitPatchDescription;
29	import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
		25	import org.eclipse.equinox.p2.engine.IProfile;
		26	import org.eclipse.equinox.p2.engine.IProfileRegistry;
		27	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
30	import org.eclipse.equinox.p2.metadata.IRequirement;	28	import org.eclipse.equinox.p2.metadata.IRequirement;
31	import org.eclipse.equinox.p2.operations.*;	29	import org.eclipse.equinox.p2.operations.*;
32	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;	30	import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
Lines 125-131 Link Here
125		123
126	// Check if the right version exists in the new meta repo	124	// Check if the right version exists in the new meta repo
127	Version newVersion = Version.parseVersion(version);	125	Version newVersion = Version.parseVersion(version);
128	Collector queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), new Collector(), monitor);	126	Collector queryMatches = metaRepo.query(new InstallableUnitQuery(id, newVersion), monitor);
129	if (queryMatches.size() == 0) {	127	if (queryMatches.size() == 0) {
130	return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), NLS.bind(PDEUIMessages.RuntimeInstallJob_ErrorCouldNotFindUnitInRepo, new String[] {id, version}));	128	return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), NLS.bind(PDEUIMessages.RuntimeInstallJob_ErrorCouldNotFindUnitInRepo, new String[] {id, version}));
131	}	129	}
Lines 133-139 Link Here
133	IInstallableUnit iuToInstall = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];	131	IInstallableUnit iuToInstall = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];
134		132
135	// Find out if the profile already has that iu installed	133	// Find out if the profile already has that iu installed
136	queryMatches = profile.query(new InstallableUnitQuery(id), new Collector(), new SubProgressMonitor(monitor, 0));	134	queryMatches = profile.query(new InstallableUnitQuery(id), new SubProgressMonitor(monitor, 0));
137	if (queryMatches.size() == 0) {	135	if (queryMatches.size() == 0) {
138	// Just install the new iu into the profile	136	// Just install the new iu into the profile
139	toInstall.add(iuToInstall);	137	toInstall.add(iuToInstall);
Lines 216-222 Link Here
216	}	214	}
217	return false;	215	return false;
218	}	216	}
219	}, new Collector(), monitor);	217	}, monitor);
220	if (!queryMatches.isEmpty()) {	218	if (!queryMatches.isEmpty()) {
221	IInstallableUnit lifecycleUnit = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];	219	IInstallableUnit lifecycleUnit = (IInstallableUnit) queryMatches.toArray(IInstallableUnit.class)[0];
222	iuPatchDescription.setLifeCycle(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, lifecycleUnit.getId(), new VersionRange(lifecycleUnit.getVersion(), true, lifecycleUnit.getVersion(), true), null, false, false, false));	220	iuPatchDescription.setLifeCycle(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, lifecycleUnit.getId(), new VersionRange(lifecycleUnit.getVersion(), true, lifecycleUnit.getVersion(), true), null, false, false, false));

Lines 17-27 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/ConfigurationLogUpdateSection.java (-4 / +4 lines)
17	import java.util.SortedSet;	17	import java.util.SortedSet;
18	import java.util.TreeSet;	18	import java.util.TreeSet;
19		19
20	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
21	import org.eclipse.equinox.internal.provisional.p2.engine.IProfileRegistry;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
		22	import org.eclipse.equinox.p2.engine.IProfile;
		23	import org.eclipse.equinox.p2.engine.IProfileRegistry;
		24	import org.eclipse.equinox.p2.metadata.IInstallableUnit;
25	import org.eclipse.osgi.service.resolver.BundleDescription;	25	import org.eclipse.osgi.service.resolver.BundleDescription;
26	import org.eclipse.osgi.service.resolver.PlatformAdmin;	26	import org.eclipse.osgi.service.resolver.PlatformAdmin;
27	import org.eclipse.osgi.service.resolver.State;	27	import org.eclipse.osgi.service.resolver.State;
Lines 68-74 Link Here
68	// Since this code is only called in the Help -> About -> Configuration Details case we	68	// Since this code is only called in the Help -> About -> Configuration Details case we
69	// won't worry too much about performance here and we will sort the query results	69	// won't worry too much about performance here and we will sort the query results
70	// afterwards, but before printing them out.	70	// afterwards, but before printing them out.
71	Collector collector = profile.available(InstallableUnitQuery.ANY, new Collector(), null);	71	Collector collector = profile.available(InstallableUnitQuery.ANY, null);
72	SortedSet sorted = new TreeSet();	72	SortedSet sorted = new TreeSet();
73	for (Iterator iter = collector.iterator(); iter.hasNext();) {	73	for (Iterator iter = collector.iterator(); iter.hasNext();) {
74	IInstallableUnit unit = (IInstallableUnit) iter.next();	74	IInstallableUnit unit = (IInstallableUnit) iter.next();