Attachment #121187 for bug #256359

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java (-2 / +6 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.internal.p2.updatesite;	11	package org.eclipse.equinox.internal.p2.updatesite;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		16
13	import java.io.File;	17	import java.io.File;
14	import java.net.URI;	18	import java.net.URI;
15	import java.net.URISyntaxException;	19	import java.net.URISyntaxException;
Lines 232-238 Link Here
232	if (parentCategory != null) {	236	if (parentCategory != null) {
233	reqsConfigurationUnits.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, parentCategory.getId(), VersionRange.emptyRange, parentCategory.getFilter(), false, false));	237	reqsConfigurationUnits.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, parentCategory.getId(), VersionRange.emptyRange, parentCategory.getFilter(), false, false));
234	}	238	}
235	cat.setRequiredCapabilities((RequiredCapability[]) reqsConfigurationUnits.toArray(new RequiredCapability[reqsConfigurationUnits.size()]));	239	cat.setRequiredCapabilities((IRequiredCapability[]) reqsConfigurationUnits.toArray(new IRequiredCapability[reqsConfigurationUnits.size()]));
236		240
237	// Create set of provided capabilities	241	// Create set of provided capabilities
238	ArrayList providedCapabilities = new ArrayList();	242	ArrayList providedCapabilities = new ArrayList();
Lines 252-258 Link Here
252	}	256	}
253	}	257	}
254		258
255	cat.setCapabilities((ProvidedCapability[]) providedCapabilities.toArray(new ProvidedCapability[providedCapabilities.size()]));	259	cat.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));
256		260
257	cat.setArtifacts(new IArtifactKey[0]);	261	cat.setArtifacts(new IArtifactKey[0]);
258	cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$	262	cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$




public class MetadataGeneratorHelper {
	/**
	 * A capability namespace representing the type of Eclipse resource (bundle, feature, source bundle, etc)
	 * @see IRequiredCapability#getNamespace()
	 * @see IProvidedCapability#getNamespace()
	 */
	public static final String NAMESPACE_ECLIPSE_TYPE = "org.eclipse.equinox.p2.eclipse.type"; //$NON-NLS-1$

	/**
	 * A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing and OSGi bundle resource
	 * @see IRequiredCapability#getName()
	 * @see IProvidedCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_BUNDLE = "bundle"; //$NON-NLS-1$
	/**
	 * A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing a feature
	 * @see IRequiredCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_FEATURE = "feature"; //$NON-NLS-1$

	/**
	 * A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing a source bundle
	 * @see IRequiredCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$

	/**
	 * A capability namespace representing the localization (translation)
	 * of strings from a specified IU in a specified locale
	 * @see IRequiredCapability#getNamespace()
	 * @see IProvidedCapability#getNamespace()
	 * TODO: this should be in API, probably in IInstallableUnit
	 */
	public static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$

	public static final TouchpointType TOUCHPOINT_NATIVE = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.native", new Version(1, 0, 0)); //$NON-NLS-1$
	public static final TouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", new Version(1, 0, 0)); //$NON-NLS-1$

	public static final IProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new Version(1, 0, 0));
	public static final IProvidedCapability FEATURE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, new Version(1, 0, 0));
	public static final IProvidedCapability SOURCE_BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, new Version(1, 0, 0));

	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$	


		cu.setVersion(iuVersion);

		//Indicate the IU to which this CU apply
		cu.setHost(new IRequiredCapability[] { //
				MetadataFactory.createRequiredCapability(CAPABILITY_NS_OSGI_BUNDLE, iuId, new VersionRange(iuVersion, true, versionMax, true), null, false, false, true), // 
						MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new VersionRange(new Version(1, 0, 0), true, new Version(2, 0, 0), false), null, false, false, false)});

		//Adds capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, iuVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		Map touchpointData = new HashMap();
		touchpointData.put("install", "installBundle(bundle:${artifact})"); //$NON-NLS-1$ //$NON-NLS-2$

			//TODO this needs to be refined to take into account all the attribute handled by imports
			reqsDeps.add(MetadataFactory.createRequiredCapability(CAPABILITY_NS_JAVA_PACKAGE, importPackageName, versionRange, null, isOptional(importSpec), false));
		}
		iu.setRequiredCapabilities((IRequiredCapability[]) reqsDeps.toArray(new IRequiredCapability[reqsDeps.size()]));

		// Create set of provided capabilities
		ArrayList providedCapabilities = new ArrayList();

			}
		}

		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		iu.setArtifacts(new IArtifactKey[] {key});


		fragment.setVersion(Version.fromOSGiVersion(bd.getVersion())); // TODO: is this a meaningful version?

		HostSpecification hostSpec = bd.getHost();
		IRequiredCapability[] hostReqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, hostSpec.getName(), VersionRange.fromOSGiVersionRange(hostSpec.getVersionRange()), null, false, false, false)};
		fragment.setHost(hostReqs);

		fragment.setSingleton(true);

			}
			providedCapabilities.add(makeTranslationCapability(hostId, locale));
		}
		fragment.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		return MetadataFactory.createInstallableUnitFragment(fragment);
	}

		return id + ".translated_host_properties"; //$NON-NLS-1$
	}

	private static IProvidedCapability makeTranslationCapability(String hostId, Locale locale) {
		return MetadataFactory.createProvidedCapability(NAMESPACE_IU_LOCALIZATION, locale.toString(), new Version(1, 0, 0));
	}


		if (parentCategory != null) {
			reqsConfigurationUnits.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, parentCategory.getId(), VersionRange.emptyRange, parentCategory.getFilter(), false, false));
		}
		cat.setRequiredCapabilities((IRequiredCapability[]) reqsConfigurationUnits.toArray(new IRequiredCapability[reqsConfigurationUnits.size()]));

		// Create set of provided capabilities
		ArrayList providedCapabilities = new ArrayList();

			}
		}

		cat.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		cat.setArtifacts(new IArtifactKey[0]);
		cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$


		// Add capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		// Create a required capability on bundles
		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, VersionRange.emptyRange, null, false, true, false)};
		cu.setHost(reqs);
		Map touchpointData = new HashMap();



		// Add capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		// Create a required capability on features
		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, VersionRange.emptyRange, null, true, true, false)};
		cu.setHost(reqs);

		cu.setFilter(INSTALL_FEATURES_FILTER);


		// Add capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		// Create a required capability on source providers
		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, VersionRange.emptyRange, null, true, true, false)};
		cu.setHost(reqs);
		Map touchpointData = new HashMap();


			}
		}

		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		if (extraProperties != null) {
			Enumeration e = extraProperties.propertyNames();

		iu.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(id, new VersionRange(new Version(0, 0, 0), true, new Version(feature.getVersion()), false), IUpdateDescriptor.NORMAL, null));

		FeatureEntry entries[] = feature.getEntries();
		IRequiredCapability[] required = new IRequiredCapability[entries.length + (featureIU == null ? 0 : 1)];
		for (int i = 0; i < entries.length; i++) {
			VersionRange range = getVersionRange(entries[i]);
			String requiredId = entries[i].getId();

		if (featureIU != null)
			required[entries.length] = MetadataFactory.createRequiredCapability(IU_NAMESPACE, featureIU.getId(), new VersionRange(featureIU.getVersion(), true, featureIU.getVersion(), true), INSTALL_FEATURES_FILTER, false, false);
		iu.setRequiredCapabilities(required);
		iu.setTouchpointType(ITouchpointType.NONE);
		iu.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());
		// TODO: shouldn't the filter for the group be constructed from os, ws, arch, nl
		// 		 of the feature?

			}
		}

		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		if (extraProperties != null) {
			Enumeration e = extraProperties.propertyNames();

		ArrayList requirementChanges = new ArrayList();
		for (int i = 0; i < entries.length; i++) {
			VersionRange range = getVersionRange(entries[i]);
			IRequiredCapability req = MetadataFactory.createRequiredCapability(IU_NAMESPACE, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), range, getFilter(entries[i]), entries[i].isOptional(), false);
			if (entries[i].isRequires()) {
				applicabilityScope.add(req);
				continue;
			}
			if (entries[i].isPlugin()) {
				IRequiredCapability from = MetadataFactory.createRequiredCapability(IU_NAMESPACE, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), VersionRange.emptyRange, getFilter(entries[i]), entries[i].isOptional(), false);
				requirementChanges.add(new RequirementChange(from, req));
				continue;
			}

		}
		//Always add a requirement on the IU containing the feature jar
		patchRequirements.add(MetadataFactory.createRequiredCapability(IU_NAMESPACE, featureIU.getId(), new VersionRange(featureIU.getVersion(), true, featureIU.getVersion(), true), INSTALL_FEATURES_FILTER, false, false));
		iu.setRequiredCapabilities((IRequiredCapability[]) patchRequirements.toArray(new IRequiredCapability[patchRequirements.size()]));
		iu.setApplicabilityScope(new IRequiredCapability[][] {(IRequiredCapability[]) applicabilityScope.toArray(new IRequiredCapability[applicabilityScope.size()])});
		iu.setRequirementChanges((IRequirementChange[]) requirementChanges.toArray(new IRequirementChange[requirementChanges.size()]));

		//Generate lifecycle
		IRequiredCapability lifeCycle = null;
		if (applicabilityScope.size() > 0) {
			IRequiredCapability req = (IRequiredCapability) applicabilityScope.get(0);
			lifeCycle = MetadataFactory.createRequiredCapability(req.getNamespace(), req.getName(), req.getRange(), null, false, false, false);
			iu.setLifeCycle(lifeCycle);
		}

		iu.setTouchpointType(ITouchpointType.NONE);
		iu.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());
		iu.setProperty(IInstallableUnit.PROP_TYPE_PATCH, Boolean.TRUE.toString());
		// TODO: shouldn't the filter for the group be constructed from os, ws, arch, nl

			}
		}

		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		if (extraProperties != null) {
			Enumeration e = extraProperties.propertyNames();

		String configId = "config." + id;//$NON-NLS-1$
		cu.setId(configId);
		cu.setVersion(version);
		cu.setHost(new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, id, new VersionRange(version, true, versionMax, true), null, false, false)});
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configId, version)});
		cu.setTouchpointType(TOUCHPOINT_NATIVE);
		Map touchpointData = new HashMap();



		IArtifactKey key = createLauncherArtifactKey(launcherId, LAUNCHER_VERSION);
		iu.setArtifacts(new IArtifactKey[] {key});
		iu.setCapabilities(new IProvidedCapability[] {createSelfCapability(launcherId, LAUNCHER_VERSION)});
		iu.setTouchpointType(TOUCHPOINT_NATIVE);
		resultantIUs.add(MetadataFactory.createInstallableUnit(iu));


		String configUnitId = configurationFlavor + launcherId;
		cu.setId(configUnitId);
		cu.setVersion(LAUNCHER_VERSION);
		cu.setHost(new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, launcherId, new VersionRange(LAUNCHER_VERSION, true, versionMax, true), null, false, false)});
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, LAUNCHER_VERSION)});
		cu.setTouchpointType(TOUCHPOINT_NATIVE);
		Map touchpointData = new HashMap();
		String configurationData = "unzip(source:@artifact, target:${installFolder});"; //$NON-NLS-1$

		iud.setId(iuId + '.' + launcherName);
		iud.setVersion(version);
		iud.setTouchpointType(MetadataGeneratorHelper.TOUCHPOINT_OSGI);
		iud.setCapabilities(new IProvidedCapability[] {createSelfCapability(iuId + '.' + launcherName, version)});

		if (os != null || ws != null || arch != null) {
			String filterOs = os != null ? "(osgi.os=" + os + ")" : ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		return iu;
	}

	public static IProvidedCapability createSelfCapability(String installableUnitId, Version installableUnitVersion) {
		return MetadataFactory.createProvidedCapability(IU_NAMESPACE, installableUnitId, installableUnitVersion);
	}


	/**
	 * @deprecated moved to JREAction
	 */
	private static IProvidedCapability[] generateJRECapability(String installableUnitId, Version installableUnitVersion, InputStream profileStream) {
		if (profileStream == null) {
			//use the 1.6 profile stored in the generator bundle
			try {

		try {
			p.load(profileStream);
			ManifestElement[] jrePackages = ManifestElement.parseHeader("org.osgi.framework.system.packages", (String) p.get("org.osgi.framework.system.packages")); //$NON-NLS-1$ //$NON-NLS-2$
			IProvidedCapability[] exportedPackageAsCapabilities = new IProvidedCapability[jrePackages.length + 1];
			exportedPackageAsCapabilities[0] = createSelfCapability(installableUnitId, installableUnitVersion);
			for (int i = 1; i <= jrePackages.length; i++) {
				exportedPackageAsCapabilities[i] = MetadataFactory.createProvidedCapability(CAPABILITY_NS_JAVA_PACKAGE, jrePackages[i - 1].getValue(), null);

				}
			}
		}
		return new IProvidedCapability[0];
	}

	/**




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.ui.admin.dialogs;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIActivator;

		if (value != null) {
			namespace.setText(value);
		}
		ITouchpointType type = iu.getTouchpointType();
		if (type != null) {
			touchpointType.setText(type.getId());
		}
		ITouchpointData[] data = iu.getTouchpointData();
		String[] items = new String[data.length];
		for (int i = 0; i < data.length; i++) {
			items[i] = data[i].toString();
		}
		touchpointData.setItems(items);

		IRequiredCapability[] req = iu.getRequiredCapabilities();
		items = new String[req.length];
		for (int i = 0; i < req.length; i++) {
			items[i] = req[i].toString();
		}
		requiredCapabilities.setItems(items);
		IProvidedCapability[] prov = iu.getProvidedCapabilities();
		items = new String[prov.length];
		for (int i = 0; i < prov.length; i++) {
			items[i] = prov[i].toString();

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java (-5 / +6 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.model;	11	package org.eclipse.equinox.internal.p2.ui.model;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
13	import java.util.*;	15	import java.util.*;
14	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
16	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
17	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;	18	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
18	import org.eclipse.equinox.internal.provisional.p2.ui.policy.QueryProvider;	19	import org.eclipse.equinox.internal.provisional.p2.ui.policy.QueryProvider;
19		20
Lines 26-32 Link Here
26	public class CategoryElement extends RemoteQueriedElement implements IIUElement {	27	public class CategoryElement extends RemoteQueriedElement implements IIUElement {
27		28
28	private ArrayList ius = new ArrayList(1);	29	private ArrayList ius = new ArrayList(1);
29	private RequiredCapability[] requirements;	30	private IRequiredCapability[] requirements;
30		31
31	public CategoryElement(Object parent, IInstallableUnit iu) {	32	public CategoryElement(Object parent, IInstallableUnit iu) {
32	super(parent);	33	super(parent);
Lines 85-93 Link Here
85	ius.add(iu);	86	ius.add(iu);
86	}	87	}
87		88
88	public RequiredCapability[] getRequirements() {	89	public IRequiredCapability[] getRequirements() {
89	if (ius == null \|\| ius.isEmpty())	90	if (ius == null \|\| ius.isEmpty())
90	return new RequiredCapability[0];	91	return new IRequiredCapability[0];
91	if (requirements == null) {	92	if (requirements == null) {
92	if (ius.size() == 1)	93	if (ius.size() == 1)
93	requirements = getIU().getRequiredCapabilities();	94	requirements = getIU().getRequiredCapabilities();
Lines 98-104 Link Here
98	IInstallableUnit iu = (IInstallableUnit) iter.next();	99	IInstallableUnit iu = (IInstallableUnit) iter.next();
99	capabilities.addAll(Arrays.asList(iu.getRequiredCapabilities()));	100	capabilities.addAll(Arrays.asList(iu.getRequiredCapabilities()));
100	}	101	}
101	requirements = (RequiredCapability[]) capabilities.toArray(new RequiredCapability[capabilities.size()]);	102	requirements = (IRequiredCapability[]) capabilities.toArray(new IRequiredCapability[capabilities.size()]);
102	}	103	}
103	}	104	}
104	return requirements;	105	return requirements;

Lines 10-18 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/model/IIUElement.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.ui.model;	11	package org.eclipse.equinox.internal.p2.ui.model;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
13	import org.eclipse.core.runtime.IProgressMonitor;	15	import org.eclipse.core.runtime.IProgressMonitor;
14	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	16	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
15	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
16		17
17	/**	18	/**
18	* Interface for elements that represent IU's.	19	* Interface for elements that represent IU's.
Lines 49-55 Link Here
49		50
50	public void computeSize(IProgressMonitor monitor);	51	public void computeSize(IProgressMonitor monitor);
51		52
52	public RequiredCapability[] getRequirements();	53	public IRequiredCapability[] getRequirements();
53		54
54	public Object getParent(Object obj);	55	public Object getParent(Object obj);
55		56




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.ui.query;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
import org.eclipse.equinox.internal.provisional.p2.query.Query;

/**

 * meet any one of the given capabilities.  
 */
public class AnyRequiredCapabilityQuery extends Query {
	private IRequiredCapability[] requirements;

	/**
	 * Creates a new query for the capabilities of the given IU.
	 */
	public AnyRequiredCapabilityQuery(IRequiredCapability[] requirements) {
		this.requirements = requirements;
	}


Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/SimpleLicenseManager.java (-4 / +5 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.ui;	12	package org.eclipse.equinox.internal.p2.ui;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;
		15
14	import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;	16	import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
15		17
16	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;	18	import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
Lines 20-26 Link Here
20	import java.util.*;	22	import java.util.*;
21	import javax.xml.parsers.*;	23	import javax.xml.parsers.*;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.License;
24	import org.eclipse.equinox.internal.provisional.p2.ui.policy.LicenseManager;	25	import org.eclipse.equinox.internal.provisional.p2.ui.policy.LicenseManager;
25	import org.eclipse.ui.statushandlers.StatusManager;	26	import org.eclipse.ui.statushandlers.StatusManager;
26	import org.w3c.dom.*;	27	import org.w3c.dom.*;
Lines 37-57 Link Here
37	java.util.Set accepted = new HashSet();	38	java.util.Set accepted = new HashSet();
38		39
39	public boolean accept(IInstallableUnit iu) {	40	public boolean accept(IInstallableUnit iu) {
40	License license = IUPropertyUtils.getLicense(iu);	41	ILicense license = IUPropertyUtils.getLicense(iu);
41	if (license != null)	42	if (license != null)
42	accepted.add(license.getDigest());	43	accepted.add(license.getDigest());
43	return true;	44	return true;
44	}	45	}
45		46
46	public boolean reject(IInstallableUnit iu) {	47	public boolean reject(IInstallableUnit iu) {
47	License license = IUPropertyUtils.getLicense(iu);	48	ILicense license = IUPropertyUtils.getLicense(iu);
48	if (license != null)	49	if (license != null)
49	accepted.remove(license.getDigest());	50	accepted.remove(license.getDigest());
50	return true;	51	return true;
51	}	52	}
52		53
53	public boolean isAccepted(IInstallableUnit iu) {	54	public boolean isAccepted(IInstallableUnit iu) {
54	License license = IUPropertyUtils.getLicense(iu);	55	ILicense license = IUPropertyUtils.getLicense(iu);
55	if (license == null)	56	if (license == null)
56	return true;	57	return true;
57	return accepted.contains(license.getDigest());	58	return accepted.contains(license.getDigest());

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/ui/viewers/ProvElementLabelProvider.java (-5 / +7 lines)
11		11
12	package org.eclipse.equinox.internal.provisional.p2.ui.viewers;	12	package org.eclipse.equinox.internal.provisional.p2.ui.viewers;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		15
14	import org.eclipse.equinox.internal.p2.ui.model.IIUElement;	16	import org.eclipse.equinox.internal.p2.ui.model.IIUElement;
15	import org.eclipse.equinox.internal.p2.ui.model.ProvElement;	17	import org.eclipse.equinox.internal.p2.ui.model.ProvElement;
16	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;	18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
Lines 71-78 Link Here
71	ProcessingStepDescriptor descriptor = (ProcessingStepDescriptor) obj;	73	ProcessingStepDescriptor descriptor = (ProcessingStepDescriptor) obj;
72	return descriptor.getProcessorId();	74	return descriptor.getProcessorId();
73	}	75	}
74	if (obj instanceof RequiredCapability) {	76	if (obj instanceof IRequiredCapability) {
75	return ((RequiredCapability) obj).getName();	77	return ((IRequiredCapability) obj).getName();
76	}	78	}
77	return obj.toString();	79	return obj.toString();
78	}	80	}
Lines 96-102 Link Here
96	if (obj instanceof IArtifactKey) {	98	if (obj instanceof IArtifactKey) {
97	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);	99	return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
98	}	100	}
99	if (obj instanceof RequiredCapability) {	101	if (obj instanceof IRequiredCapability) {
100	return ProvUIImages.getImage(ProvUIImages.IMG_IU);	102	return ProvUIImages.getImage(ProvUIImages.IMG_IU);
101	}	103	}
102	return null;	104	return null;
Lines 136-143 Link Here
136	IArtifactKey key = (IArtifactKey) element;	138	IArtifactKey key = (IArtifactKey) element;
137	return key.getVersion().toString();	139	return key.getVersion().toString();
138	}	140	}
139	if (element instanceof RequiredCapability) {	141	if (element instanceof IRequiredCapability) {
140	return ((RequiredCapability) element).getRange().getMaximum().toString();	142	return ((IRequiredCapability) element).getRange().getMaximum().toString();
141	}	143	}
142		144
143	}	145	}




 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.ui;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;

import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;

import java.lang.ref.SoftReference;
import java.util.*;
import org.eclipse.core.runtime.IStatus;

	private static Map LocaleCollectorCache = new HashMap(2);

	// Get the license in the default locale.
	public static ILicense getLicense(IInstallableUnit iu) {
		return getLicense(iu, getCurrentLocale());
	}

	// Get the copyright in the default locale.
	public static ICopyright getCopyright(IInstallableUnit iu) {
		return getCopyright(iu, getCurrentLocale());
	}


		return getIUProperty(iu, propertyKey, getCurrentLocale());
	}

	public static ILicense getLicense(IInstallableUnit iu, Locale locale) {
		ILicense license = iu.getLicense();
		String body = (license != null ? license.getBody() : null);
		if (body == null || body.length() <= 1 || body.charAt(0) != '%')
			return license;

		return new License(license.getLocation(), body);
	}

	public static ICopyright getCopyright(IInstallableUnit iu, Locale locale) {
		ICopyright copyright = iu.getCopyright();
		String body = (copyright != null ? copyright.getBody() : null);
		if (body == null || body.length() <= 1 || body.charAt(0) != '%')
			return copyright;

				boolean haveHost = false;
				if (object instanceof IInstallableUnitFragment) {
					IInstallableUnitFragment fragment = (IInstallableUnitFragment) object;
					IRequiredCapability[] hosts = fragment.getHost();
					for (int i = 0; i < hosts.length; i++) {
						IRequiredCapability nextHost = hosts[i];
						if (IInstallableUnit.NAMESPACE_IU_ID.equals(nextHost.getNamespace()) && //
								theUnit.getId().equals(nextHost.getName()) && //
								nextHost.getRange() != null && //

				boolean haveLocale = false;
				if (object instanceof IInstallableUnitFragment) {
					IInstallableUnitFragment fragment = (IInstallableUnitFragment) object;
					IProvidedCapability[] provides = fragment.getProvidedCapabilities();
					for (int j = 0; j < provides.length && !haveLocale; j++) {
						IProvidedCapability nextProvide = provides[j];
						if (NAMESPACE_IU_LOCALIZATION.equals(nextProvide.getNamespace())) {
							String providedLocale = nextProvide.getName();
							if (providedLocale != null) {

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java (-5 / +9 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.provisional.p2.engine;	12	package org.eclipse.equinox.internal.provisional.p2.engine;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;
		15
		16	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		17
14	import java.util.*;	18	import java.util.*;
15	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.p2.engine.EngineActivator;	20	import org.eclipse.equinox.internal.p2.engine.EngineActivator;
Lines 74-80 Link Here
74	}	78	}
75		79
76	protected final ProvisioningAction[] getActions(IInstallableUnit unit, String key) {	80	protected final ProvisioningAction[] getActions(IInstallableUnit unit, String key) {
77	TouchpointInstruction[] instructions = getInstructions(unit, key);	81	ITouchpointInstruction[] instructions = getInstructions(unit, key);
78	if (instructions == null \|\| instructions.length == 0)	82	if (instructions == null \|\| instructions.length == 0)
79	return null;	83	return null;
80		84
Lines 86-104 Link Here
86	return (ProvisioningAction[]) actions.toArray(new ProvisioningAction[actions.size()]);	90	return (ProvisioningAction[]) actions.toArray(new ProvisioningAction[actions.size()]);
87	}	91	}
88		92
89	private final static TouchpointInstruction[] getInstructions(IInstallableUnit unit, String key) {	93	private final static ITouchpointInstruction[] getInstructions(IInstallableUnit unit, String key) {
90	TouchpointData[] data = unit.getTouchpointData();	94	ITouchpointData[] data = unit.getTouchpointData();
91	if (data == null)	95	if (data == null)
92	return null;	96	return null;
93		97
94	ArrayList matches = new ArrayList(data.length);	98	ArrayList matches = new ArrayList(data.length);
95	for (int i = 0; i < data.length; i++) {	99	for (int i = 0; i < data.length; i++) {
96	TouchpointInstruction instructions = data[i].getInstruction(key);	100	ITouchpointInstruction instructions = data[i].getInstruction(key);
97	if (instructions != null)	101	if (instructions != null)
98	matches.add(instructions);	102	matches.add(instructions);
99	}	103	}
100		104
101	TouchpointInstruction[] result = (TouchpointInstruction[]) matches.toArray(new TouchpointInstruction[matches.size()]);	105	ITouchpointInstruction[] result = (ITouchpointInstruction[]) matches.toArray(new ITouchpointInstruction[matches.size()]);
102	return result;	106	return result;
103	}	107	}
104	}	108	}

Lines 18-24 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java (-3 / +3 lines)
18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest;	18	import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest;
19	import org.eclipse.equinox.internal.provisional.p2.engine.*;	19	import org.eclipse.equinox.internal.provisional.p2.engine.*;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
22		22
23	/**	23	/**
24	* The goal of the collect phase is to ask the touchpoints if the artifacts associated with an IU need to be downloaded.	24	* The goal of the collect phase is to ask the touchpoints if the artifacts associated with an IU need to be downloaded.
Lines 44-51 Link Here
44	if (parsedActions != null)	44	if (parsedActions != null)
45	return parsedActions;	45	return parsedActions;
46		46
47	TouchpointType type = unit.getTouchpointType();	47	ITouchpointType type = unit.getTouchpointType();
48	if (type == null \|\| type == TouchpointType.NONE)	48	if (type == null \|\| ITouchpointType.NONE.equals(type))
49	return null;	49	return null;
50		50
51	ProvisioningAction action = actionManager.getTouchpointQualifiedAction(phaseId, type);	51	ProvisioningAction action = actionManager.getTouchpointQualifiedAction(phaseId, type);

Lines 15-21 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java (-3 / +3 lines)
15	import org.eclipse.core.runtime.IStatus;	15	import org.eclipse.core.runtime.IStatus;
16	import org.eclipse.equinox.internal.provisional.p2.engine.*;	16	import org.eclipse.equinox.internal.provisional.p2.engine.*;
17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
18	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;	18	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
19		19
20	/**	20	/**
21	* An install phase that checks if the certificates used to sign the artifacts	21	* An install phase that checks if the certificates used to sign the artifacts
Lines 50-57 Link Here
50	if (parsedActions != null)	50	if (parsedActions != null)
51	return parsedActions;	51	return parsedActions;
52		52
53	TouchpointType type = unit.getTouchpointType();	53	ITouchpointType type = unit.getTouchpointType();
54	if (type == null \|\| type == TouchpointType.NONE)	54	if (type == null \|\| ITouchpointType.NONE.equals(type))
55	return null;	55	return null;
56		56
57	ProvisioningAction action = actionManager.getTouchpointQualifiedAction(phaseId, type);	57	ProvisioningAction action = actionManager.getTouchpointQualifiedAction(phaseId, type);

Lines 20-26 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java (-3 / +3 lines)
20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;	20	import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.engine.*;	21	import org.eclipse.equinox.internal.provisional.p2.engine.*;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;	23	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
24		24
25	public class Sizing extends InstallableUnitPhase {	25	public class Sizing extends InstallableUnitPhase {
26	private static final String PHASE_ID = "sizing"; //$NON-NLS-1$	26	private static final String PHASE_ID = "sizing"; //$NON-NLS-1$
Lines 51-58 Link Here
51	if (parsedActions != null)	51	if (parsedActions != null)
52	return parsedActions;	52	return parsedActions;
53		53
54	TouchpointType type = unit.getTouchpointType();	54	ITouchpointType type = unit.getTouchpointType();
55	if (type == null \|\| type == TouchpointType.NONE)	55	if (type == null \|\| ITouchpointType.NONE.equals(type))
56	return null;	56	return null;
57		57
58	ProvisioningAction action = actionManager.getTouchpointQualifiedAction(COLLECT_PHASE_ID, type);	58	ProvisioningAction action = actionManager.getTouchpointQualifiedAction(COLLECT_PHASE_ID, type);




import java.util.Map;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint;
import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.osgi.util.NLS;

public class ActionManager implements IRegistryChangeListener {

		RegistryFactory.getRegistry().addRegistryChangeListener(this, EngineActivator.ID);
	}

	public Touchpoint getTouchpointPoint(ITouchpointType type) {
		if (type == null || ITouchpointType.NONE.equals(type))
			return null;
		return touchpointManager.getTouchpoint(type);
	}

	public ProvisioningAction getTouchpointQualifiedAction(String actionId, ITouchpointType type) {
		if (actionId.indexOf('.') == -1) {
			if (type == null || ITouchpointType.NONE.equals(type))
				return null;

			Touchpoint touchpoint = touchpointManager.getTouchpoint(type);




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.engine;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint;
import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.osgi.util.NLS;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

	 * Return the touchpoint which is registered for the given type,
	 * or <code>null</code> if none are registered.
	 */
	public synchronized Touchpoint getTouchpoint(ITouchpointType type) {
		if (type == null)
			throw new IllegalArgumentException(Messages.TouchpointManager_Null_Touchpoint_Type_Argument);
		return getTouchpoint(type.getId(), type.getVersion().toString());

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;	9	package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		12
11	import java.util.*;	13	import java.util.*;
12	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
13	import org.eclipse.core.runtime.Status;	15	import org.eclipse.core.runtime.Status;
Lines 42-48 Link Here
42	return Status.OK_STATUS;	44	return Status.OK_STATUS;
43	}	45	}
44		46
45	public static boolean isZipped(TouchpointData[] data) {	47	public static boolean isZipped(ITouchpointData[] data) {
46	if (data == null \|\| data.length == 0)	48	if (data == null \|\| data.length == 0)
47	return false;	49	return false;
48	for (int i = 0; i < data.length; i++) {	50	for (int i = 0; i < data.length; i++) {

Lines 12-17 Link Here

(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java (-2 / +6 lines)
12	*******************************************************************************/	12	*******************************************************************************/
13	package org.eclipse.equinox.internal.p2.touchpoint.eclipse;	13	package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
14		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;
		16
		17	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		18
15	import java.io.*;	19	import java.io.*;
16	import java.net.*;	20	import java.net.*;
17	import java.util.*;	21	import java.util.*;
Lines 288-296 Link Here
288	return null;	292	return null;
289	}	293	}
290		294
291	public static String getManifest(TouchpointData[] data) {	295	public static String getManifest(ITouchpointData[] data) {
292	for (int i = 0; i < data.length; i++) {	296	for (int i = 0; i < data.length; i++) {
293	TouchpointInstruction manifestInstruction = data[i].getInstruction("manifest"); //$NON-NLS-1$	297	ITouchpointInstruction manifestInstruction = data[i].getInstruction("manifest"); //$NON-NLS-1$
294	if (manifestInstruction == null)	298	if (manifestInstruction == null)
295	return null;	299	return null;
296	String manifest = manifestInstruction.getBody();	300	String manifest = manifestInstruction.getBody();

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/MissingNonGreedyRequirement.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 29-35 Link Here
29		31
30	c1 = createIU("C", new Version("1.0.0"), true);	32	c1 = createIU("C", new Version("1.0.0"), true);
31		33
32	RequiredCapability[] reqB = new RequiredCapability[2];	34	IRequiredCapability[] reqB = new IRequiredCapability[2];
33	reqB[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false);	35	reqB[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false);
34	reqB[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);	36	reqB[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);
35	a1 = createIU("A", new Version("1.0.0"), reqB);	37	a1 = createIU("A", new Version("1.0.0"), reqB);




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, true, false, true));
		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1, changepp2}, scopepp1, lifeCyclepp1);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1});


Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/MissingDependency2.java (-2 / +4 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 24-35 Link Here
24		26
25	protected void setUp() throws Exception {	27	protected void setUp() throws Exception {
26	super.setUp();	28	super.setUp();
27	RequiredCapability[] reqA = new RequiredCapability[1];	29	IRequiredCapability[] reqA = new IRequiredCapability[1];
28	reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, true);	30	reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, true);
29	a1 = createIU("A", new Version("1.0.0"), reqA);	31	a1 = createIU("A", new Version("1.0.0"), reqA);
30		32
31	//Missing optional dependency	33	//Missing optional dependency
32	RequiredCapability[] req = new RequiredCapability[1];	34	IRequiredCapability[] req = new IRequiredCapability[1];
33	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);	35	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);
34	b1 = createIU("B", new Version("1.0.0"), req);	36	b1 = createIU("B", new Version("1.0.0"), req);
35		37

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/AnotherSingleton.java (-4 / +6 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;	14	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
13	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	15	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
Lines 33-43 Link Here
33		35
34	a2 = createIU("A", new Version("2.0.0"), true);	36	a2 = createIU("A", new Version("2.0.0"), true);
35		37
36	RequiredCapability c1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);	38	IRequiredCapability c1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);
37	x = createIU("X", new Version(2, 0, 0), new RequiredCapability[] {c1});	39	x = createIU("X", new Version(2, 0, 0), new IRequiredCapability[] {c1});
38		40
39	RequiredCapability c2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 2.0.0]"), null, false, false);	41	IRequiredCapability c2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 2.0.0]"), null, false, false);
40	y = createIU("Y", new Version(2, 0, 0), new RequiredCapability[] {c2});	42	y = createIU("Y", new Version(2, 0, 0), new IRequiredCapability[] {c2});
41		43
42	createTestMetdataRepository(new IInstallableUnit[] {a1, a2, x, y});	44	createTestMetdataRepository(new IInstallableUnit[] {a1, a2, x, y});
43		45




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.*;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false)}};
		pp2 = createIUPatch(PP2, new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		p2Feature20 = createIU(P2_FEATURE, new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true)});
		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, pp2, p2Feature20});

		profile1 = createProfile("TestProfile." + getName());

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/MissingOptional.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 28-34 Link Here
28	a1 = createIU("A", new Version("1.0.0"), true);	30	a1 = createIU("A", new Version("1.0.0"), true);
29	b1 = createIU("B", new Version("1.0.0"), true);	31	b1 = createIU("B", new Version("1.0.0"), true);
30		32
31	RequiredCapability[] req = new RequiredCapability[3];	33	IRequiredCapability[] req = new IRequiredCapability[3];
32	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, true);	34	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, true);
33	req[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, true);	35	req[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, true);
34	req[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);	36	req[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/MissingNonGreedyRequirement2.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 26-32 Link Here
26	super.setUp();	28	super.setUp();
27	c1 = createIU("C", new Version("1.0.0"), true);	29	c1 = createIU("C", new Version("1.0.0"), true);
28		30
29	RequiredCapability[] reqB = new RequiredCapability[2];	31	IRequiredCapability[] reqB = new IRequiredCapability[2];
30	reqB[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false);	32	reqB[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false);
31	reqB[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);	33	reqB[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);
32	a1 = createIU("A", new Version("1.0.0"), reqB);	34	a1 = createIU("A", new Version("1.0.0"), reqB);




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		d1 = createIU("D", new Version(1, 0, 0), true);
		c1 = createIU("C", new Version(1, 0, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 1.3.0)"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, c1, d1, p1});


Lines 1-5 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/IUWithFilter2.java (-2 / +4 lines)
1	package org.eclipse.equinox.p2.tests.planner;	1	package org.eclipse.equinox.p2.tests.planner;
2		2
		3	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		4
3	import org.eclipse.core.runtime.IStatus;	5	import org.eclipse.core.runtime.IStatus;
4	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;	6	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
5	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	7	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
Lines 18-28 Link Here
18		20
19	protected void setUp() throws Exception {	21	protected void setUp() throws Exception {
20	super.setUp();	22	super.setUp();
21	RequiredCapability[] reqs = new RequiredCapability[1];	23	IRequiredCapability[] reqs = new IRequiredCapability[1];
22	reqs[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);	24	reqs[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);
23	a1 = createIU("A", reqs);	25	a1 = createIU("A", reqs);
24		26
25	RequiredCapability[] reqsA2 = new RequiredCapability[1];	27	IRequiredCapability[] reqsA2 = new IRequiredCapability[1];
26	reqsA2[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, true, false);	28	reqsA2[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, true, false);
27	a2 = createIU("A", reqsA2);	29	a2 = createIU("A", reqsA2);
28		30




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false)}};
		pp2 = createIUPatch(PP2, new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		p2Feature20 = createIU(P2_FEATURE, new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, pp2, p2Feature20});

		profile1 = createProfile("TestProfile." + getName());




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		b3 = createIU("B", new Version(1, 3, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.2.0, 1.2.0]"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, p1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU("p2.feature", new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P1", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P2", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU("P1", new Version(1, 0, 0), true);
		p2 = createIU("P2", new Version(1, 0, 0), true);
		p1b = createIU("P1", new Version(1, 1, 1), true);
		p2b = createIU("P2", new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P1", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P1", new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "p2.feature", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "p2.feature", new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch("PP1", new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P2", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P2", new VersionRange("[3.1.1, 3.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "p2.feature", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "p2.feature", new VersionRange("[1.0.0, 1.0.0]"), null, false, false)}};
		pp2 = createIUPatch("PP2", new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, pp2});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.4.0, 1.5.0)"), null, false, true, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, p1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import java.util.HashMap;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 1, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		b3 = createIU("B", new Version(1, 3, 0), true);

		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.2.0)"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		IRequirementChange change2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.2.0, 1.3.0)"), null, false, false, true));
		p2 = createIUPatch("P", new Version("1.2.0"), null, new IRequiredCapability[0], new IProvidedCapability[0], new HashMap(), null, null, true, MetadataFactory.createUpdateDescriptor("P", new VersionRange("[1.0.0, 1.2.0)"), 0, null), new IRequirementChange[] {change2}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		IRequirementChange change3 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.3.0, 1.4.0)"), null, false, false, true));
		p3 = createIUPatch("P", new Version("1.3.0"), null, new IRequiredCapability[0], new IProvidedCapability[0], new HashMap(), null, null, true, MetadataFactory.createUpdateDescriptor("P", new VersionRange("[1.0.0, 1.3.0)"), 0, null), new IRequirementChange[] {change3}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, b3, p1, p2, p3});


Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/InclusionRuleTest2.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	14	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
13	import org.eclipse.equinox.internal.provisional.p2.director.*;	15	import org.eclipse.equinox.internal.provisional.p2.director.*;
Lines 30-36 Link Here
30	super.setUp();	32	super.setUp();
31	a1 = createIU("A", new Version("1.0.0"), true);	33	a1 = createIU("A", new Version("1.0.0"), true);
32		34
33	createIU("A", new Version("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, TouchpointType.NONE, NO_TP_DATA, true, MetadataFactory.createUpdateDescriptor("A", VersionRange.emptyRange, 0, "foo bar"));	35	createIU("A", new Version("2.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, true, MetadataFactory.createUpdateDescriptor("A", VersionRange.emptyRange, 0, "foo bar"));
34	a2 = createIU("A", new Version("2.0.0"), true);	36	a2 = createIU("A", new Version("2.0.0"), true);
35		37
36	createTestMetdataRepository(new IInstallableUnit[] {a1, a2});	38	createTestMetdataRepository(new IInstallableUnit[] {a1, a2});




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, p1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P3, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);
		p3 = createIU(P3, new Version(1, 0, 0), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false)}};
		pp2 = createIUPatch(PP2, new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p3, p1b, p2b, pp1, pp2});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.*;


	protected void setUp() throws Exception {
		super.setUp();
		f1 = createIU("F", new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0]"), null, false, false, true)});
		f2 = createIU("F", new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 4.0.0)"), null, false, false, true)});
		IProvidedCapability[] cap = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("foo", "bar", new Version(1, 0, 0))};
		a1 = createIU("A", new Version("1.0.0"), null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, false)}, cap, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null);
		a3 = createIU("A", new Version(3, 0, 0), true);
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(2, 0, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[2.0.0, 2.1.0)"), null, false, false, true));
		IRequiredCapability lifeCycle = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "F", new VersionRange("[1.0.0, 1.1.0)"), null, false, false, false);
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0]"), null, false, false, false)}}, lifeCycle);
		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, p1, a3, f1, f2});

		profile1 = createProfile("TestProfile." + getName());




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.*;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 3.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 3.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false)}};
		pp2 = createIUPatch(PP2, new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		p2Feature20 = createIU(P2_FEATURE, new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, pp2, p2Feature20});

		profile1 = createProfile("TestProfile." + getName());

Lines 1-5 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest1.java (-3 / +7 lines)
1	package org.eclipse.equinox.p2.tests.planner;	1	package org.eclipse.equinox.p2.tests.planner;
2		2
		3	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;
		4
		5	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		6
3	import java.io.File;	7	import java.io.File;
4	import java.util.ArrayList;	8	import java.util.ArrayList;
5	import org.eclipse.core.runtime.NullProgressMonitor;	9	import org.eclipse.core.runtime.NullProgressMonitor;
Lines 31-39 Link Here
31	changeVersion(newCommon, newVersionCommon);	35	changeVersion(newCommon, newVersionCommon);
32	newIUs.add(MetadataFactory.createInstallableUnit(newCommon));	36	newIUs.add(MetadataFactory.createInstallableUnit(newCommon));
33		37
34	RequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.common", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.common", new VersionRange(newVersionCommon, true, newVersionCommon, true), null, false, false, true));	38	IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.common", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.common", new VersionRange(newVersionCommon, true, newVersionCommon, true), null, false, false, true));
35	RequiredCapability lifeCycle = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.rcp.feature.group", new VersionRange("[3.5.0.v20081110-9E9vFtpFlN1yW2Ray4WRVBYE, 3.5.0.v20081110-9E9vFtpFlN1yW2Ray4WRVBYE]"), null, false, false, true);	39	IRequiredCapability lifeCycle = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.rcp.feature.group", new VersionRange("[3.5.0.v20081110-9E9vFtpFlN1yW2Ray4WRVBYE, 3.5.0.v20081110-9E9vFtpFlN1yW2Ray4WRVBYE]"), null, false, false, true);
36	patchInstallingCommon = createIUPatch("P", new Version("1.0.0"), true, new RequirementChange[] {change}, new RequiredCapability[0][0], lifeCycle);	40	patchInstallingCommon = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[0][0], lifeCycle);
37		41
38	newIUs.add(patchInstallingCommon);	42	newIUs.add(patchInstallingCommon);
39	}	43	}




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;

		b2 = createIU("B", new Version("2.0.0"), true);
		c2 = createIU("C", new Version("2.0.0"), true);

		IRequiredCapability[] req = new IRequiredCapability[3];
		req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0)"), null, false, true);
		req[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true);
		req[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[2.0.0, 3.1.0)"), null, false, true);
		f1 = createIU("F", new Version(1, 0, 0), req);

		IRequirementChange changeA = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 3.0.0)"), null, false, false, true));
		IRequiredCapability[][] scope = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "F", VersionRange.emptyRange, null, false, false, false)}};
		p1 = createIUPatch("P", new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeA}, scope, null);

		IRequirementChange changeB = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[2.0.0, 3.0.0)"), null, false, false, true));
		IRequiredCapability[][] scopePP = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "F", VersionRange.emptyRange, null, false, false, false)}};
		r1 = createIUPatch("R", new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeB}, scopePP, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, a2, b1, b2, c2, f1, p1, r1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		c1 = createIU("C", new Version(1, 0, 0), true);
		IRequirementChange changeB = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequirementChange changeC = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {changeB, changeC}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		IRequirementChange anotherChangeC = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.1.0, 1.3.0)"), null, true, false, true));
		pp1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {changeB, anotherChangeC}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, c1, p1, pp1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;

		z1 = createIU("Z", new Version("1.0.0"), true);

		//B's dependency is missing
		IRequiredCapability[] reqA = new IRequiredCapability[3];
		reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, true);
		reqA[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, true, false, true);
		reqA[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", VersionRange.emptyRange, null, true, false, true);
		a1 = createIU("A", new Version("1.0.0"), reqA);

		IRequiredCapability[] req = new IRequiredCapability[3];
		req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		req[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "Y", VersionRange.emptyRange, null, false, false, true);
		req[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "Z", VersionRange.emptyRange, null, true, false, true);

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/ActualChangeRequestTest.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import java.util.Map;	13	import java.util.Map;
12	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
13	import org.eclipse.equinox.internal.provisional.p2.core.Version;	15	import org.eclipse.equinox.internal.provisional.p2.core.Version;
Lines 29-35 Link Here
29		31
30	protected void setUp() throws Exception {	32	protected void setUp() throws Exception {
31	super.setUp();	33	super.setUp();
32	a = createIU("A", new Version("1.0.0"), new RequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)}, NO_PROPERTIES, true);	34	a = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)}, NO_PROPERTIES, true);
33		35
34	b = createIU("B", new Version("1.0.0"), true);	36	b = createIU("B", new Version("1.0.0"), true);
35		37




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, true, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p2b, pp1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 3.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		p2Feature20 = createIU(P2_FEATURE, new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, p2Feature20});

		profile1 = createProfile("TestProfile." + getName());




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;

		d1 = createIU("D", new Version("1.0.0"), true);
		d2 = createIU("D", new Version("2.0.0"), true);

		IRequiredCapability[] reqA = new IRequiredCapability[3];
		reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, true);
		reqA[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, true);
		reqA[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", VersionRange.emptyRange, null, true, false, true);
		a1 = createIU("A", new Version("1.0.0"), reqA);

		IRequiredCapability[] req = new IRequiredCapability[1];
		req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 2.0.0]"), null, false, false, true);
		x1 = createIU("X", req);





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;

		x1 = createIU("X", new Version(1, 2, 0), true);
		y1 = createIU("Y", new Version(1, 0, 0), true);
		y2 = createIU("Y", new Version(1, 2, 0), true);
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "X", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "X", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		c1 = createIU("C", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "Y", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});

		IRequiredCapability[] req = new IRequiredCapability[3];
		req[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0)"), null, false, true);
		req[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true);
		req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 1.1.0)"), null, false, true);
		f1 = createIU("F", new Version(1, 0, 0), req);

		IRequirementChange changeX = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "X", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "X", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability[][] scope = new IRequiredCapability[0][0]; //new RequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, false)}};
		p1 = createIUPatch("P", new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeX}, scope, null);

		IRequirementChange changeY = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "Y", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "Y", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability[][] scopePP = new IRequiredCapability[0][0]; //new RequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, false)}};
		pp1 = createIUPatch("PP", new Version("1.0.0"), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeY}, scopePP, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, c1, x1, y1, y2, f1, p1, pp1});
		//		createTestMetdataRepository(new IInstallableUnit[] {c1, y1, y2, f1, pp1});




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		top = createIU("TOP", new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "F", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		f1 = createIU("F", new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 2, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability lifeCycle = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "F", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scope = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, scope, lifeCycle);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, f1, top, p1});


Lines 1-5 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/Bug255984.java (-1 / +3 lines)
1	package org.eclipse.equinox.p2.tests.planner;	1	package org.eclipse.equinox.p2.tests.planner;
2		2
		3	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		4
3	import org.eclipse.core.runtime.IStatus;	5	import org.eclipse.core.runtime.IStatus;
4	import org.eclipse.core.runtime.NullProgressMonitor;	6	import org.eclipse.core.runtime.NullProgressMonitor;
5	import org.eclipse.equinox.internal.provisional.p2.director.*;	7	import org.eclipse.equinox.internal.provisional.p2.director.*;
Lines 21-27 Link Here
21		23
22	protected void setUp() throws Exception {	24	protected void setUp() throws Exception {
23	super.setUp();	25	super.setUp();
24	a = createIU("A", new Version("1.0.0"), new RequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)}, NO_PROPERTIES, true);	26	a = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)}, NO_PROPERTIES, true);
25		27
26	b = createIU("B", new Version("1.0.0"), true);	28	b = createIU("B", new Version("1.0.0"), true);
27		29




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.*;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 3.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		p2Feature20 = createIU(P2_FEATURE, new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, p2Feature20});

		profile1 = createProfile("TestProfile." + getName());

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/MissingDependency.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 27-33 Link Here
27	a1 = createIU("A", new Version("1.0.0"), true);	29	a1 = createIU("A", new Version("1.0.0"), true);
28		30
29	//Missing non optional dependency	31	//Missing non optional dependency
30	RequiredCapability[] req = new RequiredCapability[1];	32	IRequiredCapability[] req = new IRequiredCapability[1];
31	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, true);	33	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, true);
32	b1 = createIU("B", new Version("1.0.0"), req);	34	b1 = createIU("B", new Version("1.0.0"), req);
33		35




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, true, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		IProvidedCapability[] cap = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("foo", "bar", new Version(1, 0, 0))};
		a1 = createIU("A", new Version("1.0.0"), null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, false)}, cap, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null);
		b1 = createIU("B", new Version(1, 2, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0]"), null, false, false, false)}}, null);
		p2 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.3.0, 1.5.0]"), null, false, false, false)}}, null);
		p3 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] { {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0]"), null, false, false, false)}, {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.3.0, 1.5.0]"), null, false, false, false)}}, null);
		p4 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] { {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.6.0, 1.7.0]"), null, false, false, false)}, {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.3.0, 1.5.0]"), null, false, false, false)}}, null);
		p5 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability("foo", "bar", new VersionRange("[1.0.0, 2.0.0)"), null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.5.0]"), null, false, false, false)}}, null);
		p6 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {}, null);
		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, p1, p2, p3, p4, p5, p6});

		profile1 = createProfile("TestProfile." + getName());




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 2, 0), true);

		c1 = createIU("C", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		d1 = createIU("D", new Version(1, 2, 0), true);

		IRequirementChange changeA = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability[][] scopeP1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, false)}};
		IRequiredCapability[] reqOnPP = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "PP", new VersionRange("[1.0.0, 2.0.0)"), null, false, false, true)};
		p1 = createIUPatch("P", new Version("1.0.0"), null, reqOnPP, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false, null, new IRequirementChange[] {changeA}, scopeP1, null);

		IRequirementChange changeC = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability[][] scopePP1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, false)}};
		pp1 = createIUPatch("PP", new Version("1.0.0"), true, new IRequirementChange[] {changeC}, scopePP1, null);
		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, c1, d1, p1, pp1});

		profile1 = createProfile("TestProfile." + getName());

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/ActualChangeRequestTest2.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.equinox.internal.provisional.p2.director.RequestStatus;	13	import org.eclipse.equinox.internal.provisional.p2.director.RequestStatus;
12		14
13	import java.util.Map;	15	import java.util.Map;
Lines 32-38 Link Here
32		34
33	protected void setUp() throws Exception {	35	protected void setUp() throws Exception {
34	super.setUp();	36	super.setUp();
35	a = createIU("A", new Version("1.0.0"), new RequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)}, NO_PROPERTIES, true);	37	a = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)}, NO_PROPERTIES, true);
36		38
37	b = createIU("B", new Version("1.0.0"), true);	39	b = createIU("B", new Version("1.0.0"), true);
38	b2 = createIU("B", new Version("2.0.0"), true);	40	b2 = createIU("B", new Version("2.0.0"), true);




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;


		x = createIU("X", new Version(2, 0, 0), createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 4.1.0)"), null));

		IRequiredCapability c1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);
		IRequiredCapability c2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 2.0.0]"), null, false, false);
		y = createIU("Y", new Version(2, 0, 0), new IRequiredCapability[] {c1, c2});

		IRequiredCapability c3 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 3.0.0]"), null, false, false);
		IRequiredCapability c4 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[4.0.0, 4.0.0]"), null, false, false);
		z = createIU("Z", new Version(2, 0, 0), new IRequiredCapability[] {c3, c4});

		IRequiredCapability c5 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);
		IRequiredCapability c6 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 3.0.0]"), null, false, false);
		w = createIU("W", new Version(2, 0, 0), new IRequiredCapability[] {c5, c6});

		IRequiredCapability c7 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 2.0.0]"), null, false, false);
		IRequiredCapability c8 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[3.0.0, 4.0.0]"), null, false, false);
		v = createIU("V", new Version(2, 0, 0), new IRequiredCapability[] {c7});
		u = createIU("U", new Version(2, 0, 0), new IRequiredCapability[] {c8});

		createTestMetdataRepository(new IInstallableUnit[] {a1, a2, a3, a4, w, x, y, z});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		b3 = createIU("B", new Version(1, 3, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.2.0, 1.2.0]"), null, false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		IRequirementChange anotherChangeB = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.3.0, 1.3.0]"), null, false, false, true));
		pp1 = createIUPatch("PP", new Version("1.0.0"), true, new IRequirementChange[] {anotherChangeB}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, b3, p1, pp1});


Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/MissingOptionalNonGreedyRequirement.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 26-32 Link Here
26	super.setUp();	28	super.setUp();
27	b1 = createIU("B", new Version("1.0.0"), true);	29	b1 = createIU("B", new Version("1.0.0"), true);
28		30
29	RequiredCapability[] reqB = new RequiredCapability[1];	31	IRequiredCapability[] reqB = new IRequiredCapability[1];
30	reqB[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, false);	32	reqB[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, false);
31	a1 = createIU("A", new Version("1.0.0"), reqB);	33	a1 = createIU("A", new Version("1.0.0"), reqB);
32		34

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/SimpleOptionalTest.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 31-37 Link Here
31	b1 = createIU("B", new Version("1.0.0"), true);	33	b1 = createIU("B", new Version("1.0.0"), true);
32		34
33	//B's dependency is missing	35	//B's dependency is missing
34	RequiredCapability[] reqA = new RequiredCapability[1];	36	IRequiredCapability[] reqA = new IRequiredCapability[1];
35	reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, true);	37	reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, true, false, true);
36	a1 = createIU("A", new Version("1.0.0"), reqA);	38	a1 = createIU("A", new Version("1.0.0"), reqA);
37		39




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU("p2.feature", new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P1", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P2", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU("P1", new Version(1, 0, 0), true);
		p2 = createIU("P2", new Version(1, 0, 0), true);
		p1b = createIU("P1", new Version(1, 1, 1), true);
		p2b = createIU("P2", new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "p2.feature", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P1", new VersionRange("[1.1.1,1.1.1]"), null, false, false)}};
		pp1 = createIUPatch("PP1", new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "p2.feature", new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "P2", new VersionRange("[1.1.1,1.1.1]"), null, false, false)}};
		pp2 = createIUPatch("PP2", new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, pp2});





 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		p2Feature = createIU(P2_FEATURE, new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true)});
		p1 = createIU(P1, new Version(1, 0, 0), true);
		p2 = createIU(P2, new Version(1, 0, 0), true);
		p1b = createIU(P1, new Version(1, 1, 1), true);
		p2b = createIU(P2, new Version(1, 1, 1), true);

		IRequirementChange changepp1 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P1, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp1 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0,1.0.0]"), null, false, false)}};
		pp1 = createIUPatch(PP1, new Version("3.0.0"), true, new IRequirementChange[] {changepp1}, scopepp1, lifeCyclepp1);

		IRequirementChange changepp2 = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2, new VersionRange("[1.1.1, 1.1.1]"), null, false, false, true));
		IRequiredCapability lifeCyclepp2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false, true);
		IRequiredCapability[][] scopepp2 = new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, P2_FEATURE, new VersionRange("[1.0.0, 1.0.0]"), null, false, false)}};
		pp2 = createIUPatch(PP2, new Version("5.0.0"), true, new IRequirementChange[] {changepp2}, scopepp2, lifeCyclepp2);

		createTestMetdataRepository(new IInstallableUnit[] {p2Feature, p1, p2, p1b, p2b, pp1, pp2});


Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/SimpleSingleton.java (-3 / +5 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;	14	import org.eclipse.equinox.internal.provisional.p2.director.IPlanner;
13	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	15	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
Lines 33-41 Link Here
33		35
34	a2 = createIU("A", new Version("2.0.0"), true);	36	a2 = createIU("A", new Version("2.0.0"), true);
35		37
36	RequiredCapability c1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);	38	IRequiredCapability c1 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.0.0]"), null, false, false);
37	RequiredCapability c2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 2.0.0]"), null, false, false);	39	IRequiredCapability c2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[2.0.0, 2.0.0]"), null, false, false);
38	y = createIU("Y", new Version(2, 0, 0), new RequiredCapability[] {c1, c2});	40	y = createIU("Y", new Version(2, 0, 0), new IRequiredCapability[] {c1, c2});
39		41
40	createTestMetdataRepository(new IInstallableUnit[] {a1, a2, y});	42	createTestMetdataRepository(new IInstallableUnit[] {a1, a2, y});
41		43




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IEngine;


	protected void setUp() throws Exception {
		super.setUp();
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, true, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(1, 2, 0), true);
		IRequirementChange change = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.1.0, 1.3.0)"), "foo=bar", false, false, true));
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {change}, new IRequiredCapability[][] {{MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false)}}, null);

		createTestMetdataRepository(new IInstallableUnit[] {a1, b1, b2, p1});


Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/planner/SimpleOptionalTest4.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.planner;	9	package org.eclipse.equinox.p2.tests.planner;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.*;	14	import org.eclipse.equinox.internal.provisional.p2.director.*;
13	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	15	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
Lines 37-43 Link Here
37	b4 = createIU("B", new Version("4.0.0"), false);	39	b4 = createIU("B", new Version("4.0.0"), false);
38		40
39	//B's dependency is missing	41	//B's dependency is missing
40	RequiredCapability[] reqA = new RequiredCapability[4];	42	IRequiredCapability[] reqA = new IRequiredCapability[4];
41	reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0,1.0.0]"), null, true, false, true);	43	reqA[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0,1.0.0]"), null, true, false, true);
42	reqA[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[2.0.0,2.0.0]"), null, true, false, true);	44	reqA[1] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[2.0.0,2.0.0]"), null, true, false, true);
43	reqA[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[3.0.0,3.0.0]"), null, true, false, true);	45	reqA[2] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[3.0.0,3.0.0]"), null, true, false, true);




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.planner;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.*;


	protected void setUp() throws Exception {
		super.setUp();
		f1 = createIU("F", new Version(1, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, true), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", VersionRange.emptyRange, null, false, false, true)});
		a1 = createIU("A", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[1.0.0, 1.1.0)"), null, false, false, true)});
		b1 = createIU("B", new Version(1, 0, 0), true);
		c1 = createIU("C", new Version("1.0.0"), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 1.1.0)"), null, false, false, true)});
		d1 = createIU("D", new Version(1, 0, 0), true);
		b2 = createIU("B", new Version(2, 0, 0), new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[2.0.0, 3.1.0)"), null, false, false, true)});
		d2 = createIU("D", new Version(2, 0, 0), true);

		IRequirementChange changeA = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "B", new VersionRange("[2.0.0, 2.1.0)"), null, false, false, true));
		IRequirementChange changeC = new RequirementChange(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", VersionRange.emptyRange, null, false, false, false), MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[2.0.0, 2.1.0)"), null, false, false, true));

		IRequiredCapability lifeCycle = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "F", VersionRange.emptyRange, null, false, false, false);
		IRequiredCapability[][] scope = new IRequiredCapability[][] { {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", new VersionRange("[1.0.0, 1.1.0]"), null, false, false, false)}, {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 1.1.0]"), null, false, false, false)}};
		p1 = createIUPatch("P", new Version("1.0.0"), true, new IRequirementChange[] {changeA, changeC}, scope, lifeCycle);
		p2 = createIUPatch("P", new Version("2.0.0"), true, new IRequirementChange[] {changeA, changeC}, new IRequiredCapability[0][0], lifeCycle);
		createTestMetdataRepository(new IInstallableUnit[] {f1, a1, b1, b2, c1, d1, d2, p1});

		profile1 = createProfile("TestProfile." + getName());




 *******************************************************************************/
package org.eclipse.equinox.p2.tests.metadata;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;

	 * Tests for {@link org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit#satisfies(org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability)}.
	 */
	public void testSatisfies() {
		IProvidedCapability[] provides = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("testNamespace", "name", new Version(1, 0, 0))};
		IInstallableUnit iu = createIU("iu", provides);

		IRequiredCapability wrongNamespace = MetadataFactory.createRequiredCapability("wrongNamespace", "name", VersionRange.emptyRange, null, false, false);
		IRequiredCapability wrongName = MetadataFactory.createRequiredCapability("testNamespace", "wrongName", VersionRange.emptyRange, null, false, false);
		IRequiredCapability lowerVersionRange = MetadataFactory.createRequiredCapability("testNamespace", "name", new VersionRange("[0.1,1.0)"), null, false, false);
		IRequiredCapability higherVersionRange = MetadataFactory.createRequiredCapability("testNamespace", "name", new VersionRange("(1.0,99.99]"), null, false, false);
		IRequiredCapability match = MetadataFactory.createRequiredCapability("testNamespace", "name", new VersionRange("[1.0,2.0)"), null, false, false);

		assertFalse("1.0", iu.satisfies(wrongNamespace));
		assertFalse("1.1", iu.satisfies(wrongName));

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.metadata;	11	package org.eclipse.equinox.p2.tests.metadata;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
13	import java.util.*;	15	import java.util.*;
14	import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper;	16	import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper;
15	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	17	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
Lines 61-67 Link Here
61	}	63	}
62		64
63	private static IInstallableUnit createIUWithDependencyOn(String iuName, String dependencyOn) {	65	private static IInstallableUnit createIUWithDependencyOn(String iuName, String dependencyOn) {
64	RequiredCapability[] requires = new RequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, dependencyOn, VersionRange.emptyRange, null, false, true)};	66	IRequiredCapability[] requires = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, dependencyOn, VersionRange.emptyRange, null, false, true)};
65	return createEclipseIU(iuName, DEFAULT_VERSION, requires, NO_TP_DATA);	67	return createEclipseIU(iuName, DEFAULT_VERSION, requires, NO_TP_DATA);
66	}	68	}
67	}	69	}

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java (-10 / +14 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.metadata;	11	package org.eclipse.equinox.p2.tests.metadata;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		16
13	import java.util.*;	17	import java.util.*;
14	import junit.framework.AssertionFailedError;	18	import junit.framework.AssertionFailedError;
15	import junit.framework.TestCase;	19	import junit.framework.TestCase;
Lines 27-36 Link Here
27	private static final String TEST_REQUIRED = "testRequired";	31	private static final String TEST_REQUIRED = "testRequired";
28	IInstallableUnit iu1;	32	IInstallableUnit iu1;
29	IInstallableUnit iu3;	33	IInstallableUnit iu3;
30	RequiredCapability[] iu1Deps;	34	IRequiredCapability[] iu1Deps;
31	RequiredCapability[] iu3Deps;	35	IRequiredCapability[] iu3Deps;
32	ProvidedCapability[] iu1Caps;	36	IProvidedCapability[] iu1Caps;
33	ProvidedCapability[] iu3Caps;	37	IProvidedCapability[] iu3Caps;
34		38
35	protected void setUp() throws Exception {	39	protected void setUp() throws Exception {
36	super.setUp();	40	super.setUp();
Lines 64-73 Link Here
64	}	68	}
65		69
66	public void testCapabilities() {	70	public void testCapabilities() {
67	ProvidedCapability[] iuCapabilities = iu1Caps;	71	IProvidedCapability[] iuCapabilities = iu1Caps;
68	ProvidedCapability[] initialFragmentCapabilities = iu3Caps;	72	IProvidedCapability[] initialFragmentCapabilities = iu3Caps;
69		73
70	ProvidedCapability[] mergedCapabilities = iu1.getProvidedCapabilities();	74	IProvidedCapability[] mergedCapabilities = iu1.getProvidedCapabilities();
71	for (int i = 0; i < iuCapabilities.length; i++) {	75	for (int i = 0; i < iuCapabilities.length; i++) {
72	FragmentTest.assertContainsWithEquals(mergedCapabilities, iuCapabilities[i]);	76	FragmentTest.assertContainsWithEquals(mergedCapabilities, iuCapabilities[i]);
73	}	77	}
Lines 143-151 Link Here
143	iu.setVersion(new Version(1, 0, 0));	147	iu.setVersion(new Version(1, 0, 0));
144	iu.setTouchpointType(AbstractProvisioningTest.TOUCHPOINT_OSGI);	148	iu.setTouchpointType(AbstractProvisioningTest.TOUCHPOINT_OSGI);
145	iu.setProperty(PROP_FRAG, "value");	149	iu.setProperty(PROP_FRAG, "value");
146	RequiredCapability[] reqs = new RequiredCapability[] {MetadataFactory.createRequiredCapability("eclipse.touchpoint", "bundle", VersionRange.emptyRange, null, false, true), MetadataFactory.createRequiredCapability(TEST_REQUIRED, TEST_REQUIRED, VersionRange.emptyRange, null, true, false)};	150	IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability("eclipse.touchpoint", "bundle", VersionRange.emptyRange, null, false, true), MetadataFactory.createRequiredCapability(TEST_REQUIRED, TEST_REQUIRED, VersionRange.emptyRange, null, true, false)};
147	iu.setHost(reqs);	151	iu.setHost(reqs);
148	ProvidedCapability[] cap = new ProvidedCapability[] {MetadataFactory.createProvidedCapability("testCapabilityInFragment", "testCapabilityInFragment", new Version(1, 0, 0))};	152	IProvidedCapability[] cap = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("testCapabilityInFragment", "testCapabilityInFragment", new Version(1, 0, 0))};
149	iu.setCapabilities(cap);	153	iu.setCapabilities(cap);
150	return MetadataFactory.createInstallableUnitFragment(iu);	154	return MetadataFactory.createInstallableUnitFragment(iu);
151	}	155	}
Lines 156-162 Link Here
156	iu.setVersion(new Version(1, 0, 0));	160	iu.setVersion(new Version(1, 0, 0));
157	iu.setTouchpointType(AbstractProvisioningTest.TOUCHPOINT_OSGI);	161	iu.setTouchpointType(AbstractProvisioningTest.TOUCHPOINT_OSGI);
158	iu.setProperty(PROP_IU, "valueIU");	162	iu.setProperty(PROP_IU, "valueIU");
159	ProvidedCapability[] cap = new ProvidedCapability[] {MetadataFactory.createProvidedCapability("eclipse.touchpoint", "bundle", new Version(1, 0, 0)), MetadataFactory.createProvidedCapability("testCapability", "testCapability", new Version(1, 0, 0))};	163	IProvidedCapability[] cap = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("eclipse.touchpoint", "bundle", new Version(1, 0, 0)), MetadataFactory.createProvidedCapability("testCapability", "testCapability", new Version(1, 0, 0))};
160	iu.setCapabilities(cap);	164	iu.setCapabilities(cap);
161	return MetadataFactory.createInstallableUnit(iu);	165	return MetadataFactory.createInstallableUnit(iu);
162	}	166	}

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/metadata/LicenseTest.java (-2 / +4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.metadata;	11	package org.eclipse.equinox.p2.tests.metadata;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;
		14
13	import junit.framework.TestCase;	15	import junit.framework.TestCase;
14	import org.eclipse.equinox.internal.provisional.p2.metadata.License;	16	import org.eclipse.equinox.internal.provisional.p2.metadata.License;
15		17
Lines 18-25 Link Here
18	*/	20	*/
19	public class LicenseTest extends TestCase {	21	public class LicenseTest extends TestCase {
20	public void testNormalize() {	22	public void testNormalize() {
21	License licenseOne = new License(null, "a b");	23	ILicense licenseOne = new License(null, "a b");
22	License licenseTwo = new License(null, "a\t\n\r \t\n\r b");	24	ILicense licenseTwo = new License(null, "a\t\n\r \t\n\r b");
23	assertEquals("1.0", licenseOne.getDigest(), licenseTwo.getDigest());	25	assertEquals("1.0", licenseOne.getDigest(), licenseTwo.getDigest());
24		26
25	licenseOne = new License(null, " a b c ");	27	licenseOne = new License(null, " a b c ");




 ******************************************************************************/
package org.eclipse.equinox.p2.tests;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;

import java.io.*;
import java.net.URI;
import java.net.URL;

public abstract class AbstractProvisioningTest extends TestCase {

	protected static final VersionRange ANY_VERSION = new VersionRange(Version.emptyVersion, true, new Version(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE), true);
	private static final IProvidedCapability[] BUNDLE_CAPABILITY = new IProvidedCapability[] {MetadataFactory.createProvidedCapability("eclipse.touchpoint", "bundle", new Version(1, 0, 0))};

	private static final IRequiredCapability[] BUNDLE_REQUIREMENT = new IRequiredCapability[] {MetadataFactory.createRequiredCapability("eclipse.touchpoint", "bundle", VersionRange.emptyRange, null, false, true)};

	protected static final Version DEFAULT_VERSION = new Version(1, 0, 0);
	public static final TouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", new Version(1, 0, 0));

	protected static final Map NO_PROPERTIES = Collections.EMPTY_MAP;
	protected static final IProvidedCapability[] NO_PROVIDES = new IProvidedCapability[0];
	protected static final IRequiredCapability[] NO_REQUIRES = new IRequiredCapability[0];

	protected static final ITouchpointData NO_TP_DATA = MetadataFactory.createTouchpointData(new HashMap());

	//flag used to disable currently failing (invalid) tests. This should always be set to true
	protected boolean DISABLED = true;

	 *  that is hosted by any bundle. The default self and fragment provided capabilities
	 *  are added to the IU.
	 */
	public static IInstallableUnitFragment createBundleFragment(String name, Version version, ITouchpointData tpData) {
		return createIUFragment(null, name, version, BUNDLE_REQUIREMENT, TOUCHPOINT_OSGI, tpData);
	}


	 * 	Create an Eclipse InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createEclipseIU(String name, Version version, IRequiredCapability[] requires, ITouchpointData touchpointData) {
		return createIU(name, version, null, requires, BUNDLE_CAPABILITY, NO_PROPERTIES, TOUCHPOINT_OSGI, touchpointData, false);
	}


	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, IProvidedCapability[] additionalProvides) {
		return createIU(name, DEFAULT_VERSION, null, NO_REQUIRES, additionalProvides, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, IRequiredCapability[] requires) {
		return createIU(name, DEFAULT_VERSION, null, requires, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, IRequiredCapability[] requires, boolean singleton) {
		return createIU(name, DEFAULT_VERSION, null, requires, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, singleton);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, String filter, IProvidedCapability[] additionalProvides) {
		return createIU(name, DEFAULT_VERSION, filter, NO_REQUIRES, additionalProvides, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**

	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version) {
		return createIU(name, version, null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**

	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version, boolean singleton) {
		return createIU(name, version, null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, singleton);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version, IProvidedCapability[] additionalProvides) {
		return createIU(name, version, null, NO_REQUIRES, additionalProvides, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version, IRequiredCapability[] required) {
		return createIU(name, version, null, required, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version, IRequiredCapability[] required, Map properties, boolean singleton) {
		return createIU(name, version, null, required, NO_PROVIDES, properties, ITouchpointType.NONE, NO_TP_DATA, singleton);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version, String filter, IProvidedCapability[] additionalProvides) {
		return createIU(name, version, filter, NO_REQUIRES, additionalProvides, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, false);
	}

	/**
	 * 	Create a basic InstallableUnit with the given attributes. All other attributes
	 * assume default values, and the default self capability is also added to the IU.
	 */
	public static IInstallableUnit createIU(String name, Version version, String filter, IRequiredCapability[] required, IProvidedCapability[] additionalProvides, Map properties, TouchpointType tpType, ITouchpointData tpData, boolean singleton) {
		return createIU(name, version, filter, required, additionalProvides, properties, tpType, tpData, singleton, null);
	}

	public static IInstallableUnitPatch createIUPatch(String name, Version version, boolean singleton, IRequirementChange[] changes, IRequiredCapability[][] scope, IRequiredCapability lifeCycle) {
		return createIUPatch(name, version, null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, singleton, null, changes, scope, lifeCycle);
	}

	public static IInstallableUnitPatch createIUPatch(String name, Version version, String filter, IRequiredCapability[] required, IProvidedCapability[] additionalProvides, Map properties, TouchpointType tpType, ITouchpointData tpData, boolean singleton, IUpdateDescriptor update, IRequirementChange[] reqChanges, IRequiredCapability[][] scope, IRequiredCapability lifeCycle) {
		InstallableUnitPatchDescription iu = new MetadataFactory.InstallableUnitPatchDescription();
		iu.setId(name);
		iu.setVersion(version);
		iu.setFilter(filter);
		IProvidedCapability[] provides = new IProvidedCapability[additionalProvides.length + 1];
		provides[0] = getSelfCapability(name, version);
		for (int i = 0; i < additionalProvides.length; i++) {
			provides[i + 1] = additionalProvides[i];

		return MetadataFactory.createInstallableUnitPatch(iu);
	}

	public static IInstallableUnit createIU(String name, Version version, String filter, IRequiredCapability[] required, IProvidedCapability[] additionalProvides, Map properties, TouchpointType tpType, ITouchpointData tpData, boolean singleton, IUpdateDescriptor update) {
		InstallableUnitDescription iu = new MetadataFactory.InstallableUnitDescription();
		iu.setId(name);
		iu.setVersion(version);
		iu.setFilter(filter);
		IProvidedCapability[] provides = new IProvidedCapability[additionalProvides.length + 1];
		provides[0] = getSelfCapability(name, version);
		for (int i = 0; i < additionalProvides.length; i++) {
			provides[i + 1] = additionalProvides[i];

	 * The self and fragment provided capabilities are added to the IU.
	 */
	public static IInstallableUnitFragment createIUFragment(IInstallableUnit host, String name, Version version) {
		return createIUFragment(host, name, version, NO_REQUIRES, ITouchpointType.NONE, NO_TP_DATA);
	}

	/**
	 * 	Create a basic InstallableUnitFragment with the given attributes. 
	 * The self and fragment provided capabilities are added to the IU.
	 */
	public static IInstallableUnitFragment createIUFragment(IInstallableUnit host, String name, Version version, IRequiredCapability[] required, TouchpointType tpType, ITouchpointData tpData) {
		InstallableUnitFragmentDescription fragment = new InstallableUnitFragmentDescription();
		fragment.setId(name);
		fragment.setVersion(version);

			fragment.addTouchpointData(tpData);
		if (host != null) {
			VersionRange hostRange = new VersionRange(host.getVersion(), true, host.getVersion(), true);
			fragment.setHost(new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, host.getId(), hostRange, null, false, false)});
		}
		fragment.setCapabilities(new IProvidedCapability[] {getSelfCapability(name, version)});
		return MetadataFactory.createInstallableUnitFragment(fragment);
	}

	public static void changeVersion(InstallableUnitDescription desc, Version newVersion) {
		IProvidedCapability[] capabilities = desc.getProvidedCapabilities();
		for (int i = 0; i < capabilities.length; i++) {
			if (desc.getVersion().equals(capabilities[i].getVersion()))
				capabilities[i] = MetadataFactory.createProvidedCapability(capabilities[i].getNamespace(), capabilities[i].getName(), newVersion);

	public static MetadataFactory.InstallableUnitDescription createIUDescriptor(IInstallableUnit prototype) {
		InstallableUnitDescription desc = new MetadataFactory.InstallableUnitDescription();
		desc.setArtifacts(prototype.getArtifacts());
		IProvidedCapability originalCapabilities[] = prototype.getProvidedCapabilities();
		IProvidedCapability newCapabilities[] = new IProvidedCapability[originalCapabilities.length];
		for (int i = 0; i < originalCapabilities.length; i++) {
			newCapabilities[i] = MetadataFactory.createProvidedCapability(originalCapabilities[i].getNamespace(), originalCapabilities[i].getName(), originalCapabilities[i].getVersion());
		}

		desc.setFilter(prototype.getFilter());
		desc.setId(prototype.getId());
		desc.setLicense(prototype.getLicense());
		IRequiredCapability[] originalRequirements = prototype.getRequiredCapabilities();
		IRequiredCapability[] newRequirements = new IRequiredCapability[originalRequirements.length];
		for (int i = 0; i < newRequirements.length; i++) {
			newRequirements[i] = MetadataFactory.createRequiredCapability(originalRequirements[i].getNamespace(), originalRequirements[i].getName(), originalRequirements[i].getRange(), originalRequirements[i].getFilter(), originalRequirements[i].isOptional(), originalRequirements[i].isMultiple(), originalRequirements[i].isGreedy());
		}

	/**
	 * Creates and returns a required capability with the provided attributes.
	 */
	protected static IRequiredCapability[] createRequiredCapabilities(String namespace, String name, String filter) {
		return createRequiredCapabilities(namespace, name, ANY_VERSION, filter);
	}

	/**
	 * Creates and returns a required capability with the provided attributes.
	 */
	protected static IRequiredCapability[] createRequiredCapabilities(String namespace, String name, VersionRange range, String filter) {
		return new IRequiredCapability[] {MetadataFactory.createRequiredCapability(namespace, name, range, filter, false, false)};
	}

	public static boolean delete(File file) {

	/**
	 * 	Get the 'self' capability for the given installable unit.
	 */
	protected static IProvidedCapability getSelfCapability(IInstallableUnit iu) {
		return getSelfCapability(iu.getId(), iu.getVersion());
	}

	/**
	 * 	Get the 'self' capability for an installable unit with the give id and version.
	 */
	private static IProvidedCapability getSelfCapability(String installableUnitId, Version installableUnitVersion) {
		return MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, installableUnitId, installableUnitVersion);
	}


	/*
	 * Compare 2 copyright objects and fail if they are not considered equal.
	 */
	protected static void assertEquals(String message, ICopyright cpyrt1, ICopyright cpyrt2) {
		if (cpyrt1 == cpyrt2)
			return;
		if (cpyrt1 == null || cpyrt2 == null) {




package org.eclipse.equinox.p2.tests.engine;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.p2.engine.InstructionParser;

import java.util.Map;

import org.eclipse.equinox.internal.p2.engine.ActionManager;
import org.eclipse.equinox.internal.provisional.p2.engine.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

public class InstructionParserTest extends AbstractProvisioningTest {

	public static final ITouchpointType TOUCHPOINT_TYPE = MetadataFactory.createTouchpointType("InstructionParserTestTouchpoint", new Version("1.0")); //$NON-NLS-1$ //$NON-NLS-2$

	public static class InstructionParserTestTouchpoint extends Touchpoint {

		public ITouchpointType getTouchpointType() {
			return TOUCHPOINT_TYPE;
		}





import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.engine.ParameterizedProvisioningAction;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.engine.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.p2.tests.TestActivator;
import org.osgi.framework.ServiceReference;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

/**
 * Simple test of the engine API.

			if (parsedActions != null)
				return parsedActions;

			ITouchpointType type = unit.getTouchpointType();
			if (type == null || ITouchpointType.NONE.equals(type))
				return null;

			ProvisioningAction action = actionManager.getTouchpointQualifiedAction(phaseId, type);

		Map instructions = new HashMap();
		instructions.put("test1", MetadataFactory.createTouchpointInstruction("test1.test()", null));
		instructions.put("test2", MetadataFactory.createTouchpointInstruction("test2.test()", null));
		ITouchpointData touchpointData = MetadataFactory.createTouchpointData(instructions);
		IInstallableUnit unit = createIU("test", new Version("1.0.0"), null, NO_REQUIRES, new IProvidedCapability[0], NO_PROPERTIES, ITouchpointType.NONE, touchpointData, false);
		IStatus status = engine.perform(profile, phaseSet, new InstallableUnitOperand[] {new InstallableUnitOperand(null, unit)}, null, new NullProgressMonitor());
		if (!status.isOK()) {
			fail(status.toString());

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ActionTest.java (-6 / +10 lines)
11		11
12	import static org.easymock.EasyMock.*;	12	import static org.easymock.EasyMock.*;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		15
		16	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		17
14	import java.io.*;	18	import java.io.*;
15	import java.util.*;	19	import java.util.*;
16	import junit.framework.Assert;	20	import junit.framework.Assert;
Lines 55-68 Link Here
55	return (String[]) result.toArray(new String[result.size()]);	59	return (String[]) result.toArray(new String[result.size()]);
56	}	60	}
57		61
58	protected void verifyProvidedCapability(ProvidedCapability[] prov, String namespace, String name, Version version) {	62	protected void verifyProvidedCapability(IProvidedCapability[] prov, String namespace, String name, Version version) {
59	for (int i = 0; i < prov.length; i++)	63	for (int i = 0; i < prov.length; i++)
60	if (prov[i].getName().equalsIgnoreCase(name) && prov[i].getNamespace().equalsIgnoreCase(namespace) && prov[i].getVersion().equals(version))	64	if (prov[i].getName().equalsIgnoreCase(name) && prov[i].getNamespace().equalsIgnoreCase(namespace) && prov[i].getVersion().equals(version))
61	return; // pass	65	return; // pass
62	Assert.fail("Missing ProvidedCapability: " + name + version.toString()); //$NON-NLS-1$	66	Assert.fail("Missing ProvidedCapability: " + name + version.toString()); //$NON-NLS-1$
63	}	67	}
64		68
65	protected void verifyRequiredCapability(RequiredCapability[] required, String namespace, String name, VersionRange range) {	69	protected void verifyRequiredCapability(IRequiredCapability[] required, String namespace, String name, VersionRange range) {
66	for (int i = 0; i < required.length; i++)	70	for (int i = 0; i < required.length; i++)
67	if (required[i].getName().equalsIgnoreCase(name) && required[i].getNamespace().equalsIgnoreCase(namespace) && required[i].getRange().equals(range))	71	if (required[i].getName().equalsIgnoreCase(name) && required[i].getNamespace().equalsIgnoreCase(namespace) && required[i].getRange().equals(range))
68	return;	72	return;
Lines 104-121 Link Here
104	return map;	108	return map;
105	}	109	}
106		110
107	protected void contains(ProvidedCapability[] capabilities, String namespace, String name, Version version) {	111	protected void contains(IProvidedCapability[] capabilities, String namespace, String name, Version version) {
108	for (int i = 0; i < capabilities.length; i++) {	112	for (int i = 0; i < capabilities.length; i++) {
109	ProvidedCapability capability = capabilities[i];	113	IProvidedCapability capability = capabilities[i];
110	if (capability.getNamespace().equals(namespace) && capability.getName().equals(name) && capability.getVersion().equals(version))	114	if (capability.getNamespace().equals(namespace) && capability.getName().equals(name) && capability.getVersion().equals(version))
111	return;	115	return;
112	}	116	}
113	fail();	117	fail();
114	}	118	}
115		119
116	protected void contains(RequiredCapability[] capabilities, String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple) {	120	protected void contains(IRequiredCapability[] capabilities, String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple) {
117	for (int i = 0; i < capabilities.length; i++) {	121	for (int i = 0; i < capabilities.length; i++) {
118	RequiredCapability capability = capabilities[i];	122	IRequiredCapability capability = capabilities[i];
119	if (filter == null) {	123	if (filter == null) {
120	if (capability.getFilter() != null)	124	if (capability.getFilter() != null)
121	continue;	125	continue;





import static org.easymock.EasyMock.*;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import java.io.File;
import java.io.FileInputStream;
import java.util.*;

		assertEquals("1.1", bundle1IU.getVersion(), BUNDLE1_VERSION);

		// check required capabilities
		IRequiredCapability[] requiredCapability = bundle1IU.getRequiredCapabilities();
		verifyRequiredCapability(requiredCapability, TEST1_IUD_NAMESPACE, TEST1_IUD_NAME, TEST1_IUD_VERSION_RANGE);
		assertEquals("2.0", 1, requiredCapability.length);

		// check provided capabilities
		IProvidedCapability[] providedCapabilities = bundle1IU.getProvidedCapabilities();
		verifyProvidedCapability(providedCapabilities, PROVBUNDLE_NAMESPACE, TEST1_PROVBUNDLE_NAME, BUNDLE1_VERSION);
		verifyProvidedCapability(providedCapabilities, OSGI, TEST1_PROVBUNDLE_NAME, BUNDLE1_VERSION);
		verifyProvidedCapability(providedCapabilities, TEST1_PROVZ_NAMESPACE, TEST1_PROVZ_NAME, TEST2_PROVZ_VERSION);
		verifyProvidedCapability(providedCapabilities, PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "source", new Version("1.0.0"));//$NON-NLS-1$//$NON-NLS-2$
		assertEquals("2.1", 4, providedCapabilities.length);

		ITouchpointData[] data = bundle1IU.getTouchpointData();
		boolean found = false;
		for (int i = 0; i < data.length; i++) {
			ITouchpointInstruction configure = data[i].getInstruction("configure");
			if (configure == null)
				continue;
			String body = configure.getBody();

		assertEquals(bundle2IU.getVersion(), BUNDLE2_VERSION);

		// check required capabilities
		IRequiredCapability[] requiredCapabilities = bundle2IU.getRequiredCapabilities();
		verifyRequiredCapability(requiredCapabilities, TEST2_IUA_NAMESPACE, TEST2_REQA_NAME, TEST2_IUA_VERSION_RANGE);
		verifyRequiredCapability(requiredCapabilities, TEST2_IUB_NAMESPACE, TEST2_REQB_NAME, TEST2_IUB_VERSION_RANGE);
		verifyRequiredCapability(requiredCapabilities, TEST2_IUC_NAMESPACE, TEST2_REQC_NAME, TEST2_IUC_VERSION_RANGE);
		assertTrue(requiredCapabilities.length == 3 /*number of tested elements*/);

		// check provided capabilities
		IProvidedCapability[] providedCapabilities = bundle2IU.getProvidedCapabilities();
		verifyProvidedCapability(providedCapabilities, PROVBUNDLE_NAMESPACE, TEST2_PROVBUNDLE_NAME, PROVBUNDLE2_VERSION);
		verifyProvidedCapability(providedCapabilities, OSGI, TEST2_PROVBUNDLE_NAME, BUNDLE2_VERSION);
		verifyProvidedCapability(providedCapabilities, TEST2_PROVZ_NAMESPACE, TEST2_PROVZ_NAME, TEST2_PROVZ_VERSION);

		assertTrue(prop.get("org.eclipse.equinox.p2.name").toString().equalsIgnoreCase("%bundleName"));//$NON-NLS-1$//$NON-NLS-2$
		assertTrue(prop.get("org.eclipse.equinox.p2.provider").toString().equalsIgnoreCase("%providerName"));//$NON-NLS-1$//$NON-NLS-2$

		ITouchpointData[] data = bundle2IU.getTouchpointData();
		boolean found = false;
		for (int i = 0; i < data.length; i++) {
			ITouchpointInstruction configure = data[i].getInstruction("configure");
			if (configure == null)
				continue;
			String body = configure.getBody();





import static org.easymock.EasyMock.*;

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import java.util.ArrayList;
import java.util.Map;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.internal.p2.metadata.InstallableUnitFragment;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.ProvidedCapability;
import org.eclipse.equinox.p2.publisher.IPublisherResult;
import org.eclipse.equinox.p2.publisher.PublisherResult;
import org.eclipse.equinox.p2.publisher.actions.IVersionAdvice;

				verifyRequiredCapability(iu.getRequiredCapabilities(), PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "bundle", new VersionRange(new Version("1.0.0"), true, new Version("2.0.0"), false)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
				assertTrue(iu.getRequiredCapabilities().length == 2);

				IProvidedCapability[] cap = iu.getProvidedCapabilities();
				verifyProvidedCapability(cap, IInstallableUnit.NAMESPACE_IU_ID, flavorArg + "org.eclipse.equinox.launcher", Version.emptyVersion); //$NON-NLS-1$ 
				verifyProvidedCapability(cap, "org.eclipse.equinox.p2.flavor", flavorArg, new Version("1.0.0")); //$NON-NLS-1$//$NON-NLS-2$ 
				assertTrue(cap.length == 2);





import static org.easymock.EasyMock.*;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import java.io.File;
import java.io.IOException;
import java.util.*;

		assertTrue(foo.getTouchpointType().getVersion().equals(fooVersion));

		//zipped=true
		ITouchpointData[] tpData = foo.getTouchpointData();
		String fooValue = ((ITouchpointInstruction) tpData[0].getInstructions().get("zipped")).getBody(); //$NON-NLS-1$
		assertTrue(fooValue.equalsIgnoreCase("true")); //$NON-NLS-1$

		IRequiredCapability[] fooRequiredCapabilities = foo.getRequiredCapabilities();
		assertTrue(fooRequiredCapabilities.length == 0);

		IProvidedCapability[] fooProvidedCapabilities = foo.getProvidedCapabilities();
		contains(fooProvidedCapabilities, IInstallableUnit.NAMESPACE_IU_ID, "foo.feature.jar", fooVersion); //$NON-NLS-1$
		contains(fooProvidedCapabilities, PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "feature", fooVersion); //$NON-NLS-1$ 
		contains(fooProvidedCapabilities, "org.eclipse.update.feature", FOO, fooVersion); //$NON-NLS-1$

		IInstallableUnit fooGroup = (IInstallableUnit) fooIUs.get(0);
		tpData = fooGroup.getTouchpointData();
		assertEquals(1, tpData.length);
		ITouchpointInstruction instruction = tpData[0].getInstruction("install");
		assertNotNull(instruction);
		assertEquals("ln(targetDir:@artifact,linkTarget:foo/lib.1.so,linkName:lib.so);chmod(targetDir:@artifact,targetFile:lib/lib.so,permissions:755);", instruction.getBody());


		assertTrue(bar.isSingleton());

		//check zipped=true in touchpointData
		String barValue = ((ITouchpointInstruction) bar.getTouchpointData()[0].getInstructions().get("zipped")).getBody(); //$NON-NLS-1$
		assertTrue(barValue.equalsIgnoreCase("true")); //$NON-NLS-1$

		//check touchpointType
		assertTrue(bar.getTouchpointType().getId().equalsIgnoreCase("org.eclipse.equinox.p2.osgi")); //$NON-NLS-1$
		assertTrue(bar.getTouchpointType().getVersion().equals(fooVersion));
		//String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple, boolean greedy)
		IRequiredCapability[] barRequiredCapabilities = bar.getRequiredCapabilities();
		contains(barRequiredCapabilities, IInstallableUnit.NAMESPACE_IU_ID, "bar_root", new VersionRange(barVersion, true, barVersion, true), "(org.eclipse.update.install.features=true)", false /*multiple*/, false /*optional*/); //$NON-NLS-1$//$NON-NLS-2$ 
		assertTrue(barRequiredCapabilities.length == 1);

		IProvidedCapability[] barProvidedCapabilities = bar.getProvidedCapabilities();
		contains(barProvidedCapabilities, IInstallableUnit.NAMESPACE_IU_ID, "bar.feature.jar", barVersion); //$NON-NLS-1$ 
		contains(barProvidedCapabilities, PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "feature", fooVersion); //$NON-NLS-1$ 
		contains(barProvidedCapabilities, "org.eclipse.update.feature", BAR, barVersion); //$NON-NLS-1$

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UtilTest.java (-3 / +4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.touchpoint.eclipse;	11	package org.eclipse.equinox.p2.tests.touchpoint.eclipse;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		14
13	import java.io.File;	15	import java.io.File;
14	import java.net.MalformedURLException;	16	import java.net.MalformedURLException;
15	import java.net.URISyntaxException;	17	import java.net.URISyntaxException;
Lines 24-30 Link Here
24	import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;	26	import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
25	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;	27	import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;	28	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
27	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointData;
28	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	29	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
29		30
30	/**	31	/**
Lines 64-70 Link Here
64	}	65	}
65		66
66	public void testMissingManifest() {	67	public void testMissingManifest() {
67	TouchpointData emptyData = MetadataFactory.createTouchpointData(Collections.EMPTY_MAP);	68	ITouchpointData emptyData = MetadataFactory.createTouchpointData(Collections.EMPTY_MAP);
68	assertNull(Util.getManifest(new TouchpointData[] {emptyData}));	69	assertNull(Util.getManifest(new ITouchpointData[] {emptyData}));
69	}	70	}
70	}	71	}

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/updatechecker/UpdateCheckerTest.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.updatechecker;	11	package org.eclipse.equinox.p2.tests.updatechecker;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
		14
13	import org.eclipse.core.runtime.IStatus;	15	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;	16	import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
15	import org.eclipse.equinox.internal.p2.publisher.Activator;	17	import org.eclipse.equinox.internal.p2.publisher.Activator;
Lines 45-51 Link Here
45	String id = "toInstall." + getName();	47	String id = "toInstall." + getName();
46	toInstallIU = createIU(id, new Version(1, 0, 0));	48	toInstallIU = createIU(id, new Version(1, 0, 0));
47	IUpdateDescriptor updateDescriptor = createUpdateDescriptor(id, new Version(2, 0, 0));	49	IUpdateDescriptor updateDescriptor = createUpdateDescriptor(id, new Version(2, 0, 0));
48	update = createIU(id, new Version(2, 0, 0), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, TouchpointType.NONE, NO_TP_DATA, true, updateDescriptor);	50	update = createIU(id, new Version(2, 0, 0), null, NO_REQUIRES, NO_PROVIDES, NO_PROPERTIES, ITouchpointType.NONE, NO_TP_DATA, true, updateDescriptor);
49		51
50	IInstallableUnit[] allUnits = new IInstallableUnit[] {toInstallIU, update};	52	IInstallableUnit[] allUnits = new IInstallableUnit[] {toInstallIU, update};
51	IInstallableUnit[] toInstallArray = new IInstallableUnit[] {toInstallIU};	53	IInstallableUnit[] toInstallArray = new IInstallableUnit[] {toInstallIU};

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/director/OracleTest2.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.director;	9	package org.eclipse.equinox.p2.tests.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
12	import org.eclipse.equinox.internal.provisional.p2.director.IDirector;	14	import org.eclipse.equinox.internal.provisional.p2.director.IDirector;
13	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;	15	import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
Lines 29-35 Link Here
29	IProfile profile;	31	IProfile profile;
30		32
31	protected void setUp() throws Exception {	33	protected void setUp() throws Exception {
32	RequiredCapability[] requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 2.0.0)"), null);	34	IRequiredCapability[] requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 2.0.0)"), null);
33	a1 = createIU("A", requires, true);	35	a1 = createIU("A", requires, true);
34		36
35	c1 = createIU("C", DEFAULT_VERSION, true);	37	c1 = createIU("C", DEFAULT_VERSION, true);




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.director;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.equinox.internal.provisional.p2.director.IDirector;
import org.eclipse.equinox.internal.provisional.p2.director.ProfileChangeRequest;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

	IProfile profile;

	protected void setUp() throws Exception {
		IRequiredCapability[] requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "C", new VersionRange("[1.0.0, 2.0.0)"), null);
		a1 = createIU("A", requires, true);

		requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "D", new VersionRange("[1.0.0, 3.0.0)"), null);




 ******************************************************************************/
package org.eclipse.equinox.p2.tests.director;

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

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.internal.provisional.p2.director.*;
import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningContext;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

		f1_1 = createIU(f1Id, new Version(1, 1, 0), true);
		f1_4 = createIU(f1Id, new Version(1, 4, 0), true);

		IRequiredCapability[] requires = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, f1Id, new VersionRange("[1.0.0, 1.3.0)"), null);
		String faId = getName() + ".fa";
		fa = createIU(faId, requires, false);


Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/tests/director/RollbackTest.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.tests.director;	9	package org.eclipse.equinox.p2.tests.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import java.net.*;	13	import java.net.*;
12	import java.util.ArrayList;	14	import java.util.ArrayList;
13	import java.util.List;	15	import java.util.List;
Lines 46-52 Link Here
46	b1 = createIU("B", DEFAULT_VERSION, true);	48	b1 = createIU("B", DEFAULT_VERSION, true);
47	c1 = createIU("C", DEFAULT_VERSION, true);	49	c1 = createIU("C", DEFAULT_VERSION, true);
48		50
49	RequiredCapability[] req = new RequiredCapability[1];	51	IRequiredCapability[] req = new IRequiredCapability[1];
50	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, true);	52	req[0] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "A", VersionRange.emptyRange, null, false, false, true);
51	d1 = createIU("D", new Version("1.0.0"), req);	53	d1 = createIU("D", new Version("1.0.0"), req);
52		54




 *******************************************************************************/
package org.eclipse.equinox.p2.tests.director;

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

import org.eclipse.core.runtime.IStatus;

import java.lang.reflect.Method;

	//test
	//check that the picker is returning something in the range
	public void testRecommendation() {
		IRequiredCapability applyOn, newValue;
		applyOn = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		newValue = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.1, 2.0)"), null, false, false);
		Recommendation r1 = new Recommendation(applyOn, newValue);

		IRequiredCapability goodMatch = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		assertEquals(true, r1.matches(goodMatch));

		IRequiredCapability badNamespace = MetadataFactory.createRequiredCapability("badNamespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		assertEquals(false, r1.matches(badNamespace));

		IRequiredCapability badName = MetadataFactory.createRequiredCapability("namespace", "badName", new VersionRange("[1.0, 2.0)"), null, false, false);
		assertEquals(false, r1.matches(badName));
	}


		IInstallableUnit iu2 = createIU("iu2", new Version(4, 0, 0));

		//The recommendations to be used
		IRequiredCapability applyOn, newValue;
		applyOn = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[1.0, 2.0)"), null, false, false);
		newValue = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[1.1, 2.0)"), null, false, false);
		Recommendation r1 = new Recommendation(applyOn, newValue);

		IRequiredCapability applyOn2, newValue2;
		applyOn2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu2", new VersionRange("[4.2, 5.0)"), null, false, false);
		newValue2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu2", new VersionRange("[4.0, 5.0)"), null, false, false);
		Recommendation r2 = new Recommendation(applyOn2, newValue2);

		recommendations.add(r2);

		Picker p = new Picker(new IInstallableUnit[] {iu1, iu2}, null);
		IInstallableUnit[][] matches = p.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", null, null, false, false)}, false);
		assertEquals(matches[1][0], iu1);

		Picker p1 = new Picker(new IInstallableUnit[] {iu1, iu2}, new RecommendationDescriptor(recommendations));
		matches = p1.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[1.0, 2.0)"), null, false, false)}, false);
		assertEquals(matches[0].length, 0);
		assertEquals(matches[1].length, 0);

		matches = p1.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[4.2, 5.0)"), null, false, false)}, false);
		assertEquals(matches[0].length, 0);
		assertEquals(matches[1].length, 0);
	}

		IInstallableUnit iu1 = createIU("iu1", new Version(4, 0, 0));

		//Here we add recommendation that widen the range of the bundle we are looking for
		IRequiredCapability applyOn2, newValue2;
		applyOn2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[4.2, 5.0)"), null, false, false);
		newValue2 = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[4.0, 5.0)"), null, false, false);
		Recommendation r2 = new Recommendation(applyOn2, newValue2);


		//Check without the recommendations
		Picker p2 = new Picker(new IInstallableUnit[] {iu1}, null);
		IInstallableUnit[][] matches = p2.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[4.0, 5.0)"), null, false, false)}, false);
		assertEquals(matches[1].length, 1);

		//Check the widening works
		Picker p1 = new Picker(new IInstallableUnit[] {iu1}, new RecommendationDescriptor(recommendations));
		matches = p1.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, "iu1", new VersionRange("[4.2, 5.0)"), null, false, false)}, false);
		assertEquals(matches[1].length, 1);

	}

	public void testRecommendationDescriptorMerge() {
		IRequiredCapability applyOn1, newValue1;
		applyOn1 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		newValue1 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.1, 2.0)"), null, false, false);
		Recommendation r1 = new Recommendation(applyOn1, newValue1);

		list1.add(r1);
		RecommendationDescriptor desc1 = new RecommendationDescriptor(list1);

		IRequiredCapability applyOn2, newValue2;
		applyOn2 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		newValue2 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.3, 2.0)"), null, false, false);
		Recommendation r2 = new Recommendation(applyOn2, newValue2);

	}

	public void testRecommendationDescriptorMergeConflict() {
		IRequiredCapability applyOn1, newValue1;
		applyOn1 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		newValue1 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.1, 2.0)"), null, false, false);
		Recommendation r1 = new Recommendation(applyOn1, newValue1);

		list1.add(r1);
		RecommendationDescriptor desc1 = new RecommendationDescriptor(list1);

		IRequiredCapability applyOn2, newValue2;
		applyOn2 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[1.0, 2.0)"), null, false, false);
		newValue2 = MetadataFactory.createRequiredCapability("namespace", "name", new VersionRange("[2.1, 3.0)"), null, false, false);
		Recommendation r2 = new Recommendation(applyOn2, newValue2);

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.directorywatcher;	11	package org.eclipse.equinox.p2.tests.directorywatcher;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		14
13	import java.io.File;	15	import java.io.File;
14	import junit.framework.Test;	16	import junit.framework.Test;
15	import junit.framework.TestSuite;	17	import junit.framework.TestSuite;
Lines 33-39 Link Here
33	return new TestSuite(RepositoryListenerTest.class);	35	return new TestSuite(RepositoryListenerTest.class);
34	}	36	}
35		37
36	public static boolean isZipped(TouchpointData[] data) {	38	public static boolean isZipped(ITouchpointData[] data) {
37	if (data == null \|\| data.length == 0)	39	if (data == null \|\| data.length == 0)
38	return false;	40	return false;
39	for (int i = 0; i < data.length; i++) {	41	for (int i = 0; i < data.length; i++) {

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/ApplicablePatchQuery.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.director;	9	package org.eclipse.equinox.internal.p2.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	13	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
12	import org.eclipse.equinox.internal.provisional.p2.query.Query;	14	import org.eclipse.equinox.internal.provisional.p2.query.Query;
13		15
Lines 40-46 Link Here
40	if (!(candidate instanceof IInstallableUnitPatch))	42	if (!(candidate instanceof IInstallableUnitPatch))
41	return false;	43	return false;
42	IInstallableUnitPatch patchIU = (IInstallableUnitPatch) candidate;	44	IInstallableUnitPatch patchIU = (IInstallableUnitPatch) candidate;
43	RequiredCapability[][] scopeDescription = patchIU.getApplicabilityScope();	45	IRequiredCapability[][] scopeDescription = patchIU.getApplicabilityScope();
44	if (scopeDescription.length == 0)	46	if (scopeDescription.length == 0)
45	return true;	47	return true;
46		48

Lines 8-20 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java (-3 / +4 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.director;	9	package org.eclipse.equinox.internal.p2.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	13	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
12	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
13		14
14	public class RequirementBasedFilter extends IUFilter {	15	public class RequirementBasedFilter extends IUFilter {
15	private RequiredCapability[] reqs;	16	private IRequiredCapability[] reqs;
16		17
17	public RequirementBasedFilter(RequiredCapability[] toFilterOn) {	18	public RequirementBasedFilter(IRequiredCapability[] toFilterOn) {
18	reqs = toFilterOn;	19	reqs = toFilterOn;
19	}	20	}
20		21

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/Projector.java (-20 / +24 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.internal.p2.director;	11	package org.eclipse.equinox.internal.p2.director;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;
		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		16
13	import java.io.*;	17	import java.io.*;
14	import java.util.*;	18	import java.util.*;
15	import java.util.Map.Entry;	19	import java.util.Map.Entry;
Lines 175-181 Link Here
175	if (patches == null)	179	if (patches == null)
176	return patchesWeight;	180	return patchesWeight;
177	for (int i = 0; i < ius.length; i++) {	181	for (int i = 0; i < ius.length; i++) {
178	RequiredCapability[] reqs = ius[i].getRequiredCapabilities();	182	IRequiredCapability[] reqs = ius[i].getRequiredCapabilities();
179	for (int j = 0; j < reqs.length; j++) {	183	for (int j = 0; j < reqs.length; j++) {
180	Collector matches = patches.query(new CapabilityQuery(reqs[j]), new Collector(), null);	184	Collector matches = patches.query(new CapabilityQuery(reqs[j]), new Collector(), null);
181	for (Iterator iterator = matches.iterator(); iterator.hasNext();) {	185	for (Iterator iterator = matches.iterator(); iterator.hasNext();) {
Lines 200-206 Link Here
200	}	204	}
201		205
202	// Check whether the requirement is applicable	206	// Check whether the requirement is applicable
203	private boolean isApplicable(RequiredCapability req) {	207	private boolean isApplicable(IRequiredCapability req) {
204	String filter = req.getFilter();	208	String filter = req.getFilter();
205	if (filter == null)	209	if (filter == null)
206	return true;	210	return true;
Lines 327-333 Link Here
327	expandLifeCycle(iu);	331	expandLifeCycle(iu);
328	//No patches apply, normal code path	332	//No patches apply, normal code path
329	if (patches.size() == 0) {	333	if (patches.size() == 0) {
330	RequiredCapability[] reqs = iu.getRequiredCapabilities();	334	IRequiredCapability[] reqs = iu.getRequiredCapabilities();
331	if (reqs.length == 0) {	335	if (reqs.length == 0) {
332	return;	336	return;
333	}	337	}
Lines 345-351 Link Here
345	Map unchangedRequirements = new HashMap(iu.getRequiredCapabilities().length);	349	Map unchangedRequirements = new HashMap(iu.getRequiredCapabilities().length);
346	for (Iterator iterator = patches.iterator(); iterator.hasNext();) {	350	for (Iterator iterator = patches.iterator(); iterator.hasNext();) {
347	IInstallableUnitPatch patch = (IInstallableUnitPatch) iterator.next();	351	IInstallableUnitPatch patch = (IInstallableUnitPatch) iterator.next();
348	RequiredCapability[][] reqs = mergeRequirements(iu, patch);	352	IRequiredCapability[][] reqs = mergeRequirements(iu, patch);
349	if (reqs.length == 0)	353	if (reqs.length == 0)
350	return;	354	return;
351		355
Lines 387-395 Link Here
387	expression.append(" 1 " + getVariable(patch)); //$NON-NLS-1$	391	expression.append(" 1 " + getVariable(patch)); //$NON-NLS-1$
388	}	392	}
389	if (allPatches.size() != 0)	393	if (allPatches.size() != 0)
390	genericExpandRequirement(expression.toString(), iu, (RequiredCapability) entry.getKey(), " >= 0", " 1 " + getVariable(iu) + "=0;"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	394	genericExpandRequirement(expression.toString(), iu, (IRequiredCapability) entry.getKey(), " >= 0", " 1 " + getVariable(iu) + "=0;"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
391	else	395	else
392	expandRequirement(null, iu, (RequiredCapability) entry.getKey());	396	expandRequirement(null, iu, (IRequiredCapability) entry.getKey());
393	}	397	}
394	}	398	}
395	}	399	}
Lines 403-409 Link Here
403	expandNormalRequirement(null, iu, patch.getLifeCycle());	407	expandNormalRequirement(null, iu, patch.getLifeCycle());
404	}	408	}
405		409
406	private void genericExpandRequirement(String var, IInstallableUnit iu, RequiredCapability req, String value, String negationExpression) {	410	private void genericExpandRequirement(String var, IInstallableUnit iu, IRequiredCapability req, String value, String negationExpression) {
407	if (req.isOptional())	411	if (req.isOptional())
408	genericOptionalRequirementExpansion(var, iu, req, value);	412	genericOptionalRequirementExpansion(var, iu, req, value);
409	else	413	else
Lines 411-421 Link Here
411	}	415	}
412		416
413	//Return a new array of requirements representing the application of the patch	417	//Return a new array of requirements representing the application of the patch
414	private RequiredCapability[][] mergeRequirements(IInstallableUnit iu, IInstallableUnitPatch patch) {	418	private IRequiredCapability[][] mergeRequirements(IInstallableUnit iu, IInstallableUnitPatch patch) {
415	if (patch == null)	419	if (patch == null)
416	return null;	420	return null;
417	RequirementChange[] changes = patch.getRequirementsChange();	421	IRequirementChange[] changes = patch.getRequirementsChange();
418	RequiredCapability[] originalRequirements = new RequiredCapability[iu.getRequiredCapabilities().length];	422	IRequiredCapability[] originalRequirements = new IRequiredCapability[iu.getRequiredCapabilities().length];
419	System.arraycopy(iu.getRequiredCapabilities(), 0, originalRequirements, 0, originalRequirements.length);	423	System.arraycopy(iu.getRequiredCapabilities(), 0, originalRequirements, 0, originalRequirements.length);
420	List rrr = new ArrayList();	424	List rrr = new ArrayList();
421	boolean found = false;	425	boolean found = false;
Lines 424-446 Link Here
424	if (originalRequirements[j] != null && changes[i].matches(originalRequirements[j])) {	428	if (originalRequirements[j] != null && changes[i].matches(originalRequirements[j])) {
425	found = true;	429	found = true;
426	if (changes[i].newValue() != null)	430	if (changes[i].newValue() != null)
427	rrr.add(new RequiredCapability[] {originalRequirements[j], changes[i].newValue()});	431	rrr.add(new IRequiredCapability[] {originalRequirements[j], changes[i].newValue()});
428	else	432	else
429	// case where a requirement is removed	433	// case where a requirement is removed
430	rrr.add(new RequiredCapability[] {originalRequirements[j], null});	434	rrr.add(new IRequiredCapability[] {originalRequirements[j], null});
431	originalRequirements[j] = null;	435	originalRequirements[j] = null;
432	}	436	}
433	// break;	437	// break;
434	}	438	}
435	if (!found && changes[i].applyOn() == null && changes[i].newValue() != null) //Case where a new requirement is added	439	if (!found && changes[i].applyOn() == null && changes[i].newValue() != null) //Case where a new requirement is added
436	rrr.add(new RequiredCapability[] {null, changes[i].newValue()});	440	rrr.add(new IRequiredCapability[] {null, changes[i].newValue()});
437	}	441	}
438	//Add all the unmodified requirements to the result	442	//Add all the unmodified requirements to the result
439	for (int i = 0; i < originalRequirements.length; i++) {	443	for (int i = 0; i < originalRequirements.length; i++) {
440	if (originalRequirements[i] != null)	444	if (originalRequirements[i] != null)
441	rrr.add(new RequiredCapability[] {originalRequirements[i], originalRequirements[i]});	445	rrr.add(new IRequiredCapability[] {originalRequirements[i], originalRequirements[i]});
442	}	446	}
443	return (RequiredCapability[][]) rrr.toArray(new RequiredCapability[rrr.size()][]);	447	return (IRequiredCapability[][]) rrr.toArray(new IRequiredCapability[rrr.size()][]);
444	}	448	}
445		449
446	private void addOptionalityExpression() {	450	private void addOptionalityExpression() {
Lines 454-460 Link Here
454	private int countOptionalIUs = 0;	458	private int countOptionalIUs = 0;
455	private QueryableArray patches;	459	private QueryableArray patches;
456		460
457	private void expandOptionalRequirement(String iuVar, IInstallableUnit iu, RequiredCapability req) {	461	private void expandOptionalRequirement(String iuVar, IInstallableUnit iu, IRequiredCapability req) {
458	if (iuVar == null)	462	if (iuVar == null)
459	iuVar = getVariable(iu);	463	iuVar = getVariable(iu);
460	String abstractVar = getAbstractVariable();	464	String abstractVar = getAbstractVariable();
Lines 495-501 Link Here
495	}	499	}
496	}	500	}
497		501
498	private void genericOptionalRequirementExpansion(String iuVar, IInstallableUnit iu, RequiredCapability req, String value) {	502	private void genericOptionalRequirementExpansion(String iuVar, IInstallableUnit iu, IRequiredCapability req, String value) {
499	String abstractVar = getAbstractVariable();	503	String abstractVar = getAbstractVariable();
500	String expression = iuVar;	504	String expression = iuVar;
501	Collector matches = picker.query(new CapabilityQuery(req), new Collector(), null);	505	Collector matches = picker.query(new CapabilityQuery(req), new Collector(), null);
Lines 534-540 Link Here
534	}	538	}
535	}	539	}
536		540
537	private void genericRequirementExpansion(String varIu, IInstallableUnit iu, RequiredCapability req, String value, String negationExpression) {	541	private void genericRequirementExpansion(String varIu, IInstallableUnit iu, IRequiredCapability req, String value, String negationExpression) {
538	String expression = varIu;	542	String expression = varIu;
539	Collector matches = picker.query(new CapabilityQuery(req), new Collector(), null);	543	Collector matches = picker.query(new CapabilityQuery(req), new Collector(), null);
540	StringBuffer comment = new StringBuffer();	544	StringBuffer comment = new StringBuffer();
Lines 568-574 Link Here
568	}	572	}
569	}	573	}
570		574
571	private void expandNormalRequirement(String varIu, IInstallableUnit iu, RequiredCapability req) {	575	private void expandNormalRequirement(String varIu, IInstallableUnit iu, IRequiredCapability req) {
572	//Generate the regular requirement	576	//Generate the regular requirement
573	if (varIu == null)	577	if (varIu == null)
574	varIu = getVariable(iu);	578	varIu = getVariable(iu);
Lines 616-622 Link Here
616	return patches.query(new ApplicablePatchQuery(iu), new Collector(), null);	620	return patches.query(new ApplicablePatchQuery(iu), new Collector(), null);
617	}	621	}
618		622
619	private void expandRequirement(String var, IInstallableUnit iu, RequiredCapability req) {	623	private void expandRequirement(String var, IInstallableUnit iu, IRequiredCapability req) {
620	if (req.isOptional())	624	if (req.isOptional())
621	expandOptionalRequirement(var, iu, req);	625	expandOptionalRequirement(var, iu, req);
622	else	626	else




 ******************************************************************************/
package org.eclipse.equinox.internal.p2.director;

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

import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;

public class Recommendation {
	private IRequiredCapability applyOn;
	private IRequiredCapability newValue;

	public Recommendation(IRequiredCapability applyOn2, IRequiredCapability newValue2) {
		this.applyOn = applyOn2;
		this.newValue = newValue2;
	}

	public IRequiredCapability applyOn() {
		return applyOn;
	}

	public IRequiredCapability newValue() {
		return newValue;
	}

	public boolean matches(IRequiredCapability toMatch) {
		if (!toMatch.getNamespace().equals(applyOn.getNamespace()))
			return false;
		if (!toMatch.getName().equals(applyOn.getName()))

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/Slicer.java (-7 / +11 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.director;	9	package org.eclipse.equinox.internal.p2.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;
		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
11	import java.util.*;	15	import java.util.*;
12	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
13	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;	17	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
Lines 86-92 Link Here
86	}	90	}
87		91
88	// Check whether the requirement is applicable	92	// Check whether the requirement is applicable
89	private boolean isApplicable(RequiredCapability req) {	93	private boolean isApplicable(IRequiredCapability req) {
90	String filter = req.getFilter();	94	String filter = req.getFilter();
91	if (filter == null)	95	if (filter == null)
92	return true;	96	return true;
Lines 116-122 Link Here
116	return;	120	return;
117	}	121	}
118		122
119	RequiredCapability[] reqs = getRequiredCapabilities(iu);	123	IRequiredCapability[] reqs = getRequiredCapabilities(iu);
120	if (reqs.length == 0) {	124	if (reqs.length == 0) {
121	return;	125	return;
122	}	126	}
Lines 132-146 Link Here
132	}	136	}
133	}	137	}
134		138
135	private RequiredCapability[] getRequiredCapabilities(IInstallableUnit iu) {	139	private IRequiredCapability[] getRequiredCapabilities(IInstallableUnit iu) {
136	if (!(iu instanceof IInstallableUnitPatch)) {	140	if (!(iu instanceof IInstallableUnitPatch)) {
137	return iu.getRequiredCapabilities();	141	return iu.getRequiredCapabilities();
138	}	142	}
139	RequiredCapability[] aggregatedCapabilities;	143	IRequiredCapability[] aggregatedCapabilities;
140	IInstallableUnitPatch patchIU = (IInstallableUnitPatch) iu;	144	IInstallableUnitPatch patchIU = (IInstallableUnitPatch) iu;
141	RequirementChange[] changes = patchIU.getRequirementsChange();	145	IRequirementChange[] changes = patchIU.getRequirementsChange();
142	int initialRequirementCount = iu.getRequiredCapabilities().length;	146	int initialRequirementCount = iu.getRequiredCapabilities().length;
143	aggregatedCapabilities = new RequiredCapability[initialRequirementCount + changes.length];	147	aggregatedCapabilities = new IRequiredCapability[initialRequirementCount + changes.length];
144	System.arraycopy(iu.getRequiredCapabilities(), 0, aggregatedCapabilities, 0, initialRequirementCount);	148	System.arraycopy(iu.getRequiredCapabilities(), 0, aggregatedCapabilities, 0, initialRequirementCount);
145	for (int i = 0; i < changes.length; i++) {	149	for (int i = 0; i < changes.length; i++) {
146	aggregatedCapabilities[initialRequirementCount++] = changes[i].newValue();	150	aggregatedCapabilities[initialRequirementCount++] = changes[i].newValue();
Lines 148-154 Link Here
148	return aggregatedCapabilities;	152	return aggregatedCapabilities;
149	}	153	}
150		154
151	private void expandRequirement(IInstallableUnit iu, RequiredCapability req) {	155	private void expandRequirement(IInstallableUnit iu, IRequiredCapability req) {
152	Collector matches = possibilites.query(new CapabilityQuery(req), new Collector(), null);	156	Collector matches = possibilites.query(new CapabilityQuery(req), new Collector(), null);
153	int validMatches = 0;	157	int validMatches = 0;
154	for (Iterator iterator = matches.iterator(); iterator.hasNext();) {	158	for (Iterator iterator = matches.iterator(); iterator.hasNext();) {




 ******************************************************************************/
package org.eclipse.equinox.internal.p2.director;

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

import java.util.ArrayList;
import java.util.Iterator;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;

public class IUTransformationHelper {
	static public IRequiredCapability[] toRequirements(Iterator ius, boolean optional) {
		ArrayList result = new ArrayList();
		while (ius.hasNext()) {
			IInstallableUnit current = (IInstallableUnit) ius.next();
			result.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, current.getId(), new VersionRange(current.getVersion(), true, current.getVersion(), true), null, optional, false));
		}
		return (IRequiredCapability[]) result.toArray(new IRequiredCapability[result.size()]);
	}

	static public IRequiredCapability[] toRequirements(IInstallableUnit[] ius, boolean optional) {
		IRequiredCapability[] result = new IRequiredCapability[ius.length];
		for (int i = 0; i < result.length; i++) {
			IInstallableUnit current = ius[i];
			result[i] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, current.getId(), new VersionRange(current.getVersion(), true, current.getVersion(), true), null, optional, false);

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/QueryableArray.java (-5 / +9 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.director;	11	package org.eclipse.equinox.internal.p2.director;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		16
13	import java.util.*;	17	import java.util.*;
14	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.equinox.internal.provisional.p2.metadata.*;	19	import org.eclipse.equinox.internal.provisional.p2.metadata.*;
Lines 19-27 Link Here
19	public class QueryableArray implements IQueryable {	23	public class QueryableArray implements IQueryable {
20	static class IUCapability {	24	static class IUCapability {
21	final IInstallableUnit iu;	25	final IInstallableUnit iu;
22	final ProvidedCapability capability;	26	final IProvidedCapability capability;
23		27
24	public IUCapability(IInstallableUnit iu, ProvidedCapability capability) {	28	public IUCapability(IInstallableUnit iu, IProvidedCapability capability) {
25	this.iu = iu;	29	this.iu = iu;
26	this.capability = capability;	30	this.capability = capability;
27	}	31	}
Lines 43-49 Link Here
43	private Collector queryCapability(CapabilityQuery query, Collector collector, IProgressMonitor monitor) {	47	private Collector queryCapability(CapabilityQuery query, Collector collector, IProgressMonitor monitor) {
44	generateNamedCapabilityIndex();	48	generateNamedCapabilityIndex();
45		49
46	RequiredCapability[] requiredCapabilities = query.getRequiredCapabilities();	50	IRequiredCapability[] requiredCapabilities = query.getRequiredCapabilities();
47	Collection resultIUs = null;	51	Collection resultIUs = null;
48	for (int i = 0; i < requiredCapabilities.length; i++) {	52	for (int i = 0; i < requiredCapabilities.length; i++) {
49	Collection matchingIUs = findMatchingIUs(requiredCapabilities[i]);	53	Collection matchingIUs = findMatchingIUs(requiredCapabilities[i]);
Lines 61-67 Link Here
61	return collector;	65	return collector;
62	}	66	}
63		67
64	private Collection findMatchingIUs(RequiredCapability requiredCapability) {	68	private Collection findMatchingIUs(IRequiredCapability requiredCapability) {
65	List iuCapabilities = (List) namedCapabilityIndex.get(requiredCapability.getName());	69	List iuCapabilities = (List) namedCapabilityIndex.get(requiredCapability.getName());
66	if (iuCapabilities == null)	70	if (iuCapabilities == null)
67	return null;	71	return null;
Lines 83-89 Link Here
83	for (Iterator iterator = dataSet.iterator(); iterator.hasNext();) {	87	for (Iterator iterator = dataSet.iterator(); iterator.hasNext();) {
84	IInstallableUnit iu = (IInstallableUnit) iterator.next();	88	IInstallableUnit iu = (IInstallableUnit) iterator.next();
85		89
86	ProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();	90	IProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
87	for (int i = 0; i < providedCapabilities.length; i++) {	91	for (int i = 0; i < providedCapabilities.length; i++) {
88	String name = providedCapabilities[i].getName();	92	String name = providedCapabilities[i].getName();
89	List iuCapabilities = (List) namedCapabilityIndex.get(name);	93	List iuCapabilities = (List) namedCapabilityIndex.get(name);




 ******************************************************************************/
package org.eclipse.equinox.internal.p2.director;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;

import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;

import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.resolution.ResolutionHelper;

		 * The environment against which capability filters are evaluated for this match.
		 */
		Dictionary env;
		IRequiredCapability req;

		public Match(IRequiredCapability range, Dictionary environment) {
			this.req = range;
			this.env = environment;
			candidates = new HashSet(2);

		String name;
		String namespace;

		MatchKey(IRequiredCapability capability) {
			this.namespace = capability.getNamespace();
			this.name = capability.getName();
		}

			return true;
		}

		public IRequiredCapability[] getRequiredCapabilities() {
			ArrayList result = new ArrayList();
			IProvidedCapability[] caps = wrapped.getProvidedCapabilities();
			for (int i = 0; i < caps.length; i++) {
				result.add(MetadataFactory.createRequiredCapability(caps[i].getNamespace(), caps[i].getName(), new VersionRange(caps[i].getVersion(), true, caps[i].getVersion(), true), wrapped.getFilter(), optionalReqs, false));
			}
			result.addAll(Arrays.asList(wrapped.getRequiredCapabilities()));
			return (IRequiredCapability[]) result.toArray(new IRequiredCapability[result.size()]);
		}

		public int hashCode() {

			return wrapped.getProperties();
		}

		public IProvidedCapability[] getProvidedCapabilities() {
			return wrapped.getProvidedCapabilities();
		}

		public ITouchpointData[] getTouchpointData() {
			return wrapped.getTouchpointData();
		}

		public ITouchpointType getTouchpointType() {
			return wrapped.getTouchpointType();
		}


			return wrapped.getUpdateDescriptor();
		}

		public ILicense getLicense() {
			return wrapped.getLicense();
		}

		public ICopyright getCopyright() {
			return wrapped.getCopyright();
		}

		public boolean satisfies(IRequiredCapability candidate) {
			return wrapped.satisfies(candidate);
		}
	}

	/**
	 * Creates a problem status for the given unsatisfied dependency.
	 */
	private void addUnsatisfied(IRequiredCapability req, Collection toAdd, MultiStatus problems) {
		for (Iterator it = toAdd.iterator(); it.hasNext();) {
			IInstallableUnit unit = (IInstallableUnit) it.next();
			IRequiredCapability[] required = unit.getRequiredCapabilities();
			for (int i = 0; i < required.length; i++) {
				if (required[i].equals(req)) {
					UnsatisfiedCapability unsatisfied = new UnsatisfiedCapability(req, unit);

		String flavor = (String) selectionContext.get(IProfile.PROP_ENVIRONMENTS);
		if (flavor == null)
			return new HashSet();
		IInstallableUnit[][] picked = picker.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_FLAVOR, flavor, VersionRange.emptyRange, null, false, false)}, true /* fragmentsOnly */);
		IInstallableUnit[] ius;
		if (picked[0].length > 0)
			ius = picked[0];

		Set picked = new HashSet();
		for (Iterator iterator = ius.iterator(); iterator.hasNext();) {
			IInstallableUnit current = (IInstallableUnit) iterator.next();
			IInstallableUnit[][] candidates = picker.findInstallableUnit(null, null, new IRequiredCapability[] {MetadataFactory.createRequiredCapability("fragment", current.getId(), VersionRange.emptyRange, null, true, false)}, false /* not fragmentsOnly */); //$NON-NLS-1$
			IInstallableUnit[] matches = candidates[0].length > 0 ? candidates[0] : candidates[1];
			if (matches.length > 0) { //TODO Here we need to check the filter of the found iu
				if (matches.length == 1) {

					continue;
				}
				//verify that each IU requires the current iu
				IProvidedCapability capForCurrent = MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, current.getId(), current.getVersion());
				Map toAdd = new HashMap();
				for (int i = 0; i < matches.length; i++) {
					IRequiredCapability[] reqs = matches[i].getRequiredCapabilities();
					boolean isReallyAFragment = false;
					for (int j = 0; j < reqs.length; j++) {
						isReallyAFragment = capForCurrent.satisfies(reqs[j]);

		//map of MatchKey->Match
		for (Iterator iterator = ius.iterator(); iterator.hasNext();) {
			IInstallableUnit currentUnit = (IInstallableUnit) iterator.next();
			IRequiredCapability[] toAdd = currentUnit.getRequiredCapabilities();
			outer: for (int i = 0; i < toAdd.length; i++) {
				IRequiredCapability current = toAdd[i];
				if (isApplicable(current) && !isMeta(current) && !current.isOptional()) {
					MatchKey key = new MatchKey(current);
					List match = (List) must.get(key);

	}

	// Check whether the requirement is applicable
	private boolean isApplicable(IRequiredCapability req) {
		String filter = req.getFilter();
		if (filter == null)
			return true;

	 * about inter-component dependencies, we end up having dependencies that cause
	 * the whole world to be selected. We are here filtering them out.
	 */
	private boolean isMeta(IRequiredCapability requiredCapability) {
		String namespace = requiredCapability.getNamespace();
		//TODO Should not reference OSGi touchpoint concepts here
		return namespace.equals("org.eclipse.equinox.p2.eclipse.type") || namespace.equals(IInstallableUnit.NAMESPACE_FLAVOR); //$NON-NLS-1$

		return null;
	}

	private Dictionary mergeEnvironments(Dictionary context, IRequiredCapability newCapability) {
		String[] newSelectors = newCapability.getSelectors();
		if (newSelectors == null || newSelectors.length == 0)
			return context;

		return false;
	}

	private boolean requirementEnabled(IRequiredCapability req) {
		if (req.isOptional())
			return false;
		return isApplicable(req);

Lines 8-18 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java (-2 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.director;	9	package org.eclipse.equinox.internal.p2.director;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import java.util.*;	13	import java.util.*;
12	import org.eclipse.core.runtime.*;	14	import org.eclipse.core.runtime.*;
13	import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;	15	import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
14	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;	16	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
15	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
16		17
17	public class RecommendationDescriptor {	18	public class RecommendationDescriptor {
18	public static final String TOUCHPOINT_DATA_KEY = "recommendations";	19	public static final String TOUCHPOINT_DATA_KEY = "recommendations";
Lines 28-34 Link Here
28	return recommendations;	29	return recommendations;
29	}	30	}
30		31
31	public Recommendation findRecommendation(RequiredCapability toMatch) {	32	public Recommendation findRecommendation(IRequiredCapability toMatch) {
32	for (Iterator iterator = recommendations.iterator(); iterator.hasNext();) {	33	for (Iterator iterator = recommendations.iterator(); iterator.hasNext();) {
33	Recommendation name = (Recommendation) iterator.next();	34	Recommendation name = (Recommendation) iterator.next();
34	if (name.matches(toMatch))	35	if (name.matches(toMatch))

Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/resolution/Transformer.java (-6 / +10 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.resolution;	11	package org.eclipse.equinox.internal.p2.resolution;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		16
13	import java.util.*;	17	import java.util.*;
14	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.core.runtime.Status;	19	import org.eclipse.core.runtime.Status;
Lines 59-65 Link Here
59	return result;	63	return result;
60	}	64	}
61		65
62	private boolean isEnabled(RequiredCapability capability) {	66	private boolean isEnabled(IRequiredCapability capability) {
63	// If there is no context then be optimistic	67	// If there is no context then be optimistic
64	if (context == null)	68	if (context == null)
65	return true;	69	return true;
Lines 89-95 Link Here
89	return buf.toString();	93	return buf.toString();
90	}	94	}
91		95
92	public void visitCapability(ProvidedCapability capability) {	96	public void visitCapability(IProvidedCapability capability) {
93	iuCapabilities.add(factory.createGenericDescription(capability.getName(), capability.getNamespace(), Version.toOSGiVersion(capability.getVersion()), null));	97	iuCapabilities.add(factory.createGenericDescription(capability.getName(), capability.getNamespace(), Version.toOSGiVersion(capability.getVersion()), null));
94	}	98	}
95		99
Lines 97-110 Link Here
97	kind = IU_KIND;	101	kind = IU_KIND;
98		102
99	//Start with the dependencies	103	//Start with the dependencies
100	RequiredCapability[] requires = toTransform.getRequiredCapabilities();	104	IRequiredCapability[] requires = toTransform.getRequiredCapabilities();
101	iuDependencies = new HashMap(requires.length);	105	iuDependencies = new HashMap(requires.length);
102	for (int i = 0; i < requires.length; i++) {	106	for (int i = 0; i < requires.length; i++) {
103	visitRequiredCapability(requires[i]);	107	visitRequiredCapability(requires[i]);
104	}	108	}
105		109
106	//Do the capabilities	110	//Do the capabilities
107	ProvidedCapability[] capabilities = toTransform.getProvidedCapabilities();	111	IProvidedCapability[] capabilities = toTransform.getProvidedCapabilities();
108	iuCapabilities = new ArrayList(requires.length + 1);	112	iuCapabilities = new ArrayList(requires.length + 1);
109	for (int i = 0; i < capabilities.length; i++) {	113	for (int i = 0; i < capabilities.length; i++) {
110	visitCapability(capabilities[i]);	114	visitCapability(capabilities[i]);
Lines 125-131 Link Here
125	result.setUserObject(new StateMetadataMap(toTransform, iuDependencies));	129	result.setUserObject(new StateMetadataMap(toTransform, iuDependencies));
126	}	130	}
127		131
128	public void visitRequiredCapability(RequiredCapability capability) {	132	public void visitRequiredCapability(IRequiredCapability capability) {
129	try {	133	try {
130	if (isEnabled(capability)) {	134	if (isEnabled(capability)) {
131	capability = rewrite(capability);	135	capability = rewrite(capability);
Lines 136-142 Link Here
136	}	140	}
137	}	141	}
138		142
139	private RequiredCapability rewrite(RequiredCapability match) {	143	private IRequiredCapability rewrite(IRequiredCapability match) {
140	if (recommendations == null)	144	if (recommendations == null)
141	return match;	145	return match;
142	Recommendation foundRecommendation = recommendations.findRecommendation(match);	146	Recommendation foundRecommendation = recommendations.findRecommendation(match);




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.resolution;

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

import org.eclipse.equinox.internal.p2.director.Messages;
import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
import org.eclipse.osgi.util.NLS;

/**

 */
public class UnsatisfiedCapability {
	private IInstallableUnit owner;
	private IRequiredCapability require;

	/**
	 * Creates a new unresolved dependency
	 * @param required The dependency that was not satisfied.
	 * @param owner The installable unit whose dependency was not satisfied.
	 */
	public UnsatisfiedCapability(IRequiredCapability required, IInstallableUnit owner) {
		this.require = required;
		this.owner = owner;
	}

	/**
	 * Returns the specific dependency that was not satisfied.
	 */
	public IRequiredCapability getRequiredCapability() {
		return require;
	}


Lines 10-15 Link Here

(-)src/org/eclipse/equinox/p2/publisher/actions/JREAction.java (-5 / +9 lines)
10	******************************************************************************/	10	******************************************************************************/
11	package org.eclipse.equinox.p2.publisher.actions;	11	package org.eclipse.equinox.p2.publisher.actions;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		16
13	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
14		18
15	import java.io.*;	19	import java.io.*;
Lines 52-60 Link Here
52	String configId = "config." + id;//$NON-NLS-1$	56	String configId = "config." + id;//$NON-NLS-1$
53	cu.setId(configId);	57	cu.setId(configId);
54	cu.setVersion(version);	58	cu.setVersion(version);
55	cu.setHost(new RequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, id, new VersionRange(version, true, PublisherHelper.versionMax, true), null, false, false)});	59	cu.setHost(new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, id, new VersionRange(version, true, PublisherHelper.versionMax, true), null, false, false)});
56	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());	60	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
57	cu.setCapabilities(new ProvidedCapability[] {PublisherHelper.createSelfCapability(configId, version)});	61	cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configId, version)});
58	cu.setTouchpointType(PublisherHelper.TOUCHPOINT_NATIVE);	62	cu.setTouchpointType(PublisherHelper.TOUCHPOINT_NATIVE);
59	Map touchpointData = new HashMap();	63	Map touchpointData = new HashMap();
60		64
Lines 88-94 Link Here
88	return PublisherHelper.createArtifactDescriptor(key, jreLocation);	92	return PublisherHelper.createArtifactDescriptor(key, jreLocation);
89	}	93	}
90		94
91	private static ProvidedCapability[] generateJRECapability(String installableUnitId, Version installableUnitVersion, InputStream profileStream) {	95	private static IProvidedCapability[] generateJRECapability(String installableUnitId, Version installableUnitVersion, InputStream profileStream) {
92	if (profileStream == null) {	96	if (profileStream == null) {
93	//use the 1.6 profile stored in the generator bundle	97	//use the 1.6 profile stored in the generator bundle
94	try {	98	try {
Lines 101-107 Link Here
101	try {	105	try {
102	p.load(profileStream);	106	p.load(profileStream);
103	ManifestElement[] jrePackages = ManifestElement.parseHeader("org.osgi.framework.system.packages", (String) p.get("org.osgi.framework.system.packages")); //$NON-NLS-1$ //$NON-NLS-2$	107	ManifestElement[] jrePackages = ManifestElement.parseHeader("org.osgi.framework.system.packages", (String) p.get("org.osgi.framework.system.packages")); //$NON-NLS-1$ //$NON-NLS-2$
104	ProvidedCapability[] exportedPackageAsCapabilities = new ProvidedCapability[jrePackages.length + 1];	108	IProvidedCapability[] exportedPackageAsCapabilities = new IProvidedCapability[jrePackages.length + 1];
105	exportedPackageAsCapabilities[0] = PublisherHelper.createSelfCapability(installableUnitId, installableUnitVersion);	109	exportedPackageAsCapabilities[0] = PublisherHelper.createSelfCapability(installableUnitId, installableUnitVersion);
106	for (int i = 1; i <= jrePackages.length; i++) {	110	for (int i = 1; i <= jrePackages.length; i++) {
107	exportedPackageAsCapabilities[i] = MetadataFactory.createProvidedCapability(PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE, jrePackages[i - 1].getValue(), null);	111	exportedPackageAsCapabilities[i] = MetadataFactory.createProvidedCapability(PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE, jrePackages[i - 1].getValue(), null);
Lines 122-128 Link Here
122	}	126	}
123	}	127	}
124	}	128	}
125	return new ProvidedCapability[0];	129	return new IProvidedCapability[0];
126	}	130	}
127		131
128	private static void generateJREIUData(InstallableUnitDescription iu, String installableUnitId, Version installableUnitVersion, File jreLocation) {	132	private static void generateJREIUData(InstallableUnitDescription iu, String installableUnitId, Version installableUnitVersion, File jreLocation) {

Lines 1-13 Link Here

(-)src/org/eclipse/equinox/p2/publisher/actions/ICapabilityAdvice.java (-4 / +6 lines)
1	package org.eclipse.equinox.p2.publisher.actions;	1	package org.eclipse.equinox.p2.publisher.actions;
2		2
3	import org.eclipse.equinox.internal.provisional.p2.metadata.ProvidedCapability;	3	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
4	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;	4
		5	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		6
5	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;	7	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
6	import org.eclipse.equinox.p2.publisher.IPublisherAdvice;	8	import org.eclipse.equinox.p2.publisher.IPublisherAdvice;
7		9
8	public interface ICapabilityAdvice extends IPublisherAdvice {	10	public interface ICapabilityAdvice extends IPublisherAdvice {
9		11
10	public ProvidedCapability[] getProvidedCapabilities(InstallableUnitDescription iu);	12	public IProvidedCapability[] getProvidedCapabilities(InstallableUnitDescription iu);
11		13
12	public RequiredCapability[] getRequiredCapabilities(InstallableUnitDescription iu);	14	public IRequiredCapability[] getRequiredCapabilities(InstallableUnitDescription iu);
13	}	15	}

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/p2/publisher/eclipse/AdviceFileAdvice.java (-2 / +6 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.p2.publisher.eclipse;	9	package org.eclipse.equinox.p2.publisher.eclipse;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;
		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		14
11	import java.io.*;	15	import java.io.*;
12	import java.util.*;	16	import java.util.*;
13	import java.util.zip.ZipEntry;	17	import java.util.zip.ZipEntry;
Lines 126-132 Link Here
126	/*(non-Javadoc)	130	/*(non-Javadoc)
127	* @see org.eclipse.equinox.p2.publisher.eclipse.ITouchpointAdvice#getTouchpointData()	131	* @see org.eclipse.equinox.p2.publisher.eclipse.ITouchpointAdvice#getTouchpointData()
128	*/	132	*/
129	public TouchpointData getTouchpointData(TouchpointData existing) {	133	public ITouchpointData getTouchpointData(ITouchpointData existing) {
130	Map touchpointData = new HashMap(existing.getInstructions());	134	Map touchpointData = new HashMap(existing.getInstructions());
131	Map bundleAdvice = getInstructions();	135	Map bundleAdvice = getInstructions();
132	for (Iterator iterator = bundleAdvice.keySet().iterator(); iterator.hasNext();) {	136	for (Iterator iterator = bundleAdvice.keySet().iterator(); iterator.hasNext();) {
Lines 136-142 Link Here
136	String instruction = ""; //$NON-NLS-1$	140	String instruction = ""; //$NON-NLS-1$
137	if (touchpointData.containsKey(phase)) {	141	if (touchpointData.containsKey(phase)) {
138	Object previous = touchpointData.get(phase);	142	Object previous = touchpointData.get(phase);
139	instruction = previous instanceof TouchpointInstruction ? ((TouchpointInstruction) previous).getBody() : (String) previous;	143	instruction = previous instanceof ITouchpointInstruction ? ((ITouchpointInstruction) previous).getBody() : (String) previous;
140	if (instruction.length() > 0 && !instruction.endsWith(";")) //$NON-NLS-1$	144	if (instruction.length() > 0 && !instruction.endsWith(";")) //$NON-NLS-1$
141	instruction += ';';	145	instruction += ';';
142	}	146	}

Lines 10-16 Link Here

(-)src/org/eclipse/equinox/p2/publisher/eclipse/ITouchpointAdvice.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.publisher.eclipse;	11	package org.eclipse.equinox.p2.publisher.eclipse;
12		12
13	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointData;	13	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		14
14	import org.eclipse.equinox.p2.publisher.IPublisherAdvice;	15	import org.eclipse.equinox.p2.publisher.IPublisherAdvice;
15		16
16	/**	17	/**
Lines 25-30 Link Here
25	* @param existingData The current set of touchpoint data.	26	* @param existingData The current set of touchpoint data.
26	* @return the merged touchpoint data	27	* @return the merged touchpoint data
27	*/	28	*/
28	public TouchpointData getTouchpointData(TouchpointData existingData);	29	public ITouchpointData getTouchpointData(ITouchpointData existingData);
29		30
30	}	31	}




 ******************************************************************************/
package org.eclipse.equinox.p2.publisher.eclipse;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;

			iu.setProperty(PublisherHelper.ECLIPSE_INSTALL_HANDLER_PROP, installHandlerProperty);
		}

		iu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(id, version), PublisherHelper.FEATURE_CAPABILITY, MetadataFactory.createProvidedCapability(PublisherHelper.CAPABILITY_NS_UPDATE_FEATURE, feature.getId(), version)});
		iu.setArtifacts(new IArtifactKey[] {createFeatureArtifactKey(feature.getId(), version.toString())});

		// link in all the children (if any) as requirements.
		// TODO consider if these should be linked as exact version numbers.  Should be ok but may be brittle.
		if (childIUs != null) {
			IRequiredCapability[] required = new IRequiredCapability[childIUs.size()];
			for (int i = 0; i < childIUs.size(); i++) {
				IInstallableUnit child = (IInstallableUnit) childIUs.get(i);
				required[i] = MetadataFactory.createRequiredCapability(PublisherHelper.IU_NAMESPACE, child.getId(), new VersionRange(child.getVersion(), true, child.getVersion(), true), INSTALL_FEATURES_FILTER, false, false);

		iu.setId(id);
		Version version = new Version(featureVersion);
		iu.setVersion(version);
		iu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(id, version)});
		iu.setTouchpointType(PublisherHelper.TOUCHPOINT_NATIVE);
		String configSpec = descriptor.getConfigSpec();
		if (configSpec != null)

		iu.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(id, new VersionRange(new Version(0, 0, 0), true, new Version(feature.getVersion()), false), IUpdateDescriptor.NORMAL, null));

		FeatureEntry entries[] = feature.getEntries();
		IRequiredCapability[] required = new IRequiredCapability[entries.length + (featureIU == null ? 0 : 1)];
		for (int i = 0; i < entries.length; i++) {
			VersionRange range = getVersionRange(entries[i]);
			String requiredId = getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true);

		if (featureIU != null)
			required[entries.length] = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, featureIU.getId(), new VersionRange(featureIU.getVersion(), true, featureIU.getVersion(), true), INSTALL_FEATURES_FILTER, false, false);
		iu.setRequiredCapabilities(required);
		iu.setTouchpointType(ITouchpointType.NONE);
		processTouchpointAdvice(iu, info);
		processFeatureAdvice(feature, iu, info);
		iu.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());

			}
		}

		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));
		return MetadataFactory.createInstallableUnit(iu);
	}


		ArrayList requirementChanges = new ArrayList();
		for (int i = 0; i < entries.length; i++) {
			VersionRange range = getVersionRange(entries[i]);
			IRequiredCapability req = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), range, getFilter(entries[i]), entries[i].isOptional(), false);
			if (entries[i].isRequires()) {
				applicabilityScope.add(req);
				continue;
			}
			if (entries[i].isPlugin()) {
				IRequiredCapability from = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, getTransformedId(entries[i].getId(), entries[i].isPlugin(), /*isGroup*/true), VersionRange.emptyRange, getFilter(entries[i]), entries[i].isOptional(), false);
				requirementChanges.add(new RequirementChange(from, req));
				continue;
			}

		}
		//Always add a requirement on the IU containing the feature jar
		patchRequirements.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, featureIU.getId(), new VersionRange(featureIU.getVersion(), true, featureIU.getVersion(), true), INSTALL_FEATURES_FILTER, false, false));
		iu.setRequiredCapabilities((IRequiredCapability[]) patchRequirements.toArray(new IRequiredCapability[patchRequirements.size()]));
		iu.setApplicabilityScope(new IRequiredCapability[][] {(IRequiredCapability[]) applicabilityScope.toArray(new IRequiredCapability[applicabilityScope.size()])});
		iu.setRequirementChanges((IRequirementChange[]) requirementChanges.toArray(new IRequirementChange[requirementChanges.size()]));

		//Generate lifecycle
		IRequiredCapability lifeCycle = null;
		if (applicabilityScope.size() > 0) {
			IRequiredCapability req = (IRequiredCapability) applicabilityScope.get(0);
			lifeCycle = MetadataFactory.createRequiredCapability(req.getNamespace(), req.getName(), req.getRange(), null, false, false, false);
			iu.setLifeCycle(lifeCycle);
		}

		iu.setTouchpointType(ITouchpointType.NONE);
		processTouchpointAdvice(iu, info);
		processFeatureAdvice(feature, iu, info);
		iu.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());

			}
		}

		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));
		return MetadataFactory.createInstallableUnitPatch(iu);
	}



	private void processTouchpointAdvice(InstallableUnitDescription iu, IPublisherInfo info) {
		Collection advice = info.getAdvice(null, false, null, null, ITouchpointAdvice.class);
		ITouchpointData result = MetadataFactory.createTouchpointData(new HashMap());
		for (Iterator i = advice.iterator(); i.hasNext();) {
			ITouchpointAdvice entry = (ITouchpointAdvice) i.next();
			result = entry.getTouchpointData(result);




	/**
	 * A capability name in the {@link PublisherHelper#NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing and OSGi bundle resource
	 * @see IRequiredCapability#getName()
	 * @see IProvidedCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_BUNDLE = "bundle"; //$NON-NLS-1$

	/**
	 * A capability name in the {@link PublisherHelper#NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing a source bundle
	 * @see IRequiredCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$


	private static final String CAPABILITY_NS_OSGI_BUNDLE = "osgi.bundle"; //$NON-NLS-1$
	private static final String CAPABILITY_NS_OSGI_FRAGMENT = "osgi.fragment"; //$NON-NLS-1$

	public static final IProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new Version(1, 0, 0));
	public static final IProvidedCapability SOURCE_BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, new Version(1, 0, 0));

	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$	


		cu.setVersion(hostVersion);

		//Indicate the IU to which this CU apply
		cu.setHost(new IRequiredCapability[] { //
				MetadataFactory.createRequiredCapability(CAPABILITY_NS_OSGI_BUNDLE, hostId, new VersionRange(hostVersion, true, PublisherHelper.versionMax, true), null, false, false, true), // 
						MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new VersionRange(new Version(1, 0, 0), true, new Version(2, 0, 0), false), null, false, false, false)});

		//Adds capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, hostVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		Map touchpointData = new HashMap();
		touchpointData.put("install", "installBundle(bundle:${artifact})"); //$NON-NLS-1$ //$NON-NLS-2$

			//TODO this needs to be refined to take into account all the attribute handled by imports
			reqsDeps.add(MetadataFactory.createRequiredCapability(PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE, importPackageName, versionRange, null, isOptional(importSpec), false));
		}
		iu.setRequiredCapabilities((IRequiredCapability[]) reqsDeps.toArray(new IRequiredCapability[reqsDeps.size()]));

		// Create set of provided capabilities
		ArrayList providedCapabilities = new ArrayList();

				providedCapabilities.add(PublisherHelper.makeTranslationCapability(bd.getSymbolicName(), locale));
			}
		}
		iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));
		processCapabilityAdvice(iu, bd, info);

		// Set certain properties from the manifest header attributes as IU properties.

		Collection advice = info.getAdvice(null, false, null, null, ICapabilityAdvice.class);
		for (Iterator i = advice.iterator(); i.hasNext();) {
			ICapabilityAdvice entry = (ICapabilityAdvice) i.next();
			IRequiredCapability[] requiredAdvice = entry.getRequiredCapabilities(iu);
			IProvidedCapability[] providedAdvice = entry.getProvidedCapabilities(iu);
			if (providedAdvice != null) {
				IRequiredCapability[] current = iu.getRequiredCapabilities();
				IRequiredCapability[] result = new IRequiredCapability[requiredAdvice.length + current.length];
				System.arraycopy(requiredAdvice, 0, result, 0, requiredAdvice.length);
				System.arraycopy(current, 0, result, requiredAdvice.length, current.length);
				iu.setRequiredCapabilities(result);
			}
			if (providedAdvice != null) {
				IProvidedCapability[] current = iu.getProvidedCapabilities();
				IProvidedCapability[] result = new IProvidedCapability[providedAdvice.length + current.length];
				System.arraycopy(providedAdvice, 0, result, 0, providedAdvice.length);
				System.arraycopy(current, 0, result, providedAdvice.length, current.length);
				iu.setCapabilities(result);

	 */
	private static void processTouchpointAdvice(InstallableUnitDescription iu, Map currentInstructions, IPublisherInfo info) {
		Collection advice = info.getAdvice(null, false, iu.getId(), iu.getVersion(), ITouchpointAdvice.class);
		ITouchpointData result = MetadataFactory.createTouchpointData(currentInstructions);
		for (Iterator i = advice.iterator(); i.hasNext();) {
			ITouchpointAdvice entry = (ITouchpointAdvice) i.next();
			result = entry.getTouchpointData(result);

		fragment.setVersion(Version.fromOSGiVersion(bd.getVersion())); // TODO: is this a meaningful version?

		HostSpecification hostSpec = bd.getHost();
		IRequiredCapability[] hostReqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, hostSpec.getName(), VersionRange.fromOSGiVersionRange(hostSpec.getVersionRange()), null, false, false, false)};
		fragment.setHost(hostReqs);

		fragment.setSingleton(true);

			}
			providedCapabilities.add(PublisherHelper.makeTranslationCapability(hostId, locale));
		}
		fragment.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));

		return MetadataFactory.createInstallableUnitFragment(fragment);
	}


		// Add capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		// Create a required capability on bundles
		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, VersionRange.emptyRange, null, false, true, false)};
		cu.setHost(reqs);
		Map touchpointData = new HashMap();





public class PublisherHelper {
	/**
	 * A capability namespace representing the type of Eclipse resource (bundle, feature, source bundle, etc)
	 * @see IRequiredCapability#getNamespace()
	 * @see IProvidedCapability#getNamespace()
	 */
	public static final String NAMESPACE_ECLIPSE_TYPE = "org.eclipse.equinox.p2.eclipse.type"; //$NON-NLS-1$

	/**
	 * A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing a feature
	 * @see IRequiredCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_FEATURE = "feature"; //$NON-NLS-1$

	/**
	 * A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace 
	 * representing a source bundle
	 * @see IRequiredCapability#getName()
	 */
	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$

	/**
	 * A capability namespace representing the localization (translation)
	 * of strings from a specified IU in a specified locale
	 * @see IRequiredCapability#getNamespace()
	 * @see IProvidedCapability#getNamespace()
	 * TODO: this should be in API, probably in IInstallableUnit
	 */
	public static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$

	public static final TouchpointType TOUCHPOINT_NATIVE = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.native", new Version(1, 0, 0)); //$NON-NLS-1$
	public static final TouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", new Version(1, 0, 0)); //$NON-NLS-1$

	public static final IProvidedCapability FEATURE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, new Version(1, 0, 0));

	public static IArtifactDescriptor createArtifactDescriptor(IArtifactKey key, File pathOnDisk) {
		//TODO this size calculation is bogus

		}
	}

	public static IProvidedCapability makeTranslationCapability(String hostId, Locale locale) {
		return MetadataFactory.createProvidedCapability(NAMESPACE_IU_LOCALIZATION, locale.toString(), new Version(1, 0, 0));
	}



		// Add capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		// Create a required capability on features
		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, VersionRange.emptyRange, null, true, true, false)};
		cu.setHost(reqs);

		cu.setFilter(INSTALL_FEATURES_FILTER);


		// Add capabilities for fragment, self, and describing the flavor supported
		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});

		// Create a required capability on source providers
		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, VersionRange.emptyRange, null, true, true, false)};
		cu.setHost(reqs);
		Map touchpointData = new HashMap();


		return new ArtifactKey(BINARY_ARTIFACT_CLASSIFIER, id, version);
	}

	public static IProvidedCapability createSelfCapability(String installableUnitId, Version installableUnitVersion) {
		return MetadataFactory.createProvidedCapability(IU_NAMESPACE, installableUnitId, installableUnitVersion);
	}


Lines 10-15 Link Here

(-)src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java (-4 / +5 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.p2.tools;	11	package org.eclipse.equinox.internal.p2.tools;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
13	import java.net.URI;	15	import java.net.URI;
14	import java.util.Arrays;	16	import java.util.Arrays;
15	import java.util.Comparator;	17	import java.util.Comparator;
Lines 20-26 Link Here
20	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;	22	import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;
21	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;	23	import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
22	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	24	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
23	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
24	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;	25	import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
25	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
26	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;	27	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
Lines 175-181 Link Here
175	return result;	176	return result;
176	}	177	}
177		178
178	private boolean compareRequires(RequiredCapability[] a, RequiredCapability[] b) {	179	private boolean compareRequires(IRequiredCapability[] a, IRequiredCapability[] b) {
179	if (a == null)	180	if (a == null)
180	return b == null;	181	return b == null;
181	if (a.length != b.length)	182	if (a.length != b.length)
Lines 188-196 Link Here
188	return true;	189	return true;
189	}	190	}
190		191
191	private RequiredCapability findCapability(RequiredCapability target, RequiredCapability[] b) {	192	private IRequiredCapability findCapability(IRequiredCapability target, IRequiredCapability[] b) {
192	for (int i = 0; i < b.length; i++) {	193	for (int i = 0; i < b.length; i++) {
193	RequiredCapability capability = b[i];	194	IRequiredCapability capability = b[i];
194	if (target.equals(capability))	195	if (target.equals(capability))
195	return capability;	196	return capability;
196	}	197	}

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/internal/p2/selfhosting/FlavorVisitor.java (-1 / +3 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.p2.selfhosting;	9	package org.eclipse.equinox.internal.p2.selfhosting;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
11	import java.io.BufferedInputStream;	13	import java.io.BufferedInputStream;
12	import java.io.IOException;	14	import java.io.IOException;
13	import java.util.*;	15	import java.util.*;
Lines 51-57 Link Here
51	}	53	}
52		54
53	private void processRemoval(String flavorName) {	55	private void processRemoval(String flavorName) {
54	RequiredCapability flavorCapability = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_FLAVOR, flavorName, VersionRange.emptyRange, null, false, false);	56	IRequiredCapability flavorCapability = MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_FLAVOR, flavorName, VersionRange.emptyRange, null, false, false);
55	repo.removeInstallableUnits(new CapabilityQuery(flavorCapability), null);	57	repo.removeInstallableUnits(new CapabilityQuery(flavorCapability), null);
56	}	58	}
57		59




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata.repository.io;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;

import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;

import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.Iterator;

		end(INSTALLABLE_UNIT_ELEMENT);
	}

	protected void writeLifeCycle(IRequiredCapability capability) {
		if (capability == null)
			return;
		start(LIFECYCLE);

		end(LIFECYCLE);
	}

	protected void writeHostRequiredCapabilities(IRequiredCapability[] capabilities) {
		if (capabilities != null && capabilities.length > 0) {
			start(HOST_REQUIRED_CAPABILITIES_ELEMENT);
			attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);

		}
	}

	protected void writeProvidedCapabilities(IProvidedCapability[] capabilities) {
		if (capabilities != null && capabilities.length > 0) {
			start(PROVIDED_CAPABILITIES_ELEMENT);
			attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);

		}
	}

	protected void writeRequiredCapabilities(IRequiredCapability[] capabilities) {
		if (capabilities != null && capabilities.length > 0) {
			start(REQUIRED_CAPABILITIES_ELEMENT);
			attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);

		end(UPDATE_DESCRIPTOR_ELEMENT);
	}

	protected void writeApplicabilityScope(IRequiredCapability[][] capabilities) {
		start(APPLICABILITY_SCOPE);
		for (int i = 0; i < capabilities.length; i++) {
			start(APPLY_ON);

		end(APPLICABILITY_SCOPE);
	}

	protected void writeRequirementsChange(IRequirementChange[] changes) {
		start(REQUIREMENT_CHANGES);
		for (int i = 0; i < changes.length; i++) {
			writeRequirementChange(changes[i]);

		end(REQUIREMENT_CHANGES);
	}

	protected void writeRequirementChange(IRequirementChange change) {
		start(REQUIREMENT_CHANGE);
		if (change.applyOn() != null) {
			start(REQUIREMENT_FROM);

		end(REQUIREMENT_CHANGE);
	}

	protected void writeRequiredCapability(IRequiredCapability capability) {
		start(REQUIRED_CAPABILITY_ELEMENT);
		attribute(NAMESPACE_ATTRIBUTE, capability.getNamespace());
		attribute(NAME_ATTRIBUTE, capability.getName());

		}
	}

	protected void writeTouchpointType(ITouchpointType touchpointType) {
		start(TOUCHPOINT_TYPE_ELEMENT);
		attribute(ID_ATTRIBUTE, touchpointType.getId());
		attribute(VERSION_ATTRIBUTE, touchpointType.getVersion());
		end(TOUCHPOINT_TYPE_ELEMENT);
	}

	protected void writeTouchpointData(ITouchpointData[] touchpointData) {
		if (touchpointData != null && touchpointData.length > 0) {
			start(TOUCHPOINT_DATA_ELEMENT);
			attribute(COLLECTION_SIZE_ATTRIBUTE, touchpointData.length);
			for (int i = 0; i < touchpointData.length; i++) {
				ITouchpointData nextData = touchpointData[i];
				Map instructions = nextData.getInstructions();
				if (instructions.size() > 0) {
					start(TOUCHPOINT_DATA_INSTRUCTIONS_ELEMENT);

						Map.Entry entry = (Map.Entry) iter.next();
						start(TOUCHPOINT_DATA_INSTRUCTION_ELEMENT);
						attribute(TOUCHPOINT_DATA_INSTRUCTION_KEY_ATTRIBUTE, entry.getKey());
						ITouchpointInstruction instruction = (ITouchpointInstruction) entry.getValue();
						if (instruction.getImportAttribute() != null)
							attribute(TOUCHPOINT_DATA_INSTRUCTION_IMPORT_ATTRIBUTE, instruction.getImportAttribute());
						cdata(instruction.getBody(), true);

		}
	}

	private void writeLicenses(ILicense license) {
		if (license != null) {
			// In the future there may be more than one license, so we write this 
			// as a collection of one.

		}
	}

	private void writeCopyright(ICopyright copyright) {
		if (copyright != null) {
			start(COPYRIGHT_ELEMENT);
			try {




	 * a scope of [[r1, r2, r3], [r4, r5]] will match any unit whose provided capabilities
	 * satisfy the expression ((r1 ^ r2 ^ r3) | (r4 ^ r5)).
	 */
	IRequiredCapability[][] getApplicabilityScope();

	/**
	 * Returns the requirement changes imposed by the patch.
	 * @return The patch requirement changes.
	 */
	IRequirementChange[] getRequirementsChange();

	/**
	 * Returns the required capability that defines the lifecycle of this patch. The

	 * is satisfied by some IU in the profile. If a future provisioning operation causes
	 * the requirement to no longer be satisfied, the patch will be uninstalled.
	 */
	IRequiredCapability getLifeCycle();
}




 * Identifies a particular touchpoint. A touchpoint is identified by an id 
 * and a version.
 */
public class TouchpointType implements ITouchpointType {
	/**
	 * A touchpoint type indicating that the "null" touchpoint should be used.
	 * The null touchpoint does not participate in any install phase.
	 */
	public static final TouchpointType NONE = new TouchpointType("null", Version.emptyVersion); //$NON-NLS-1$

	private String id;//never null
	private Version version;//never null


			return true;
		if (super.equals(obj))
			return true;
		if (obj == null || obj instanceof ITouchpointType)
			return false;
		ITouchpointType other = (ITouchpointType) obj;
		return id.equals(other.getId()) && version.equals(other.getVersion());
	}

	public String getId() {




 * 
 * @see IInstallableUnit#NAMESPACE_IU_ID
 */
public class RequiredCapability implements IRequiredCapability {
	private static final String[] NO_SELECTORS = new String[0];

	private String filter;

			return true;
		if (obj == null)
			return false;
		if (!(obj instanceof IRequiredCapability))
			return false;
		final IRequiredCapability other = (IRequiredCapability) obj;
		if (filter == null) {
			if (other.getFilter() != null)
				return false;
		} else if (!filter.equals(other.getFilter()))
			return false;
		if (multiple != other.isMultiple())
			return false;
		if (!name.equals(other.getName()))
			return false;
		if (!namespace.equals(other.getNamespace()))
			return false;
		if (optional != other.isOptional())
			return false;
		if (!range.equals(other.getRange()))
			return false;
		return true;
	}




 ******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;

public class RequirementChange implements IRequirementChange {
	private IRequiredCapability applyOn;
	private IRequiredCapability newValue;

	public RequirementChange(IRequiredCapability applyOn2, IRequiredCapability newValue2) {
		if (applyOn2 == null && newValue2 == null)
			throw new IllegalArgumentException();
		this.applyOn = applyOn2;
		this.newValue = newValue2;
	}

	public IRequiredCapability applyOn() {
		return applyOn;
	}

	public IRequiredCapability newValue() {
		return newValue;
	}

	public boolean matches(IRequiredCapability toMatch) {
		if (!toMatch.getNamespace().equals(applyOn.getNamespace()))
			return false;
		if (!toMatch.getName().equals(applyOn.getName()))

			return true;
		if (obj == null)
			return false;
		if (!(obj instanceof IRequirementChange))
			return false;
		final IRequirementChange other = (IRequirementChange) obj;
		if (applyOn == null) {
			if (other.applyOn() != null)
				return false;
		} else if (!applyOn.equals(other.applyOn()))
			return false;
		if (newValue == null) {
			if (other.newValue() != null)
				return false;
		} else if (!newValue.equals(other.newValue()))
			return false;
		return true;
	}

Lines 21-27 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/License.java (-3 / +3 lines)
21	* which may be the full text or an annotation. An optional URL field can be specified	21	* which may be the full text or an annotation. An optional URL field can be specified
22	* which links to full text. Licenses can be easily compared using their digests.	22	* which links to full text. Licenses can be easily compared using their digests.
23	*/	23	*/
24	public class License {	24	public class License implements ILicense {
25	/**	25	/**
26	* The <code>body</code> contains the descriptive text for the license. This may	26	* The <code>body</code> contains the descriptive text for the license. This may
27	* be a summary for a full license specified in a URL.	27	* be a summary for a full license specified in a URL.
Lines 90-97 Link Here
90	return true;	90	return true;
91	if (obj == null)	91	if (obj == null)
92	return false;	92	return false;
93	if (obj instanceof License) {	93	if (obj instanceof ILicense) {
94	License other = (License) obj;	94	ILicense other = (ILicense) obj;
95	if (other.getDigest().equals(getDigest()))	95	if (other.getDigest().equals(getDigest()))
96	return true;	96	return true;
97	}	97	}




 * @noextend This class is not intended to be subclassed by clients.
 * @see MetadataFactory#createTouchpointInstruction(String, String)
 */
public class TouchpointInstruction implements ITouchpointInstruction {

	private final String body;
	private final String importAttribute;

			return true;
		if (obj == null)
			return false;
		if (!(obj instanceof ITouchpointInstruction))
			return false;
		ITouchpointInstruction other = (ITouchpointInstruction) obj;
		if (body == null) {
			if (other.getBody() != null)
				return false;
		} else if (!body.equals(other.getBody()))
			return false;
		if (importAttribute == null) {
			if (other.getImportAttribute() != null)
				return false;
		} else if (!importAttribute.equals(other.getImportAttribute()))
			return false;
		return true;
	}




import java.util.Map.Entry;
import org.eclipse.core.runtime.Assert;
import org.eclipse.equinox.internal.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;

/**
 * A factory class for instantiating various p2 metadata objects.

		public void addProvidedCapabilities(Collection additional) {
			if (additional == null || additional.size() == 0)
				return;
			IProvidedCapability[] current = unit().getProvidedCapabilities();
			IProvidedCapability[] result = new IProvidedCapability[additional.size() + current.length];
			System.arraycopy(current, 0, result, 0, current.length);
			int j = current.length;
			for (Iterator i = additional.iterator(); i.hasNext();)
				result[j++] = (IProvidedCapability) i.next();
			unit().setCapabilities(result);
		}

		public void addRequiredCapabilities(Collection additional) {
			if (additional == null || additional.size() == 0)
				return;
			IRequiredCapability[] current = unit().getRequiredCapabilities();
			IRequiredCapability[] result = new IRequiredCapability[additional.size() + current.length];
			System.arraycopy(current, 0, result, 0, current.length);
			int j = current.length;
			for (Iterator i = additional.iterator(); i.hasNext();)
				result[j++] = (IRequiredCapability) i.next();
			unit().setRequiredCapabilities(result);
		}

		public void addTouchpointData(ITouchpointData data) {
			Assert.isNotNull(data);
			unit().addTouchpointData(data);
		}

			return unit().getId();
		}

		public IProvidedCapability[] getProvidedCapabilities() {
			return unit().getProvidedCapabilities();
		}

		public IRequiredCapability[] getRequiredCapabilities() {
			return unit().getRequiredCapabilities();
		}


		 * 
		 * @return The current touchpoint data on this description
		 */
		public ITouchpointData[] getTouchpointData() {
			return unit().getTouchpointData();

		}

			unit().setArtifacts(value);
		}

		public void setCapabilities(IProvidedCapability[] exportedCapabilities) {
			unit().setCapabilities(exportedCapabilities);
		}

		public void setCopyright(ICopyright copyright) {
			unit().setCopyright(copyright);
		}


			unit().setId(id);
		}

		public void setLicense(ILicense license) {
			unit().setLicense(license);
		}


			unit().setProperty(key, value);
		}

		public void setRequiredCapabilities(IRequiredCapability[] capabilities) {
			unit().setRequiredCapabilities(capabilities);
		}


	}

	public static class InstallableUnitFragmentDescription extends InstallableUnitDescription {
		public void setHost(IRequiredCapability[] hostRequirements) {
			((InstallableUnitFragment) unit()).setHost(hostRequirements);
		}



	public static class InstallableUnitPatchDescription extends InstallableUnitDescription {

		public void setApplicabilityScope(IRequiredCapability[][] applyTo) {
			if (applyTo == null)
				throw new IllegalArgumentException("A patch scope can not be null"); //$NON-NLS-1$
			((InstallableUnitPatch) unit()).setApplicabilityScope(applyTo);
		}

		public void setLifeCycle(IRequiredCapability lifeCycle) {
			((InstallableUnitPatch) unit()).setLifeCycle(lifeCycle);
		}

		public void setRequirementChanges(IRequirementChange[] changes) {
			((InstallableUnitPatch) unit()).setRequirementsChange(changes);
		}

		InstallableUnit unit() {
			if (unit == null) {
				unit = new InstallableUnitPatch();
				((InstallableUnitPatch) unit()).setApplicabilityScope(new IRequiredCapability[0][0]);
			}
			return unit;
		}

	/**
	 * Singleton touchpoint data for a touchpoint with no instructions.
	 */
	private static final ITouchpointData EMPTY_TOUCHPOINT_DATA = new TouchpointData(Collections.EMPTY_MAP);

	private static TouchpointType[] typeCache = new TouchpointType[5];


	}

	/**
	 * Returns a {@link IProvidedCapability} with the given values.
	 * 
	 * @param namespace The capability namespace
	 * @param name The capability name
	 * @param version The capability version
	 */
	public static IProvidedCapability createProvidedCapability(String namespace, String name, Version version) {
		return new ProvidedCapability(namespace, name, version);
	}

	/**
	 * Returns a {@link IRequiredCapability} with the given values.
	 * 
	 * @param namespace The capability namespace
	 * @param name The required capability name

	 * and <code>false</code> otherwise.
	 * @param multiple <code>true</code> if this capability can be satisfied by multiple provided capabilities, or it requires exactly one match
	 */
	public static IRequiredCapability createRequiredCapability(String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple) {
		return new RequiredCapability(namespace, name, range, filter, optional, multiple);
	}

	public static IRequiredCapability createRequiredCapability(String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple, boolean greedy) {
		return new RequiredCapability(namespace, name, range, filter, optional, multiple, greedy);
	}


	}

	/**
	 * Returns an instance of {@link ITouchpointData} with the given instructions.
	 * 
	 * @param instructions The instructions for the touchpoint data.
	 * @return The created touchpoint data
	 */
	public static ITouchpointData createTouchpointData(Map instructions) {
		Assert.isNotNull(instructions);
		//copy the map to protect against subsequent change by caller
		if (instructions.isEmpty())

		return new TouchpointData(result);
	}

	public static ITouchpointInstruction createTouchpointInstruction(String body, String importAttribute) {
		return new TouchpointInstruction(body, importAttribute);
	}


		Assert.isNotNull(id);
		Assert.isNotNull(version);

		if (id.equals(ITouchpointType.NONE.getId()) && version.equals(ITouchpointType.NONE.getVersion()))
			return ITouchpointType.NONE;

		synchronized (typeCache) {
			TouchpointType result = getCachedTouchpointType(id, version);





	public String getProperty(String key);

	public IProvidedCapability[] getProvidedCapabilities();

	public IRequiredCapability[] getRequiredCapabilities();

	public ITouchpointData[] getTouchpointData();

	public ITouchpointType getTouchpointType();

	public Version getVersion();


	 * @return <code>true</code> if this unit satisfies the given required
	 * capability, and <code>false</code> otherwise.
	 */
	public boolean satisfies(IRequiredCapability candidate);

	/**
	 * Returns the unresolved equivalent of this installable unit. If this unit is

	 * Returns the license that applies to this installable unit.
	 * @return the license that applies to this installable unit or <code>null</code>
	 */
	public ILicense getLicense();

	/**
	 * Returns the copyright that applies to this installable unit.
	 * @return the copyright that applies to this installable unit or <code>null</code>
	 */
	public ICopyright getCopyright();
}




 * @noextend This class is not intended to be subclassed by clients.
 * @see MetadataFactory#createTouchpointData(Map)
 */
public class TouchpointData implements ITouchpointData {

	/**
	 * Map of (String->TouchpointInstruction). The set

			return true;
		if (obj == null)
			return false;
		if (!(obj instanceof ITouchpointData))
			return false;
		final ITouchpointData other = (ITouchpointData) obj;
		if (instructions == null) {
			if (other.getInstructions() != null)
				return false;
		} else if (!instructions.equals(other.getInstructions()))
			return false;
		return true;
	}

	/**
	 * Returns the touchpoint instruction corresponding to the given key.
	 */
	public ITouchpointInstruction getInstruction(String instructionKey) {
		return (ITouchpointInstruction) instructions.get(instructionKey);
	}

	/**
	 * Returns an unmodifiable map of the touchpoint instructions. The map
	 * keys are strings, and the values are instances of {@link ITouchpointInstruction}.
	 *
	 * @return the touchpoint instructions
	 */

Lines 17-23 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/Copyright.java (-1 / +1 lines)
17	* required body text which may be the full text or a summary. An optional location field can be specified	17	* required body text which may be the full text or a summary. An optional location field can be specified
18	* which links to full text.	18	* which links to full text.
19	*/	19	*/
20	public class Copyright {	20	public class Copyright implements ICopyright {
21	/**	21	/**
22	* The <code>body</code> contains the descriptive text for the copyright. This may	22	* The <code>body</code> contains the descriptive text for the copyright. This may
23	* be a summary for a copyright specified in a URL.	23	* be a summary for a copyright specified in a URL.

Lines 9-13 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java (-1 / +1 lines)
9	package org.eclipse.equinox.internal.provisional.p2.metadata;	9	package org.eclipse.equinox.internal.provisional.p2.metadata;
10		10
11	public interface IInstallableUnitFragment extends IInstallableUnit {	11	public interface IInstallableUnitFragment extends IInstallableUnit {
12	public RequiredCapability[] getHost();	12	public IRequiredCapability[] getHost();
13	}	13	}

Lines 16-22 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java (-7 / +12 lines)
16	/**	16	/**
17	* Describes a capability as exposed or required by an installable unit	17	* Describes a capability as exposed or required by an installable unit
18	*/	18	*/
19	public class ProvidedCapability {	19	public class ProvidedCapability implements IProvidedCapability {
20	private final String name;	20	private final String name;
21	private final String namespace;	21	private final String namespace;
22	private final Version version;	22	private final Version version;
Lines 30-40 Link Here
30	}	30	}
31		31
32	public boolean equals(Object other) {	32	public boolean equals(Object other) {
33	if (other instanceof ProvidedCapability) {	33	if (other == null)
34	ProvidedCapability otherCapability = (ProvidedCapability) other;	34	return false;
35	return otherCapability.namespace.equals(namespace) && otherCapability.name.equals(name) && otherCapability.version.equals(version);	35	if (!(other instanceof IProvidedCapability))
36	}	36	return false;
37	return false;	37	IProvidedCapability otherCapability = (IProvidedCapability) other;
		38	if (!(namespace.equals(otherCapability.getNamespace())))
		39	return false;
		40	if (!(name.equals(otherCapability.getName())))
		41	return false;
		42	return true;
38	}	43	}
39		44
40	public String getName() {	45	public String getName() {
Lines 58-64 Link Here
58	* @return <code>true</code> if this capability satisfies the given required	63	* @return <code>true</code> if this capability satisfies the given required
59	* capability, and <code>false</code> otherwise.	64	* capability, and <code>false</code> otherwise.
60	*/	65	*/
61	public boolean satisfies(RequiredCapability candidate) {	66	public boolean satisfies(IRequiredCapability candidate) {
62	if (getName() == null \|\| !getName().equals(candidate.getName()))	67	if (getName() == null \|\| !getName().equals(candidate.getName()))
63	return false;	68	return false;
64	if (getNamespace() == null \|\| !getNamespace().equals(candidate.getNamespace()))	69	if (getNamespace() == null \|\| !getNamespace().equals(candidate.getNamespace()))

Lines 10-17 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java (-6 / +7 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.p2.metadata.query;	11	package org.eclipse.equinox.internal.provisional.p2.metadata.query;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
13	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	15	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
14	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
15	import org.eclipse.equinox.internal.provisional.p2.query.Query;	16	import org.eclipse.equinox.internal.provisional.p2.query.Query;
16		17
17	/**	18	/**
Lines 19-32 Link Here
19	* capabilities that match one or more required capabilities.	20	* capabilities that match one or more required capabilities.
20	*/	21	*/
21	public class CapabilityQuery extends Query {	22	public class CapabilityQuery extends Query {
22	private RequiredCapability[] required;	23	private IRequiredCapability[] required;
23		24
24	/**	25	/**
25	* Creates a new query on the given required capability.	26	* Creates a new query on the given required capability.
26	* @param required The required capability	27	* @param required The required capability
27	*/	28	*/
28	public CapabilityQuery(RequiredCapability required) {	29	public CapabilityQuery(IRequiredCapability required) {
29	this.required = new RequiredCapability[] {required};	30	this.required = new IRequiredCapability[] {required};
30	}	31	}
31		32
32	/**	33	/**
Lines 35-41 Link Here
35	* for this query to be satisfied.	36	* for this query to be satisfied.
36	* @param required The required capabilities	37	* @param required The required capabilities
37	*/	38	*/
38	public CapabilityQuery(RequiredCapability[] required) {	39	public CapabilityQuery(IRequiredCapability[] required) {
39	this.required = required;	40	this.required = required;
40	}	41	}
41		42
Lines 43-49 Link Here
43	* Returns the required capability that this query is matching against.	44	* Returns the required capability that this query is matching against.
44	* @return the required capability that this query is matching against.	45	* @return the required capability that this query is matching against.
45	*/	46	*/
46	public RequiredCapability[] getRequiredCapabilities() {	47	public IRequiredCapability[] getRequiredCapabilities() {
47	return required;	48	return required;
48	}	49	}
49		50




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;

import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;

import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;

import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;

import java.util.*;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.core.Version;

		return original.getProperties();
	}

	public IProvidedCapability[] getProvidedCapabilities() {
		ArrayList result = new ArrayList();
		result.addAll(Arrays.asList(original.getProvidedCapabilities()));
		for (int i = 0; i < fragments.length; i++) {
			result.addAll(Arrays.asList(fragments[i].getProvidedCapabilities()));
		}
		return (IProvidedCapability[]) result.toArray(new IProvidedCapability[result.size()]);
	}

	public IRequiredCapability[] getRequiredCapabilities() {
		ArrayList result = new ArrayList();
		result.addAll(Arrays.asList(original.getRequiredCapabilities()));
		for (int i = 0; i < fragments.length; i++) {
			result.addAll(Arrays.asList(fragments[i].getRequiredCapabilities()));
		}
		return (IRequiredCapability[]) result.toArray(new IRequiredCapability[result.size()]);

	}

	public ITouchpointData[] getTouchpointData() {
		ArrayList result = new ArrayList();
		result.addAll(Arrays.asList(original.getTouchpointData()));
		for (int i = 0; i < fragments.length; i++) {
			ITouchpointData[] data = fragments[i].getTouchpointData();
			for (int j = 0; j < data.length; j++) {
				result.add(data[j]);
			}
		}
		return (ITouchpointData[]) result.toArray(new ITouchpointData[result.size()]);
	}

	public ITouchpointType getTouchpointType() {
		return original.getTouchpointType();
	}


		return original.getUpdateDescriptor();
	}

	public ILicense getLicense() {
		return original.getLicense();
	}

	public ICopyright getCopyright() {
		return original.getCopyright();
	}

	public boolean satisfies(IRequiredCapability candidate) {
		IProvidedCapability[] provides = getProvidedCapabilities();
		for (int i = 0; i < provides.length; i++)
			if (provides[i].satisfies(candidate))
				return true;




 *******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnitFragment;
import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;

public class InstallableUnitFragment extends InstallableUnit implements IInstallableUnitFragment {

	private IRequiredCapability[] hostRequirements;

	public InstallableUnitFragment() {
		super();
	}

	public void setHost(IRequiredCapability[] hostRequirements) {
		if (hostRequirements == null)
			return;
		this.hostRequirements = hostRequirements;
		addRequiredCapability(hostRequirements);
	}

	private void addRequiredCapability(IRequiredCapability[] toAdd) {
		IRequiredCapability[] current = super.getRequiredCapabilities();
		IRequiredCapability[] result = new IRequiredCapability[current.length + toAdd.length];
		System.arraycopy(current, 0, result, 0, current.length);
		System.arraycopy(toAdd, 0, result, current.length, toAdd.length);
		setRequiredCapabilities(result);

		return true;
	}

	public IRequiredCapability[] getHost() {
		return hostRequirements;
	}
}




import java.util.ArrayList;
import java.util.Map;
import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;
import org.eclipse.equinox.internal.provisional.p2.core.Version;
import org.eclipse.equinox.internal.provisional.p2.metadata.*;

public class InstallableUnit implements IInstallableUnit {

	private static final OrderedProperties NO_PROPERTIES = new OrderedProperties();
	private static final IProvidedCapability[] NO_PROVIDES = new IProvidedCapability[0];
	private static final IRequiredCapability[] NO_REQUIRES = new IRequiredCapability[0];
	private static final IArtifactKey[] NO_ARTIFACTS = new IArtifactKey[0];
	private static final ITouchpointData[] NO_TOUCHPOINT_DATA = new ITouchpointData[0];

	private IArtifactKey[] artifacts = NO_ARTIFACTS;
	private String filter;


	private OrderedProperties properties;
	private OrderedProperties localizedProperties;
	IProvidedCapability[] providedCapabilities = NO_PROVIDES;
	private IRequiredCapability[] requires = NO_REQUIRES;

	private boolean singleton;


	private Version version;

	private IUpdateDescriptor updateInfo;
	private ILicense license;
	private ICopyright copyright;

	public InstallableUnit() {
		super();
	}

	public void addTouchpointData(ITouchpointData newData) {
		ensureTouchpointDataCapacity(1);
		touchpointData.add(newData);
	}

		return properties().getProperty(key);
	}

	public IProvidedCapability[] getProvidedCapabilities() {
		return providedCapabilities;
	}

	public IRequiredCapability[] getRequiredCapabilities() {
		return requires;

	}

	public ITouchpointData[] getTouchpointData() {
		return (touchpointData == null ? NO_TOUCHPOINT_DATA //
				: (ITouchpointData[]) touchpointData.toArray(new ITouchpointData[touchpointData.size()]));
	}

	public ITouchpointType getTouchpointType() {
		return touchpointType != null ? touchpointType : ITouchpointType.NONE;
	}

	public Version getVersion() {

			artifacts = value;
	}

	public void setCapabilities(IProvidedCapability[] newCapabilities) {
		if (newCapabilities == null || newCapabilities.length == 0)
			providedCapabilities = NO_PROVIDES;
		else

		return (String) properties.setProperty(key, value);
	}

	public void setRequiredCapabilities(IRequiredCapability[] capabilities) {
		if (capabilities.length == 0) {
			this.requires = NO_REQUIRES;
		} else {
			//copy array for safety
			this.requires = (IRequiredCapability[]) capabilities.clone();
		}
	}


	}

	public void setTouchpointType(TouchpointType type) {
		this.touchpointType = (!ITouchpointType.NONE.equals(type) ? type : null);
	}

	public void setVersion(Version newVersion) {

		this.updateInfo = updateInfo;
	}

	public void setLicense(ILicense license) {
		this.license = license;
	}

	public ILicense getLicense() {
		return license;
	}

	public void setCopyright(ICopyright copyright) {
		this.copyright = copyright;
	}

	public ICopyright getCopyright() {
		return copyright;
	}

	public boolean satisfies(IRequiredCapability candidate) {
		IProvidedCapability[] provides = getProvidedCapabilities();
		for (int i = 0; i < provides.length; i++)
			if (provides[i].satisfies(candidate))
				return true;




 ******************************************************************************/
package org.eclipse.equinox.internal.p2.metadata;

import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;

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

import org.eclipse.equinox.internal.provisional.p2.metadata.*;

public class InstallableUnitPatch extends InstallableUnit implements IInstallableUnitPatch {
	private IRequirementChange[] changes;
	private IRequiredCapability lifeCycle;
	private IRequiredCapability[][] scope;

	private void addRequiredCapability(IRequiredCapability[] toAdd) {
		IRequiredCapability[] current = super.getRequiredCapabilities();
		IRequiredCapability[] result = new IRequiredCapability[current.length + toAdd.length];
		System.arraycopy(current, 0, result, 0, current.length);
		System.arraycopy(toAdd, 0, result, current.length, toAdd.length);
		setRequiredCapabilities(result);
	}

	public IRequiredCapability[][] getApplicabilityScope() {
		return scope;
	}

	public IRequiredCapability getLifeCycle() {
		return lifeCycle;
	}

	public IRequirementChange[] getRequirementsChange() {
		return changes;
	}

	public void setApplicabilityScope(IRequiredCapability[][] applyTo) {
		scope = applyTo;
	}

	public void setLifeCycle(IRequiredCapability lifeCycle) {
		if (lifeCycle == null)
			return;
		this.lifeCycle = lifeCycle;
		addRequiredCapability(new IRequiredCapability[] {lifeCycle});
	}

	public void setRequirementsChange(IRequirementChange[] changes) {
		this.changes = changes;
	}
}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import java.net.URI;

/**
 * The <code>ICopyright</code> interface represents a software copyright.  A copyright has 
 * required body text which may be the full text or a summary.  An optional location field can be specified
 * which links to full text.  
 */
public interface ICopyright {

	/**
	 * Returns the location of a document containing the copyright notice.
	 * 
	 * @return The location of the copyright notice, or <code>null</code>
	 */
	public URI getLocation();

	/**
	 * Returns the license body.
	 * 
	 * @return the license body, never <code>null</code>
	 */
	public String getBody();

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import java.util.Map;

/**
 * ITouchpoint data instances contain the additional information needed by a touchpoint
 * to execute each engine phase it participates in. This includes the sequence of
 * instruction statements to be executed during each phase, and any additional
 * supporting data needed to perform the phase.
 *
 * @see MetadataFactory#createTouchpointData(Map)
 */
public interface ITouchpointData {

	/**
	 * Returns the touchpoint instruction corresponding to the given key.
	 */
	public ITouchpointInstruction getInstruction(String instructionKey);

	/**
	 * Returns an unmodifiable map of the touchpoint instructions. The map
	 * keys are strings, and the values are instances of {@link ITouchpointInstruction}.
	 *
	 * @return the touchpoint instructions
	 */
	public Map getInstructions();

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;

/**
 * A required capability represents some external constraint on an {@link IInstallableUnit}.
 * Each capability represents something an {@link IInstallableUnit} needs that
 * it expects to be provided by another {@link IInstallableUnit}. Capabilities are
 * entirely generic, and are intended to be capable of representing anything that
 * an {@link IInstallableUnit} may need either at install time, or at runtime.
 * <p>
 * Capabilities are segmented into namespaces.  Anyone can introduce new 
 * capability namespaces. Some well-known namespaces are introduced directly
 * by the provisioning framework.
 * 
 * @see IInstallableUnit#NAMESPACE_IU_ID
 */
public interface IRequiredCapability {

	public String getFilter();

	public String getName();

	public String getNamespace();

	/**
	 * Returns the range of versions that satisfy this required capability. Returns
	 * an empty version range ({@link VersionRange#emptyRange} if any version
	 * will satisfy the capability.
	 * @return the range of versions that satisfy this required capability.
	 */
	public VersionRange getRange();

	/**
	 * Returns the properties to use for evaluating required capability filters 
	 * downstream from this capability. For example, if the selector "doc"
	 * is provided, then a downstream InstallableUnit with a required capability
	 * filtered with "doc=true" will be included.
	 */
	public String[] getSelectors();

	public boolean isMultiple();

	public boolean isOptional();

	/**
	 * TODO This object shouldn't be mutable since it makes equality unstable, and
	 * introduces lifecycle issues (how are the changes persisted, etc)
	 */
	public void setFilter(String filter);

	/**
	 * TODO This object shouldn't be mutable since it makes equality unstable, and
	 * introduces lifecycle issues (how are the changes persisted, etc)
	 */
	public void setSelectors(String[] selectors);

	public boolean isGreedy();

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

/**
 * A touchpoint instruction contains either a sequence of instruction statements
 * to be executed during a particular engine phase, or some simple string value
 * that is needed by a touchpoint to execute its phases.
 * <p>
 * The format of a touchpoint instruction statement sequence is as follows:
 * 
 *   statement-sequence :
 *     | statement ';'
 *      | statement-sequence statement
 *      ;
 *
 *Where a statement is of the format:
 *
 *  statement :
 *      | actionName '(' parameters ')'
 *      ;
 *
 *  parameters :
 *      | // empty
 *      | parameter
 *      | parameters ',' parameter
 *      ;
 *
 *   parameter : 
 *      | paramName ':' paramValue
 *      ;
 *
 * actionName, paramName, paramValue :
 *      | String 
 *      ;
 *
 */
public interface ITouchpointInstruction {

	/**
	 * Returns the body of this touchpoint instruction. The body is either a sequence
	 * of instruction statements, or a simple string value.
	 * 
	 * @return The body of this touchpoint instruction
	 */
	public String getBody();

	//TODO What is this? Please doc
	public String getImportAttribute();

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import java.math.BigInteger;
import java.net.URI;

/**
 * The <code>ILicense</code> interface represents a software license.  A license has required body text
 * which may be the full text or an annotation.  An optional URL field can be specified
 * which links to full text.  Licenses can be easily compared using their digests.
 */
public interface ILicense {

	/**
	 * Returns the location of a document containing the full license.
	 * 
	 * @return the location of the license document, or <code>null</code>
	 */
	public URI getLocation();

	/**
	 * Returns the license body.
	 * @return the license body, never <code>null</code>
	 */
	public String getBody();

	/**
	 * Returns the message digest of the license body.  The digest is calculated on a normalized
	 * version of the license where all whitespace has been reduced to one space.
	 * @return the message digest as a <code>BigInteger</code>, never <code>null</code>
	 */
	public BigInteger getDigest();

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

public interface IRequirementChange {

	public IRequiredCapability applyOn();

	public IRequiredCapability newValue();

	public boolean matches(IRequiredCapability toMatch);

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import org.eclipse.equinox.internal.provisional.p2.core.Version;

/**
 * Describes a capability as exposed or required by an installable unit
 */
public interface IProvidedCapability {

	public String getName();

	public String getNamespace();

	public Version getVersion();

	/**
	 * Returns whether this provided capability satisfies the given required capability.
	 * @return <code>true</code> if this capability satisfies the given required
	 * capability, and <code>false</code> otherwise.
	 */
	public boolean satisfies(IRequiredCapability candidate);

}




/******************************************************************************* 
* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
* program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
*   EclipseSource - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.provisional.p2.metadata;

import org.eclipse.equinox.internal.provisional.p2.core.Version;

/**
 * Identifies a particular touchpoint. A touchpoint is identified by an id 
 * and a version.
 */
public interface ITouchpointType {

	/**
	 * A touchpoint type indicating that the "null" touchpoint should be used.
	 * The null touchpoint does not participate in any install phase.
	 * 
	 * This TouchpointType should always be compared with .equals() as other SPIs
	 * may implement their own version.
	 */
	public static final TouchpointType NONE = new TouchpointType("null", Version.emptyVersion); //$NON-NLS-1$

	public String getId();

	public Version getVersion();

}

Return to bug 256359

Lines 10-19 Link Here

(-)src/org/eclipse/equinox/p2/tests/ui/query/CategoryElementCollectorTest.java (-2 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.equinox.p2.tests.ui.query;	11	package org.eclipse.equinox.p2.tests.ui.query;
12		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		14
13	import org.eclipse.equinox.internal.p2.ui.model.CategoryElement;	15	import org.eclipse.equinox.internal.p2.ui.model.CategoryElement;
14	import org.eclipse.equinox.internal.p2.ui.query.CategoryElementCollector;	16	import org.eclipse.equinox.internal.p2.ui.query.CategoryElementCollector;
15	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	17	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
16	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
17	import org.eclipse.equinox.internal.provisional.p2.query.Collector;	18	import org.eclipse.equinox.internal.provisional.p2.query.Collector;
18	import org.eclipse.equinox.p2.tests.MockQueryable;	19	import org.eclipse.equinox.p2.tests.MockQueryable;
19		20
Lines 83-89 Link Here
83	assertEquals("1.6", 1, collector.size());	84	assertEquals("1.6", 1, collector.size());
84		85
85	//adding a nested category shouldn't affected size	86	//adding a nested category shouldn't affected size
86	RequiredCapability[] required = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "category1", null);	87	IRequiredCapability[] required = createRequiredCapabilities(IInstallableUnit.NAMESPACE_IU_ID, "category1", null);
87	IInstallableUnit nested = createIU("Nested", required);	88	IInstallableUnit nested = createIU("Nested", required);
88	collector.accept(nested);	89	collector.accept(nested);
89	assertEquals("1.7", 1, collector.size());	90	assertEquals("1.7", 1, collector.size());

Lines 14-23 Link Here

(-)src/org/eclipse/equinox/internal/p2/engine/ActionManager.java (-6 / +6 lines)
14	import java.util.Map;	14	import java.util.Map;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
16	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;	16	import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
		17	import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
17	import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;	18	import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
18	import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint;	19	import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;	20	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
20	import org.eclipse.equinox.internal.provisional.p2.core.VersionRange;
21	import org.eclipse.osgi.util.NLS;	21	import org.eclipse.osgi.util.NLS;
22		22
23	public class ActionManager implements IRegistryChangeListener {	23	public class ActionManager implements IRegistryChangeListener {
Lines 37-51 Link Here
37	RegistryFactory.getRegistry().addRegistryChangeListener(this, EngineActivator.ID);	37	RegistryFactory.getRegistry().addRegistryChangeListener(this, EngineActivator.ID);
38	}	38	}
39		39
40	public Touchpoint getTouchpointPoint(TouchpointType type) {	40	public Touchpoint getTouchpointPoint(ITouchpointType type) {
41	if (type == null \|\| type == TouchpointType.NONE)	41	if (type == null \|\| ITouchpointType.NONE.equals(type))
42	return null;	42	return null;
43	return touchpointManager.getTouchpoint(type);	43	return touchpointManager.getTouchpoint(type);
44	}	44	}
45		45
46	public ProvisioningAction getTouchpointQualifiedAction(String actionId, TouchpointType type) {	46	public ProvisioningAction getTouchpointQualifiedAction(String actionId, ITouchpointType type) {
47	if (actionId.indexOf('.') == -1) {	47	if (actionId.indexOf('.') == -1) {
48	if (type == null \|\| type == TouchpointType.NONE)	48	if (type == null \|\| ITouchpointType.NONE.equals(type))
49	return null;	49	return null;
50		50
51	Touchpoint touchpoint = touchpointManager.getTouchpoint(type);	51	Touchpoint touchpoint = touchpointManager.getTouchpoint(type);

Lines 1-5 Link Here

(-)src/org/eclipse/equinox/p2/tests/engine/InstructionParserTest.java (-3 / +4 lines)
1	package org.eclipse.equinox.p2.tests.engine;	1	package org.eclipse.equinox.p2.tests.engine;
2		2
		3	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
		4
3	import org.eclipse.equinox.internal.p2.engine.InstructionParser;	5	import org.eclipse.equinox.internal.p2.engine.InstructionParser;
4		6
5	import java.util.Map;	7	import java.util.Map;
Lines 9-25 Link Here
9	import org.eclipse.equinox.internal.p2.engine.ActionManager;	11	import org.eclipse.equinox.internal.p2.engine.ActionManager;
10	import org.eclipse.equinox.internal.provisional.p2.engine.*;	12	import org.eclipse.equinox.internal.provisional.p2.engine.*;
11	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;	13	import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
12	import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
13	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;	14	import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
14	import org.eclipse.equinox.internal.provisional.p2.core.Version;	15	import org.eclipse.equinox.internal.provisional.p2.core.Version;
15		16
16	public class InstructionParserTest extends AbstractProvisioningTest {	17	public class InstructionParserTest extends AbstractProvisioningTest {
17		18
18	public static final TouchpointType TOUCHPOINT_TYPE = MetadataFactory.createTouchpointType("InstructionParserTestTouchpoint", new Version("1.0")); //$NON-NLS-1$ //$NON-NLS-2$	19	public static final ITouchpointType TOUCHPOINT_TYPE = MetadataFactory.createTouchpointType("InstructionParserTestTouchpoint", new Version("1.0")); //$NON-NLS-1$ //$NON-NLS-2$
19		20
20	public static class InstructionParserTestTouchpoint extends Touchpoint {	21	public static class InstructionParserTestTouchpoint extends Touchpoint {
21		22
22	public TouchpointType getTouchpointType() {	23	public ITouchpointType getTouchpointType() {
23	return TOUCHPOINT_TYPE;	24	return TOUCHPOINT_TYPE;
24	}	25	}
25		26

Lines 12-23 Link Here

(-)src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java (-3 / +4 lines)
12		12
13	import static org.easymock.EasyMock.expect;	13	import static org.easymock.EasyMock.expect;
14		14
		15	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		16
15	import java.util.ArrayList;	17	import java.util.ArrayList;
16	import java.util.Collection;	18	import java.util.Collection;
17	import org.eclipse.core.runtime.NullProgressMonitor;	19	import org.eclipse.core.runtime.NullProgressMonitor;
18	import org.eclipse.core.runtime.Status;	20	import org.eclipse.core.runtime.Status;
19	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;	21	import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
20	import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
21	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;	22	import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
22	import org.eclipse.equinox.internal.provisional.p2.query.Query;	23	import org.eclipse.equinox.internal.provisional.p2.query.Query;
23	import org.eclipse.equinox.p2.publisher.IPublisherResult;	24	import org.eclipse.equinox.p2.publisher.IPublisherResult;
Lines 270-276 Link Here
270	IInstallableUnit iu = (IInstallableUnit) ius.get(0);	271	IInstallableUnit iu = (IInstallableUnit) ius.get(0);
271	assertTrue(iu != null);	272	assertTrue(iu != null);
272	assertTrue(iu.getVersion().equals(versionArg));	273	assertTrue(iu.getVersion().equals(versionArg));
273	RequiredCapability[] required = iu.getRequiredCapabilities();	274	IRequiredCapability[] required = iu.getRequiredCapabilities();
274	if ((testSpec & EMPTY) > 0)	275	if ((testSpec & EMPTY) > 0)
275	assertEquals(required.length, 0);	276	assertEquals(required.length, 0);
276	String confirmedIUs = ""; //$NON-NLS-1$	277	String confirmedIUs = ""; //$NON-NLS-1$
Lines 296-302 Link Here
296	debug("Confirmed \t\t Empty"); //$NON-NLS-1$	297	debug("Confirmed \t\t Empty"); //$NON-NLS-1$
297	}	298	}
298		299
299	private boolean contains(RequiredCapability[] required, String iu) {	300	private boolean contains(IRequiredCapability[] required, String iu) {
300	for (int i = 0; i < required.length; i++)	301	for (int i = 0; i < required.length; i++)
301	if (required[i].getName().equalsIgnoreCase(iu))	302	if (required[i].getName().equalsIgnoreCase(iu))
302	return true;	303	return true;

Lines 61-75 Link Here

(-)src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java (-20 / +20 lines)
61	/**	61	/**
62	* A capability name in the {@link PublisherHelper#NAMESPACE_ECLIPSE_TYPE} namespace	62	* A capability name in the {@link PublisherHelper#NAMESPACE_ECLIPSE_TYPE} namespace
63	* representing and OSGi bundle resource	63	* representing and OSGi bundle resource
64	* @see RequiredCapability#getName()	64	* @see IRequiredCapability#getName()
65	* @see ProvidedCapability#getName()	65	* @see IProvidedCapability#getName()
66	*/	66	*/
67	public static final String TYPE_ECLIPSE_BUNDLE = "bundle"; //$NON-NLS-1$	67	public static final String TYPE_ECLIPSE_BUNDLE = "bundle"; //$NON-NLS-1$
68		68
69	/**	69	/**
70	* A capability name in the {@link PublisherHelper#NAMESPACE_ECLIPSE_TYPE} namespace	70	* A capability name in the {@link PublisherHelper#NAMESPACE_ECLIPSE_TYPE} namespace
71	* representing a source bundle	71	* representing a source bundle
72	* @see RequiredCapability#getName()	72	* @see IRequiredCapability#getName()
73	*/	73	*/
74	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$	74	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$
75		75
Lines 77-84 Link Here
77	private static final String CAPABILITY_NS_OSGI_BUNDLE = "osgi.bundle"; //$NON-NLS-1$	77	private static final String CAPABILITY_NS_OSGI_BUNDLE = "osgi.bundle"; //$NON-NLS-1$
78	private static final String CAPABILITY_NS_OSGI_FRAGMENT = "osgi.fragment"; //$NON-NLS-1$	78	private static final String CAPABILITY_NS_OSGI_FRAGMENT = "osgi.fragment"; //$NON-NLS-1$
79		79
80	public static final ProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new Version(1, 0, 0));	80	public static final IProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new Version(1, 0, 0));
81	public static final ProvidedCapability SOURCE_BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, new Version(1, 0, 0));	81	public static final IProvidedCapability SOURCE_BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, new Version(1, 0, 0));
82		82
83	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$	83	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$
84		84
Lines 109-121 Link Here
109	cu.setVersion(hostVersion);	109	cu.setVersion(hostVersion);
110		110
111	//Indicate the IU to which this CU apply	111	//Indicate the IU to which this CU apply
112	cu.setHost(new RequiredCapability[] { //	112	cu.setHost(new IRequiredCapability[] { //
113	MetadataFactory.createRequiredCapability(CAPABILITY_NS_OSGI_BUNDLE, hostId, new VersionRange(hostVersion, true, PublisherHelper.versionMax, true), null, false, false, true), //	113	MetadataFactory.createRequiredCapability(CAPABILITY_NS_OSGI_BUNDLE, hostId, new VersionRange(hostVersion, true, PublisherHelper.versionMax, true), null, false, false, true), //
114	MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new VersionRange(new Version(1, 0, 0), true, new Version(2, 0, 0), false), null, false, false, false)});	114	MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new VersionRange(new Version(1, 0, 0), true, new Version(2, 0, 0), false), null, false, false, false)});
115		115
116	//Adds capabilities for fragment, self, and describing the flavor supported	116	//Adds capabilities for fragment, self, and describing the flavor supported
117	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());	117	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
118	cu.setCapabilities(new ProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, hostVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});	118	cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, hostVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
119		119
120	Map touchpointData = new HashMap();	120	Map touchpointData = new HashMap();
121	touchpointData.put("install", "installBundle(bundle:${artifact})"); //$NON-NLS-1$ //$NON-NLS-2$	121	touchpointData.put("install", "installBundle(bundle:${artifact})"); //$NON-NLS-1$ //$NON-NLS-2$
Lines 166-172 Link Here
166	//TODO this needs to be refined to take into account all the attribute handled by imports	166	//TODO this needs to be refined to take into account all the attribute handled by imports
167	reqsDeps.add(MetadataFactory.createRequiredCapability(PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE, importPackageName, versionRange, null, isOptional(importSpec), false));	167	reqsDeps.add(MetadataFactory.createRequiredCapability(PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE, importPackageName, versionRange, null, isOptional(importSpec), false));
168	}	168	}
169	iu.setRequiredCapabilities((RequiredCapability[]) reqsDeps.toArray(new RequiredCapability[reqsDeps.size()]));	169	iu.setRequiredCapabilities((IRequiredCapability[]) reqsDeps.toArray(new IRequiredCapability[reqsDeps.size()]));
170		170
171	// Create set of provided capabilities	171	// Create set of provided capabilities
172	ArrayList providedCapabilities = new ArrayList();	172	ArrayList providedCapabilities = new ArrayList();
Lines 199-205 Link Here
199	providedCapabilities.add(PublisherHelper.makeTranslationCapability(bd.getSymbolicName(), locale));	199	providedCapabilities.add(PublisherHelper.makeTranslationCapability(bd.getSymbolicName(), locale));
200	}	200	}
201	}	201	}
202	iu.setCapabilities((ProvidedCapability[]) providedCapabilities.toArray(new ProvidedCapability[providedCapabilities.size()]));	202	iu.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));
203	processCapabilityAdvice(iu, bd, info);	203	processCapabilityAdvice(iu, bd, info);
204		204
205	// Set certain properties from the manifest header attributes as IU properties.	205	// Set certain properties from the manifest header attributes as IU properties.
Lines 263-280 Link Here
263	Collection advice = info.getAdvice(null, false, null, null, ICapabilityAdvice.class);	263	Collection advice = info.getAdvice(null, false, null, null, ICapabilityAdvice.class);
264	for (Iterator i = advice.iterator(); i.hasNext();) {	264	for (Iterator i = advice.iterator(); i.hasNext();) {
265	ICapabilityAdvice entry = (ICapabilityAdvice) i.next();	265	ICapabilityAdvice entry = (ICapabilityAdvice) i.next();
266	RequiredCapability[] requiredAdvice = entry.getRequiredCapabilities(iu);	266	IRequiredCapability[] requiredAdvice = entry.getRequiredCapabilities(iu);
267	ProvidedCapability[] providedAdvice = entry.getProvidedCapabilities(iu);	267	IProvidedCapability[] providedAdvice = entry.getProvidedCapabilities(iu);
268	if (providedAdvice != null) {	268	if (providedAdvice != null) {
269	RequiredCapability[] current = iu.getRequiredCapabilities();	269	IRequiredCapability[] current = iu.getRequiredCapabilities();
270	RequiredCapability[] result = new RequiredCapability[requiredAdvice.length + current.length];	270	IRequiredCapability[] result = new IRequiredCapability[requiredAdvice.length + current.length];
271	System.arraycopy(requiredAdvice, 0, result, 0, requiredAdvice.length);	271	System.arraycopy(requiredAdvice, 0, result, 0, requiredAdvice.length);
272	System.arraycopy(current, 0, result, requiredAdvice.length, current.length);	272	System.arraycopy(current, 0, result, requiredAdvice.length, current.length);
273	iu.setRequiredCapabilities(result);	273	iu.setRequiredCapabilities(result);
274	}	274	}
275	if (providedAdvice != null) {	275	if (providedAdvice != null) {
276	ProvidedCapability[] current = iu.getProvidedCapabilities();	276	IProvidedCapability[] current = iu.getProvidedCapabilities();
277	ProvidedCapability[] result = new ProvidedCapability[providedAdvice.length + current.length];	277	IProvidedCapability[] result = new IProvidedCapability[providedAdvice.length + current.length];
278	System.arraycopy(providedAdvice, 0, result, 0, providedAdvice.length);	278	System.arraycopy(providedAdvice, 0, result, 0, providedAdvice.length);
279	System.arraycopy(current, 0, result, providedAdvice.length, current.length);	279	System.arraycopy(current, 0, result, providedAdvice.length, current.length);
280	iu.setCapabilities(result);	280	iu.setCapabilities(result);
Lines 290-296 Link Here
290	*/	290	*/
291	private static void processTouchpointAdvice(InstallableUnitDescription iu, Map currentInstructions, IPublisherInfo info) {	291	private static void processTouchpointAdvice(InstallableUnitDescription iu, Map currentInstructions, IPublisherInfo info) {
292	Collection advice = info.getAdvice(null, false, iu.getId(), iu.getVersion(), ITouchpointAdvice.class);	292	Collection advice = info.getAdvice(null, false, iu.getId(), iu.getVersion(), ITouchpointAdvice.class);
293	TouchpointData result = MetadataFactory.createTouchpointData(currentInstructions);	293	ITouchpointData result = MetadataFactory.createTouchpointData(currentInstructions);
294	for (Iterator i = advice.iterator(); i.hasNext();) {	294	for (Iterator i = advice.iterator(); i.hasNext();) {
295	ITouchpointAdvice entry = (ITouchpointAdvice) i.next();	295	ITouchpointAdvice entry = (ITouchpointAdvice) i.next();
296	result = entry.getTouchpointData(result);	296	result = entry.getTouchpointData(result);
Lines 320-326 Link Here
320	fragment.setVersion(Version.fromOSGiVersion(bd.getVersion())); // TODO: is this a meaningful version?	320	fragment.setVersion(Version.fromOSGiVersion(bd.getVersion())); // TODO: is this a meaningful version?
321		321
322	HostSpecification hostSpec = bd.getHost();	322	HostSpecification hostSpec = bd.getHost();
323	RequiredCapability[] hostReqs = new RequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, hostSpec.getName(), VersionRange.fromOSGiVersionRange(hostSpec.getVersionRange()), null, false, false, false)};	323	IRequiredCapability[] hostReqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, hostSpec.getName(), VersionRange.fromOSGiVersionRange(hostSpec.getVersionRange()), null, false, false, false)};
324	fragment.setHost(hostReqs);	324	fragment.setHost(hostReqs);
325		325
326	fragment.setSingleton(true);	326	fragment.setSingleton(true);
Lines 339-345 Link Here
339	}	339	}
340	providedCapabilities.add(PublisherHelper.makeTranslationCapability(hostId, locale));	340	providedCapabilities.add(PublisherHelper.makeTranslationCapability(hostId, locale));
341	}	341	}
342	fragment.setCapabilities((ProvidedCapability[]) providedCapabilities.toArray(new ProvidedCapability[providedCapabilities.size()]));	342	fragment.setCapabilities((IProvidedCapability[]) providedCapabilities.toArray(new IProvidedCapability[providedCapabilities.size()]));
343		343
344	return MetadataFactory.createInstallableUnitFragment(fragment);	344	return MetadataFactory.createInstallableUnitFragment(fragment);
345	}	345	}
Lines 385-394 Link Here
385		385
386	// Add capabilities for fragment, self, and describing the flavor supported	386	// Add capabilities for fragment, self, and describing the flavor supported
387	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());	387	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
388	cu.setCapabilities(new ProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});	388	cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
389		389
390	// Create a required capability on bundles	390	// Create a required capability on bundles
391	RequiredCapability[] reqs = new RequiredCapability[] {MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, VersionRange.emptyRange, null, false, true, false)};	391	IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, VersionRange.emptyRange, null, false, true, false)};
392	cu.setHost(reqs);	392	cu.setHost(reqs);
393	Map touchpointData = new HashMap();	393	Map touchpointData = new HashMap();
394		394

Lines 38-67 Link Here

(-)src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java (-13 / +13 lines)
38	public class PublisherHelper {	38	public class PublisherHelper {
39	/**	39	/**
40	* A capability namespace representing the type of Eclipse resource (bundle, feature, source bundle, etc)	40	* A capability namespace representing the type of Eclipse resource (bundle, feature, source bundle, etc)
41	* @see RequiredCapability#getNamespace()	41	* @see IRequiredCapability#getNamespace()
42	* @see ProvidedCapability#getNamespace()	42	* @see IProvidedCapability#getNamespace()
43	*/	43	*/
44	public static final String NAMESPACE_ECLIPSE_TYPE = "org.eclipse.equinox.p2.eclipse.type"; //$NON-NLS-1$	44	public static final String NAMESPACE_ECLIPSE_TYPE = "org.eclipse.equinox.p2.eclipse.type"; //$NON-NLS-1$
45		45
46	/**	46	/**
47	* A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace	47	* A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace
48	* representing a feature	48	* representing a feature
49	* @see RequiredCapability#getName()	49	* @see IRequiredCapability#getName()
50	*/	50	*/
51	public static final String TYPE_ECLIPSE_FEATURE = "feature"; //$NON-NLS-1$	51	public static final String TYPE_ECLIPSE_FEATURE = "feature"; //$NON-NLS-1$
52		52
53	/**	53	/**
54	* A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace	54	* A capability name in the {@link #NAMESPACE_ECLIPSE_TYPE} namespace
55	* representing a source bundle	55	* representing a source bundle
56	* @see RequiredCapability#getName()	56	* @see IRequiredCapability#getName()
57	*/	57	*/
58	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$	58	public static final String TYPE_ECLIPSE_SOURCE = "source"; //$NON-NLS-1$
59		59
60	/**	60	/**
61	* A capability namespace representing the localization (translation)	61	* A capability namespace representing the localization (translation)
62	* of strings from a specified IU in a specified locale	62	* of strings from a specified IU in a specified locale
63	* @see RequiredCapability#getNamespace()	63	* @see IRequiredCapability#getNamespace()
64	* @see ProvidedCapability#getNamespace()	64	* @see IProvidedCapability#getNamespace()
65	* TODO: this should be in API, probably in IInstallableUnit	65	* TODO: this should be in API, probably in IInstallableUnit
66	*/	66	*/
67	public static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$	67	public static final String NAMESPACE_IU_LOCALIZATION = "org.eclipse.equinox.p2.localization"; //$NON-NLS-1$
Lines 88-94 Link Here
88	public static final TouchpointType TOUCHPOINT_NATIVE = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.native", new Version(1, 0, 0)); //$NON-NLS-1$	88	public static final TouchpointType TOUCHPOINT_NATIVE = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.native", new Version(1, 0, 0)); //$NON-NLS-1$
89	public static final TouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", new Version(1, 0, 0)); //$NON-NLS-1$	89	public static final TouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", new Version(1, 0, 0)); //$NON-NLS-1$
90		90
91	public static final ProvidedCapability FEATURE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, new Version(1, 0, 0));	91	public static final IProvidedCapability FEATURE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, new Version(1, 0, 0));
92		92
93	public static IArtifactDescriptor createArtifactDescriptor(IArtifactKey key, File pathOnDisk) {	93	public static IArtifactDescriptor createArtifactDescriptor(IArtifactKey key, File pathOnDisk) {
94	//TODO this size calculation is bogus	94	//TODO this size calculation is bogus
Lines 142-148 Link Here
142	}	142	}
143	}	143	}
144		144
145	public static ProvidedCapability makeTranslationCapability(String hostId, Locale locale) {	145	public static IProvidedCapability makeTranslationCapability(String hostId, Locale locale) {
146	return MetadataFactory.createProvidedCapability(NAMESPACE_IU_LOCALIZATION, locale.toString(), new Version(1, 0, 0));	146	return MetadataFactory.createProvidedCapability(NAMESPACE_IU_LOCALIZATION, locale.toString(), new Version(1, 0, 0));
147	}	147	}
148		148
Lines 159-168 Link Here
159		159
160	// Add capabilities for fragment, self, and describing the flavor supported	160	// Add capabilities for fragment, self, and describing the flavor supported
161	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());	161	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
162	cu.setCapabilities(new ProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});	162	cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
163		163
164	// Create a required capability on features	164	// Create a required capability on features
165	RequiredCapability[] reqs = new RequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, VersionRange.emptyRange, null, true, true, false)};	165	IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, VersionRange.emptyRange, null, true, true, false)};
166	cu.setHost(reqs);	166	cu.setHost(reqs);
167		167
168	cu.setFilter(INSTALL_FEATURES_FILTER);	168	cu.setFilter(INSTALL_FEATURES_FILTER);
Lines 183-192 Link Here
183		183
184	// Add capabilities for fragment, self, and describing the flavor supported	184	// Add capabilities for fragment, self, and describing the flavor supported
185	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());	185	cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
186	cu.setCapabilities(new ProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});	186	cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
187		187
188	// Create a required capability on source providers	188	// Create a required capability on source providers
189	RequiredCapability[] reqs = new RequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, VersionRange.emptyRange, null, true, true, false)};	189	IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, VersionRange.emptyRange, null, true, true, false)};
190	cu.setHost(reqs);	190	cu.setHost(reqs);
191	Map touchpointData = new HashMap();	191	Map touchpointData = new HashMap();
192		192
Lines 222-228 Link Here
222	return new ArtifactKey(BINARY_ARTIFACT_CLASSIFIER, id, version);	222	return new ArtifactKey(BINARY_ARTIFACT_CLASSIFIER, id, version);
223	}	223	}
224		224
225	public static ProvidedCapability createSelfCapability(String installableUnitId, Version installableUnitVersion) {	225	public static IProvidedCapability createSelfCapability(String installableUnitId, Version installableUnitVersion) {
226	return MetadataFactory.createProvidedCapability(IU_NAMESPACE, installableUnitId, installableUnitVersion);	226	return MetadataFactory.createProvidedCapability(IU_NAMESPACE, installableUnitId, installableUnitVersion);
227	}	227	}
228		228

Lines 11-16 Link Here

(-)src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java (-14 / +30 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.internal.p2.metadata.repository.io;	12	package org.eclipse.equinox.internal.p2.metadata.repository.io;
13		13
		14	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
		15
		16	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;
		17
		18	import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
		19
		20	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequirementChange;
		21
		22	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		23
		24	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		25
		26	import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;
		27
		28	import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;
		29
14	import java.io.OutputStream;	30	import java.io.OutputStream;
15	import java.io.UnsupportedEncodingException;	31	import java.io.UnsupportedEncodingException;
16	import java.util.Iterator;	32	import java.util.Iterator;
Lines 79-85 Link Here
79	end(INSTALLABLE_UNIT_ELEMENT);	95	end(INSTALLABLE_UNIT_ELEMENT);
80	}	96	}
81		97
82	protected void writeLifeCycle(RequiredCapability capability) {	98	protected void writeLifeCycle(IRequiredCapability capability) {
83	if (capability == null)	99	if (capability == null)
84	return;	100	return;
85	start(LIFECYCLE);	101	start(LIFECYCLE);
Lines 87-93 Link Here
87	end(LIFECYCLE);	103	end(LIFECYCLE);
88	}	104	}
89		105
90	protected void writeHostRequiredCapabilities(RequiredCapability[] capabilities) {	106	protected void writeHostRequiredCapabilities(IRequiredCapability[] capabilities) {
91	if (capabilities != null && capabilities.length > 0) {	107	if (capabilities != null && capabilities.length > 0) {
92	start(HOST_REQUIRED_CAPABILITIES_ELEMENT);	108	start(HOST_REQUIRED_CAPABILITIES_ELEMENT);
93	attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);	109	attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);
Lines 98-104 Link Here
98	}	114	}
99	}	115	}
100		116
101	protected void writeProvidedCapabilities(ProvidedCapability[] capabilities) {	117	protected void writeProvidedCapabilities(IProvidedCapability[] capabilities) {
102	if (capabilities != null && capabilities.length > 0) {	118	if (capabilities != null && capabilities.length > 0) {
103	start(PROVIDED_CAPABILITIES_ELEMENT);	119	start(PROVIDED_CAPABILITIES_ELEMENT);
104	attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);	120	attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);
Lines 113-119 Link Here
113	}	129	}
114	}	130	}
115		131
116	protected void writeRequiredCapabilities(RequiredCapability[] capabilities) {	132	protected void writeRequiredCapabilities(IRequiredCapability[] capabilities) {
117	if (capabilities != null && capabilities.length > 0) {	133	if (capabilities != null && capabilities.length > 0) {
118	start(REQUIRED_CAPABILITIES_ELEMENT);	134	start(REQUIRED_CAPABILITIES_ELEMENT);
119	attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);	135	attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);
Lines 136-142 Link Here
136	end(UPDATE_DESCRIPTOR_ELEMENT);	152	end(UPDATE_DESCRIPTOR_ELEMENT);
137	}	153	}
138		154
139	protected void writeApplicabilityScope(RequiredCapability[][] capabilities) {	155	protected void writeApplicabilityScope(IRequiredCapability[][] capabilities) {
140	start(APPLICABILITY_SCOPE);	156	start(APPLICABILITY_SCOPE);
141	for (int i = 0; i < capabilities.length; i++) {	157	for (int i = 0; i < capabilities.length; i++) {
142	start(APPLY_ON);	158	start(APPLY_ON);
Lines 146-152 Link Here
146	end(APPLICABILITY_SCOPE);	162	end(APPLICABILITY_SCOPE);
147	}	163	}
148		164
149	protected void writeRequirementsChange(RequirementChange[] changes) {	165	protected void writeRequirementsChange(IRequirementChange[] changes) {
150	start(REQUIREMENT_CHANGES);	166	start(REQUIREMENT_CHANGES);
151	for (int i = 0; i < changes.length; i++) {	167	for (int i = 0; i < changes.length; i++) {
152	writeRequirementChange(changes[i]);	168	writeRequirementChange(changes[i]);
Lines 154-160 Link Here
154	end(REQUIREMENT_CHANGES);	170	end(REQUIREMENT_CHANGES);
155	}	171	}
156		172
157	protected void writeRequirementChange(RequirementChange change) {	173	protected void writeRequirementChange(IRequirementChange change) {
158	start(REQUIREMENT_CHANGE);	174	start(REQUIREMENT_CHANGE);
159	if (change.applyOn() != null) {	175	if (change.applyOn() != null) {
160	start(REQUIREMENT_FROM);	176	start(REQUIREMENT_FROM);
Lines 169-175 Link Here
169	end(REQUIREMENT_CHANGE);	185	end(REQUIREMENT_CHANGE);
170	}	186	}
171		187
172	protected void writeRequiredCapability(RequiredCapability capability) {	188	protected void writeRequiredCapability(IRequiredCapability capability) {
173	start(REQUIRED_CAPABILITY_ELEMENT);	189	start(REQUIRED_CAPABILITY_ELEMENT);
174	attribute(NAMESPACE_ATTRIBUTE, capability.getNamespace());	190	attribute(NAMESPACE_ATTRIBUTE, capability.getNamespace());
175	attribute(NAME_ATTRIBUTE, capability.getName());	191	attribute(NAME_ATTRIBUTE, capability.getName());
Lines 207-225 Link Here
207	}	223	}
208	}	224	}
209		225
210	protected void writeTouchpointType(TouchpointType touchpointType) {	226	protected void writeTouchpointType(ITouchpointType touchpointType) {
211	start(TOUCHPOINT_TYPE_ELEMENT);	227	start(TOUCHPOINT_TYPE_ELEMENT);
212	attribute(ID_ATTRIBUTE, touchpointType.getId());	228	attribute(ID_ATTRIBUTE, touchpointType.getId());
213	attribute(VERSION_ATTRIBUTE, touchpointType.getVersion());	229	attribute(VERSION_ATTRIBUTE, touchpointType.getVersion());
214	end(TOUCHPOINT_TYPE_ELEMENT);	230	end(TOUCHPOINT_TYPE_ELEMENT);
215	}	231	}
216		232
217	protected void writeTouchpointData(TouchpointData[] touchpointData) {	233	protected void writeTouchpointData(ITouchpointData[] touchpointData) {
218	if (touchpointData != null && touchpointData.length > 0) {	234	if (touchpointData != null && touchpointData.length > 0) {
219	start(TOUCHPOINT_DATA_ELEMENT);	235	start(TOUCHPOINT_DATA_ELEMENT);
220	attribute(COLLECTION_SIZE_ATTRIBUTE, touchpointData.length);	236	attribute(COLLECTION_SIZE_ATTRIBUTE, touchpointData.length);
221	for (int i = 0; i < touchpointData.length; i++) {	237	for (int i = 0; i < touchpointData.length; i++) {
222	TouchpointData nextData = touchpointData[i];	238	ITouchpointData nextData = touchpointData[i];
223	Map instructions = nextData.getInstructions();	239	Map instructions = nextData.getInstructions();
224	if (instructions.size() > 0) {	240	if (instructions.size() > 0) {
225	start(TOUCHPOINT_DATA_INSTRUCTIONS_ELEMENT);	241	start(TOUCHPOINT_DATA_INSTRUCTIONS_ELEMENT);
Lines 228-234 Link Here
228	Map.Entry entry = (Map.Entry) iter.next();	244	Map.Entry entry = (Map.Entry) iter.next();
229	start(TOUCHPOINT_DATA_INSTRUCTION_ELEMENT);	245	start(TOUCHPOINT_DATA_INSTRUCTION_ELEMENT);
230	attribute(TOUCHPOINT_DATA_INSTRUCTION_KEY_ATTRIBUTE, entry.getKey());	246	attribute(TOUCHPOINT_DATA_INSTRUCTION_KEY_ATTRIBUTE, entry.getKey());
231	TouchpointInstruction instruction = (TouchpointInstruction) entry.getValue();	247	ITouchpointInstruction instruction = (ITouchpointInstruction) entry.getValue();
232	if (instruction.getImportAttribute() != null)	248	if (instruction.getImportAttribute() != null)
233	attribute(TOUCHPOINT_DATA_INSTRUCTION_IMPORT_ATTRIBUTE, instruction.getImportAttribute());	249	attribute(TOUCHPOINT_DATA_INSTRUCTION_IMPORT_ATTRIBUTE, instruction.getImportAttribute());
234	cdata(instruction.getBody(), true);	250	cdata(instruction.getBody(), true);
Lines 249-255 Link Here
249	}	265	}
250	}	266	}
251		267
252	private void writeLicenses(License license) {	268	private void writeLicenses(ILicense license) {
253	if (license != null) {	269	if (license != null) {
254	// In the future there may be more than one license, so we write this	270	// In the future there may be more than one license, so we write this
255	// as a collection of one.	271	// as a collection of one.
Lines 265-271 Link Here
265	}	281	}
266	}	282	}
267		283
268	private void writeCopyright(Copyright copyright) {	284	private void writeCopyright(ICopyright copyright) {
269	if (copyright != null) {	285	if (copyright != null) {
270	start(COPYRIGHT_ELEMENT);	286	start(COPYRIGHT_ELEMENT);
271	try {	287	try {

Lines 25-37 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitPatch.java (-3 / +3 lines)
25	* a scope of [[r1, r2, r3], [r4, r5]] will match any unit whose provided capabilities	25	* a scope of [[r1, r2, r3], [r4, r5]] will match any unit whose provided capabilities
26	* satisfy the expression ((r1 ^ r2 ^ r3) \| (r4 ^ r5)).	26	* satisfy the expression ((r1 ^ r2 ^ r3) \| (r4 ^ r5)).
27	*/	27	*/
28	RequiredCapability[][] getApplicabilityScope();	28	IRequiredCapability[][] getApplicabilityScope();
29		29
30	/**	30	/**
31	* Returns the requirement changes imposed by the patch.	31	* Returns the requirement changes imposed by the patch.
32	* @return The patch requirement changes.	32	* @return The patch requirement changes.
33	*/	33	*/
34	RequirementChange[] getRequirementsChange();	34	IRequirementChange[] getRequirementsChange();
35		35
36	/**	36	/**
37	* Returns the required capability that defines the lifecycle of this patch. The	37	* Returns the required capability that defines the lifecycle of this patch. The
Lines 39-43 Link Here
39	* is satisfied by some IU in the profile. If a future provisioning operation causes	39	* is satisfied by some IU in the profile. If a future provisioning operation causes
40	* the requirement to no longer be satisfied, the patch will be uninstalled.	40	* the requirement to no longer be satisfied, the patch will be uninstalled.
41	*/	41	*/
42	RequiredCapability getLifeCycle();	42	IRequiredCapability getLifeCycle();
43	}	43	}

Lines 16-28 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java (-10 / +4 lines)
16	* Identifies a particular touchpoint. A touchpoint is identified by an id	16	* Identifies a particular touchpoint. A touchpoint is identified by an id
17	* and a version.	17	* and a version.
18	*/	18	*/
19	public class TouchpointType {	19	public class TouchpointType implements ITouchpointType {
20	/**
21	* A touchpoint type indicating that the "null" touchpoint should be used.
22	* The null touchpoint does not participate in any install phase.
23	*/
24	public static final TouchpointType NONE = new TouchpointType("null", Version.emptyVersion); //$NON-NLS-1$
25
26	private String id;//never null	20	private String id;//never null
27	private Version version;//never null	21	private Version version;//never null
28		22
Lines 36-45 Link Here
36	return true;	30	return true;
37	if (super.equals(obj))	31	if (super.equals(obj))
38	return true;	32	return true;
39	if (getClass() != obj.getClass())	33	if (obj == null \|\| obj instanceof ITouchpointType)
40	return false;	34	return false;
41	TouchpointType other = (TouchpointType) obj;	35	ITouchpointType other = (ITouchpointType) obj;
42	return id.equals(other.id) && version.equals(other.version);	36	return id.equals(other.getId()) && version.equals(other.getVersion());
43	}	37	}
44		38
45	public String getId() {	39	public String getId() {

Lines 24-30 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java (-10 / +10 lines)
24	*	24	*
25	* @see IInstallableUnit#NAMESPACE_IU_ID	25	* @see IInstallableUnit#NAMESPACE_IU_ID
26	*/	26	*/
27	public class RequiredCapability {	27	public class RequiredCapability implements IRequiredCapability {
28	private static final String[] NO_SELECTORS = new String[0];	28	private static final String[] NO_SELECTORS = new String[0];
29		29
30	private String filter;	30	private String filter;
Lines 60-82 Link Here
60	return true;	60	return true;
61	if (obj == null)	61	if (obj == null)
62	return false;	62	return false;
63	if (getClass() != obj.getClass())	63	if (!(obj instanceof IRequiredCapability))
64	return false;	64	return false;
65	final RequiredCapability other = (RequiredCapability) obj;	65	final IRequiredCapability other = (IRequiredCapability) obj;
66	if (filter == null) {	66	if (filter == null) {
67	if (other.filter != null)	67	if (other.getFilter() != null)
68	return false;	68	return false;
69	} else if (!filter.equals(other.filter))	69	} else if (!filter.equals(other.getFilter()))
70	return false;	70	return false;
71	if (multiple != other.multiple)	71	if (multiple != other.isMultiple())
72	return false;	72	return false;
73	if (!name.equals(other.name))	73	if (!name.equals(other.getName()))
74	return false;	74	return false;
75	if (!namespace.equals(other.namespace))	75	if (!namespace.equals(other.getNamespace()))
76	return false;	76	return false;
77	if (optional != other.optional)	77	if (optional != other.isOptional())
78	return false;	78	return false;
79	if (!range.equals(other.range))	79	if (!range.equals(other.getRange()))
80	return false;	80	return false;
81	return true;	81	return true;
82	}	82	}

Lines 8-13 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java (-15 / +19 lines)
8	******************************************************************************/	8	******************************************************************************/
9	package org.eclipse.equinox.internal.provisional.p2.metadata.generator;	9	package org.eclipse.equinox.internal.provisional.p2.metadata.generator;
10		10
		11	import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
		12
		13	import org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability;
		14
11	import java.io.*;	15	import java.io.*;
12	import java.net.URI;	16	import java.net.URI;
13	import java.net.URISyntaxException;	17	import java.net.URISyntaxException;
Lines 233-245 Link Here
233	}	237	}
234	if (requires != null)	238	if (requires != null)
235	reqsConfigurationUnits.addAll(requires);	239	reqsConfigurationUnits.addAll(requires);
236	root.setRequiredCapabilities((RequiredCapability[]) reqsConfigurationUnits.toArray(new RequiredCapability[reqsConfigurationUnits.size()]));	240	root.setRequiredCapabilities((IRequiredCapability[]) reqsConfigurationUnits.toArray(new IRequiredCapability[reqsConfigurationUnits.size()]));
237	root.setArtifacts(new IArtifactKey[0]);	241	root.setArtifacts(new IArtifactKey[0]);
238		242
239	root.setProperty("lineUp", "true"); //$NON-NLS-1$ //$NON-NLS-2$	243	root.setProperty("lineUp", "true"); //$NON-NLS-1$ //$NON-NLS-2$
240	root.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(configurationIdentification, VersionRange.emptyRange, IUpdateDescriptor.NORMAL, null));	244	root.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(configurationIdentification, VersionRange.emptyRange, IUpdateDescriptor.NORMAL, null));
241	root.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());	245	root.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());
242	root.setCapabilities(new ProvidedCapability[] {MetadataGeneratorHelper.createSelfCapability(configurationIdentification, new Version(configurationVersion))});	246	root.setCapabilities(new IProvidedCapability[] {MetadataGeneratorHelper.createSelfCapability(configurationIdentification, new Version(configurationVersion))});
243	root.setTouchpointType(MetadataGeneratorHelper.TOUCHPOINT_OSGI);	247	root.setTouchpointType(MetadataGeneratorHelper.TOUCHPOINT_OSGI);
244	Map touchpointData = new HashMap();	248	Map touchpointData = new HashMap();
245		249
Lines 697-704 Link Here
697	IInstallableUnit iu = (IInstallableUnit) iterator.next();	701	IInstallableUnit iu = (IInstallableUnit) iterator.next();
698	required.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, iu.getId(), VersionRange.emptyRange, iu.getFilter(), false, false));	702	required.add(MetadataFactory.createRequiredCapability(IInstallableUnit.NAMESPACE_IU_ID, iu.getId(), VersionRange.emptyRange, iu.getFilter(), false, false));
699	}	703	}
700	cat.setRequiredCapabilities((RequiredCapability[]) required.toArray(new RequiredCapability[required.size()]));	704	cat.setRequiredCapabilities((IRequiredCapability[]) required.toArray(new IRequiredCapability[required.size()]));
701	cat.setCapabilities(new ProvidedCapability[] {MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, categoryId, Version.emptyVersion)});	705	cat.setCapabilities(new IProvidedCapability[] {MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, categoryId, Version.emptyVersion)});
702	cat.setArtifacts(new IArtifactKey[0]);	706	cat.setArtifacts(new IArtifactKey[0]);
703	cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$	707	cat.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, "true"); //$NON-NLS-1$
704	return MetadataFactory.createInstallableUnit(cat);	708	return MetadataFactory.createInstallableUnit(cat);
Lines 797-809 Link Here
797	IArtifactKey key = MetadataGeneratorHelper.createLauncherArtifactKey(launcherId, launcherVersion);	801	IArtifactKey key = MetadataGeneratorHelper.createLauncherArtifactKey(launcherId, launcherVersion);
798	iu.setArtifacts(new IArtifactKey[] {key});	802	iu.setArtifacts(new IArtifactKey[] {key});
799	iu.setTouchpointType(MetadataGeneratorHelper.TOUCHPOINT_NATIVE);	803	iu.setTouchpointType(MetadataGeneratorHelper.TOUCHPOINT_NATIVE);
800	ProvidedCapability launcherCapability = MetadataFactory.createProvidedCapability(info.getFlavor() + productNamespace, launcherIdPrefix, launcherVersion);	804	IProvidedCapability launcherCapability = MetadataFactory.createProvidedCapability(info.getFlavor() + productNamespace, launcherIdPrefix, launcherVersion);

Lines 48-54 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointInstruction.java (-7 / +7 lines)
48	* @noextend This class is not intended to be subclassed by clients.	48	* @noextend This class is not intended to be subclassed by clients.
49	* @see MetadataFactory#createTouchpointInstruction(String, String)	49	* @see MetadataFactory#createTouchpointInstruction(String, String)
50	*/	50	*/
51	public class TouchpointInstruction {	51	public class TouchpointInstruction implements ITouchpointInstruction {
52		52
53	private final String body;	53	private final String body;
54	private final String importAttribute;	54	private final String importAttribute;
Lines 112-129 Link Here
112	return true;	112	return true;
113	if (obj == null)	113	if (obj == null)
114	return false;	114	return false;
115	if (getClass() != obj.getClass())	115	if (!(obj instanceof ITouchpointInstruction))
116	return false;	116	return false;
117	TouchpointInstruction other = (TouchpointInstruction) obj;	117	ITouchpointInstruction other = (ITouchpointInstruction) obj;
118	if (body == null) {	118	if (body == null) {
119	if (other.body != null)	119	if (other.getBody() != null)
120	return false;	120	return false;
121	} else if (!body.equals(other.body))	121	} else if (!body.equals(other.getBody()))
122	return false;	122	return false;
123	if (importAttribute == null) {	123	if (importAttribute == null) {
124	if (other.importAttribute != null)	124	if (other.getImportAttribute() != null)
125	return false;	125	return false;
126	} else if (!importAttribute.equals(other.importAttribute))	126	} else if (!importAttribute.equals(other.getImportAttribute()))
127	return false;	127	return false;
128	return true;	128	return true;
129	}	129	}

Lines 192-204 Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java (-7 / +7 lines)
192		192
193	public String getProperty(String key);	193	public String getProperty(String key);
194		194
195	public ProvidedCapability[] getProvidedCapabilities();	195	public IProvidedCapability[] getProvidedCapabilities();
196		196
197	public RequiredCapability[] getRequiredCapabilities();	197	public IRequiredCapability[] getRequiredCapabilities();
198		198
199	public TouchpointData[] getTouchpointData();	199	public ITouchpointData[] getTouchpointData();
200		200
201	public TouchpointType getTouchpointType();	201	public ITouchpointType getTouchpointType();
202		202
203	public Version getVersion();	203	public Version getVersion();
204		204
Lines 224-230 Link Here
224	* @return <code>true</code> if this unit satisfies the given required	224	* @return <code>true</code> if this unit satisfies the given required
225	* capability, and <code>false</code> otherwise.	225	* capability, and <code>false</code> otherwise.
226	*/	226	*/
227	public boolean satisfies(RequiredCapability candidate);	227	public boolean satisfies(IRequiredCapability candidate);
228		228
229	/**	229	/**
230	* Returns the unresolved equivalent of this installable unit. If this unit is	230	* Returns the unresolved equivalent of this installable unit. If this unit is
Lines 248-258 Link Here
248	* Returns the license that applies to this installable unit.	248	* Returns the license that applies to this installable unit.
249	* @return the license that applies to this installable unit or <code>null</code>	249	* @return the license that applies to this installable unit or <code>null</code>
250	*/	250	*/
251	public License getLicense();	251	public ILicense getLicense();
252		252
253	/**	253	/**
254	* Returns the copyright that applies to this installable unit.	254	* Returns the copyright that applies to this installable unit.
255	* @return the copyright that applies to this installable unit or <code>null</code>	255	* @return the copyright that applies to this installable unit or <code>null</code>
256	*/	256	*/
257	public Copyright getCopyright();	257	public ICopyright getCopyright();
258	}	258	}

Added Link Here

(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/ICopyright.java (+35 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 EclipseSource and others. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* EclipseSource - initial API and implementation
9	******************************************************************************/
10	package org.eclipse.equinox.internal.provisional.p2.metadata;
11
12	import java.net.URI;
13
14	/**
15	* The <code>ICopyright</code> interface represents a software copyright. A copyright has
16	* required body text which may be the full text or a summary. An optional location field can be specified
17	* which links to full text.
18	*/
19	public interface ICopyright {
20
21	/**
22	* Returns the location of a document containing the copyright notice.
23	*
24	* @return The location of the copyright notice, or <code>null</code>
25	*/
26	public URI getLocation();
27
28	/**
29	* Returns the license body.
30	*
31	* @return the license body, never <code>null</code>
32	*/
33	public String getBody();
34
35	}