Attachment 120442 Details for Bug 256359 – patch to create interfaces for the metadata classes

[patch] patch to create interfaces for the metadata classes

metadatapatch_p2.txt (text/plain), 158.89 KB, created by Ian Bull

on 2008-12-15 02:53:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2008-12-15 02:53:45 EST

Size: 158.89 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.tools
>Index: src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java,v
>retrieving revision 1.4
>diff -u -r1.4 MetadataCompareApplication.java
>--- src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java	9 Oct 2008 03:22:40 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/tools/MetadataCompareApplication.java	15 Dec 2008 07:48:26 -0000
>@@ -20,7 +20,7 @@
> import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> 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.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.metadata.query.InstallableUnitQuery;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
>@@ -175,7 +175,7 @@
> 		return result;
> 	}
> 
>-	private boolean compareRequires(RequiredCapability[] a, RequiredCapability[] b) {
>+	private boolean compareRequires(IRequiredCapability[] a, IRequiredCapability[] b) {
> 		if (a == null)
> 			return b == null;
> 		if (a.length != b.length)
>@@ -188,9 +188,9 @@
> 		return true;
> 	}
> 
>-	private RequiredCapability findCapability(RequiredCapability target, RequiredCapability[] b) {
>+	private IRequiredCapability findCapability(IRequiredCapability target, IRequiredCapability[] b) {
> 		for (int i = 0; i < b.length; i++) {
>-			RequiredCapability capability = b[i];
>+			IRequiredCapability capability = b[i];
> 			if (target.equals(capability))
> 				return capability;
> 		}
>#P org.eclipse.equinox.p2.metadata.repository
>Index: src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java,v
>retrieving revision 1.16
>diff -u -r1.16 MetadataWriter.java
>--- src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java	17 Oct 2008 17:38:30 -0000	1.16
>+++ src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java	15 Dec 2008 07:48:27 -0000
>@@ -87,7 +87,7 @@
> 		end(LIFECYCLE);
> 	}
> 
>-	protected void writeHostRequiredCapabilities(RequiredCapability[] capabilities) {
>+	protected void writeHostRequiredCapabilities(IRequiredCapability[] capabilities) {
> 		if (capabilities != null && capabilities.length > 0) {
> 			start(HOST_REQUIRED_CAPABILITIES_ELEMENT);
> 			attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);
>@@ -98,7 +98,7 @@
> 		}
> 	}
> 
>-	protected void writeProvidedCapabilities(ProvidedCapability[] capabilities) {
>+	protected void writeProvidedCapabilities(IProvidedCapability[] capabilities) {
> 		if (capabilities != null && capabilities.length > 0) {
> 			start(PROVIDED_CAPABILITIES_ELEMENT);
> 			attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);
>@@ -113,7 +113,7 @@
> 		}
> 	}
> 
>-	protected void writeRequiredCapabilities(RequiredCapability[] capabilities) {
>+	protected void writeRequiredCapabilities(IRequiredCapability[] capabilities) {
> 		if (capabilities != null && capabilities.length > 0) {
> 			start(REQUIRED_CAPABILITIES_ELEMENT);
> 			attribute(COLLECTION_SIZE_ATTRIBUTE, capabilities.length);
>@@ -169,7 +169,7 @@
> 		end(REQUIREMENT_CHANGE);
> 	}
> 
>-	protected void writeRequiredCapability(RequiredCapability capability) {
>+	protected void writeRequiredCapability(IRequiredCapability capability) {
> 		start(REQUIRED_CAPABILITY_ELEMENT);
> 		attribute(NAMESPACE_ATTRIBUTE, capability.getNamespace());
> 		attribute(NAME_ATTRIBUTE, capability.getName());
>@@ -207,19 +207,19 @@
> 		}
> 	}
> 
>-	protected void writeTouchpointType(TouchpointType touchpointType) {
>+	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(TouchpointData[] touchpointData) {
>+	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++) {
>-				TouchpointData nextData = touchpointData[i];
>+				ITouchpointData nextData = touchpointData[i];
> 				Map instructions = nextData.getInstructions();
> 				if (instructions.size() > 0) {
> 					start(TOUCHPOINT_DATA_INSTRUCTIONS_ELEMENT);
>@@ -228,7 +228,7 @@
> 						Map.Entry entry = (Map.Entry) iter.next();
> 						start(TOUCHPOINT_DATA_INSTRUCTION_ELEMENT);
> 						attribute(TOUCHPOINT_DATA_INSTRUCTION_KEY_ATTRIBUTE, entry.getKey());
>-						TouchpointInstruction instruction = (TouchpointInstruction) entry.getValue();
>+						ITouchpointInstruction instruction = (ITouchpointInstruction) entry.getValue();
> 						if (instruction.getImportAttribute() != null)
> 							attribute(TOUCHPOINT_DATA_INSTRUCTION_IMPORT_ATTRIBUTE, instruction.getImportAttribute());
> 						cdata(instruction.getBody(), true);
>@@ -249,7 +249,7 @@
> 		}
> 	}
> 
>-	private void writeLicenses(License license) {
>+	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.
>@@ -265,7 +265,7 @@
> 		}
> 	}
> 
>-	private void writeCopyright(Copyright copyright) {
>+	private void writeCopyright(ICopyright copyright) {
> 		if (copyright != null) {
> 			start(COPYRIGHT_ELEMENT);
> 			try {
>#P org.eclipse.equinox.p2.engine
>Index: src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java,v
>retrieving revision 1.9
>diff -u -r1.9 InstallableUnitPhase.java
>--- src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java	8 Dec 2008 22:24:24 -0000	1.9
>+++ src/org/eclipse/equinox/internal/provisional/p2/engine/InstallableUnitPhase.java	15 Dec 2008 07:48:28 -0000
>@@ -87,13 +87,13 @@
> 	}
> 
> 	private final static TouchpointInstruction[] getInstructions(IInstallableUnit unit, String key) {
>-		TouchpointData[] data = unit.getTouchpointData();
>+		ITouchpointData[] data = unit.getTouchpointData();
> 		if (data == null)
> 			return null;
> 
> 		ArrayList matches = new ArrayList(data.length);
> 		for (int i = 0; i < data.length; i++) {
>-			TouchpointInstruction instructions = data[i].getInstruction(key);
>+			ITouchpointInstruction instructions = data[i].getInstruction(key);
> 			if (instructions != null)
> 				matches.add(instructions);
> 		}
>Index: src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java,v
>retrieving revision 1.7
>diff -u -r1.7 Collect.java
>--- src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java	4 Dec 2008 21:41:49 -0000	1.7
>+++ src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Collect.java	15 Dec 2008 07:48:28 -0000
>@@ -17,8 +17,7 @@
> import org.eclipse.equinox.internal.p2.engine.DownloadManager;
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest;
> import org.eclipse.equinox.internal.provisional.p2.engine.*;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> 
> /**
>  * The goal of the collect phase is to ask the touchpoints if the artifacts associated with an IU need to be downloaded.
>@@ -44,7 +43,7 @@
> 		if (parsedActions != null)
> 			return parsedActions;
> 
>-		TouchpointType type = unit.getTouchpointType();
>+		ITouchpointType type = unit.getTouchpointType();
> 		if (type == null || type == TouchpointType.NONE)
> 			return null;
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java,v
>retrieving revision 1.3
>diff -u -r1.3 CheckTrust.java
>--- src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java	4 Dec 2008 21:41:49 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/engine/phases/CheckTrust.java	15 Dec 2008 07:48:28 -0000
>@@ -14,8 +14,7 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.equinox.internal.provisional.p2.engine.*;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> 
> /**
>  * An install phase that checks if the certificates used to sign the artifacts
>@@ -50,7 +49,7 @@
> 		if (parsedActions != null)
> 			return parsedActions;
> 
>-		TouchpointType type = unit.getTouchpointType();
>+		ITouchpointType type = unit.getTouchpointType();
> 		if (type == null || type == TouchpointType.NONE)
> 			return null;
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java,v
>retrieving revision 1.9
>diff -u -r1.9 Sizing.java
>--- src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java	4 Dec 2008 21:41:49 -0000	1.9
>+++ src/org/eclipse/equinox/internal/provisional/p2/engine/phases/Sizing.java	15 Dec 2008 07:48:28 -0000
>@@ -19,8 +19,7 @@
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
> import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.engine.*;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> 
> public class Sizing extends InstallableUnitPhase {
> 	private static final String PHASE_ID = "sizing"; //$NON-NLS-1$
>@@ -51,7 +50,7 @@
> 		if (parsedActions != null)
> 			return parsedActions;
> 
>-		TouchpointType type = unit.getTouchpointType();
>+		ITouchpointType type = unit.getTouchpointType();
> 		if (type == null || type == TouchpointType.NONE)
> 			return null;
> 
>Index: src/org/eclipse/equinox/internal/p2/engine/ActionManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/ActionManager.java,v
>retrieving revision 1.6
>diff -u -r1.6 ActionManager.java
>--- src/org/eclipse/equinox/internal/p2/engine/ActionManager.java	8 Dec 2008 22:24:24 -0000	1.6
>+++ src/org/eclipse/equinox/internal/p2/engine/ActionManager.java	15 Dec 2008 07:48:28 -0000
>@@ -16,6 +16,7 @@
> import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
> 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.metadata.TouchpointType;
> import org.eclipse.osgi.service.resolver.VersionRange;
> import org.eclipse.osgi.util.NLS;
>@@ -37,13 +38,13 @@
> 		RegistryFactory.getRegistry().addRegistryChangeListener(this, EngineActivator.ID);
> 	}
> 
>-	public Touchpoint getTouchpointPoint(TouchpointType type) {
>+	public Touchpoint getTouchpointPoint(ITouchpointType type) {
> 		if (type == null || type == TouchpointType.NONE)
> 			return null;
> 		return touchpointManager.getTouchpoint(type);
> 	}
> 
>-	public ProvisioningAction getTouchpointQualifiedAction(String actionId, TouchpointType type) {
>+	public ProvisioningAction getTouchpointQualifiedAction(String actionId, ITouchpointType type) {
> 		if (actionId.indexOf('.') == -1) {
> 			if (type == null || type == TouchpointType.NONE)
> 				return null;
>Index: src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java,v
>retrieving revision 1.12
>diff -u -r1.12 TouchpointManager.java
>--- src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java	4 Dec 2008 21:41:49 -0000	1.12
>+++ src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java	15 Dec 2008 07:48:28 -0000
>@@ -15,7 +15,7 @@
> 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.metadata.ITouchpointType;
> import org.eclipse.osgi.service.resolver.VersionRange;
> import org.eclipse.osgi.util.NLS;
> import org.osgi.framework.Version;
>@@ -93,7 +93,7 @@
> 	 * Return the touchpoint which is registered for the given type,
> 	 * or <code>null</code> if none are registered.
> 	 */
>-	public synchronized Touchpoint getTouchpoint(TouchpointType type) {
>+	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());
>Index: src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java,v
>retrieving revision 1.14
>diff -u -r1.14 InstructionParser.java
>--- src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java	8 Dec 2008 21:18:11 -0000	1.14
>+++ src/org/eclipse/equinox/internal/p2/engine/InstructionParser.java	15 Dec 2008 07:48:28 -0000
>@@ -13,8 +13,8 @@
> import java.util.*;
> import org.eclipse.core.runtime.Assert;
> import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointInstruction;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType;
> import org.eclipse.osgi.service.resolver.VersionRange;
> import org.eclipse.osgi.util.NLS;
> 
>@@ -39,7 +39,7 @@
> 		this.actionManager = actionManager;
> 	}
> 
>-	public ProvisioningAction[] parseActions(TouchpointInstruction instruction, TouchpointType touchpointType) {
>+	public ProvisioningAction[] parseActions(ITouchpointInstruction instruction, ITouchpointType touchpointType) {
> 		List actions = new ArrayList();
> 		Map importMap = parseImportAttribute(instruction.getImportAttribute());
> 		StringTokenizer tokenizer = new StringTokenizer(instruction.getBody(), ";"); //$NON-NLS-1$
>@@ -73,7 +73,7 @@
> 		return result;
> 	}
> 
>-	private ProvisioningAction parseAction(String statement, Map qualifier, TouchpointType touchpointType) {
>+	private ProvisioningAction parseAction(String statement, Map qualifier, ITouchpointType touchpointType) {
> 		int openBracket = statement.indexOf('(');
> 		int closeBracket = statement.lastIndexOf(')');
> 		if (openBracket == -1 || closeBracket == -1 || openBracket > closeBracket)
>@@ -99,7 +99,7 @@
> 		return new ParameterizedProvisioningAction(action, parameters);
> 	}
> 
>-	private ProvisioningAction lookupAction(String actionId, Map importMap, TouchpointType touchpointType) {
>+	private ProvisioningAction lookupAction(String actionId, Map importMap, ITouchpointType touchpointType) {
> 		VersionRange versionRange = null;
> 		ActionEntry actionEntry = (ActionEntry) importMap.get(actionId);
> 		if (actionEntry != null) {
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/resolution/Transformer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/Transformer.java,v
>retrieving revision 1.3
>diff -u -r1.3 Transformer.java
>--- src/org/eclipse/equinox/internal/p2/resolution/Transformer.java	11 Feb 2008 05:30:45 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/resolution/Transformer.java	15 Dec 2008 07:48:32 -0000
>@@ -57,7 +57,7 @@
> 		return result;
> 	}
> 
>-	private boolean isEnabled(RequiredCapability capability) {
>+	private boolean isEnabled(IRequiredCapability capability) {
> 		// If there is no context then be optimistic
> 		if (context == null)
> 			return true;
>@@ -87,7 +87,7 @@
> 		return buf.toString();
> 	}
> 
>-	public void visitCapability(ProvidedCapability capability) {
>+	public void visitCapability(IProvidedCapability capability) {
> 		iuCapabilities.add(factory.createGenericDescription(capability.getName(), capability.getNamespace(), capability.getVersion(), null));
> 	}
> 
>@@ -95,14 +95,14 @@
> 		kind = IU_KIND;
> 
> 		//Start with the dependencies
>-		RequiredCapability[] requires = toTransform.getRequiredCapabilities();
>+		IRequiredCapability[] requires = toTransform.getRequiredCapabilities();
> 		iuDependencies = new HashMap(requires.length);
> 		for (int i = 0; i < requires.length; i++) {
> 			visitRequiredCapability(requires[i]);
> 		}
> 
> 		//Do the capabilities
>-		ProvidedCapability[] capabilities = toTransform.getProvidedCapabilities();
>+		IProvidedCapability[] capabilities = toTransform.getProvidedCapabilities();
> 		iuCapabilities = new ArrayList(requires.length + 1);
> 		for (int i = 0; i < capabilities.length; i++) {
> 			visitCapability(capabilities[i]);
>@@ -123,7 +123,7 @@
> 		result.setUserObject(new StateMetadataMap(toTransform, iuDependencies));
> 	}
> 
>-	public void visitRequiredCapability(RequiredCapability capability) {
>+	public void visitRequiredCapability(IRequiredCapability capability) {
> 		try {
> 			if (isEnabled(capability)) {
> 				capability = rewrite(capability);
>@@ -134,7 +134,7 @@
> 		}
> 	}
> 
>-	private RequiredCapability rewrite(RequiredCapability match) {
>+	private IRequiredCapability rewrite(IRequiredCapability match) {
> 		if (recommendations == null)
> 			return match;
> 		Recommendation foundRecommendation = recommendations.findRecommendation(match);
>Index: src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java,v
>retrieving revision 1.8
>diff -u -r1.8 ResolutionHelper.java
>--- src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java	17 Oct 2008 20:38:13 -0000	1.8
>+++ src/org/eclipse/equinox/internal/p2/resolution/ResolutionHelper.java	15 Dec 2008 07:48:32 -0000
>@@ -132,7 +132,7 @@
> 				IInstallableUnitFragment potentialFragment = (IInstallableUnitFragment) dependentIU;
> 
> 				// Check to make sure the host meets the requirements of the fragment
>-				RequiredCapability reqsFromFragment[] = potentialFragment.getHost();
>+				IRequiredCapability reqsFromFragment[] = potentialFragment.getHost();
> 				boolean match = true;
> 				boolean requirementMatched = false;
> 				for (int l = 0; l < reqsFromFragment.length && match == true; l++) {
>Index: src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java,v
>retrieving revision 1.4
>diff -u -r1.4 UnsatisfiedCapability.java
>--- src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java	3 Dec 2008 19:31:51 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/resolution/UnsatisfiedCapability.java	15 Dec 2008 07:48:32 -0000
>@@ -12,7 +12,7 @@
> 
> 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.equinox.internal.provisional.p2.metadata.IRequiredCapability;
> import org.eclipse.osgi.util.NLS;
> 
> /**
>@@ -21,14 +21,14 @@
>  */
> public class UnsatisfiedCapability {
> 	private IInstallableUnit owner;
>-	private RequiredCapability require;
>+	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(RequiredCapability required, IInstallableUnit owner) {
>+	public UnsatisfiedCapability(IRequiredCapability required, IInstallableUnit owner) {
> 		this.require = required;
> 		this.owner = owner;
> 	}
>@@ -40,7 +40,7 @@
> 	/**
> 	 * Returns the specific dependency that was not satisfied.
> 	 */
>-	public RequiredCapability getRequiredCapability() {
>+	public IRequiredCapability getRequiredCapability() {
> 		return require;
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/director/Projector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java,v
>retrieving revision 1.23
>diff -u -r1.23 Projector.java
>--- src/org/eclipse/equinox/internal/p2/director/Projector.java	8 Nov 2008 20:56:14 -0000	1.23
>+++ src/org/eclipse/equinox/internal/p2/director/Projector.java	15 Dec 2008 07:48:31 -0000
>@@ -175,7 +175,7 @@
> 		if (patches == null)
> 			return patchesWeight;
> 		for (int i = 0; i < ius.length; i++) {
>-			RequiredCapability[] reqs = ius[i].getRequiredCapabilities();
>+			IRequiredCapability[] reqs = ius[i].getRequiredCapabilities();
> 			for (int j = 0; j < reqs.length; j++) {
> 				Collector matches = patches.query(new CapabilityQuery(reqs[j]), new Collector(), null);
> 				for (Iterator iterator = matches.iterator(); iterator.hasNext();) {
>@@ -200,7 +200,7 @@
> 	}
> 
> 	// Check whether the requirement is applicable
>-	private boolean isApplicable(RequiredCapability req) {
>+	private boolean isApplicable(IRequiredCapability req) {
> 		String filter = req.getFilter();
> 		if (filter == null)
> 			return true;
>@@ -327,7 +327,7 @@
> 		expandLifeCycle(iu);
> 		//No patches apply, normal code path
> 		if (patches.size() == 0) {
>-			RequiredCapability[] reqs = iu.getRequiredCapabilities();
>+			IRequiredCapability[] reqs = iu.getRequiredCapabilities();
> 			if (reqs.length == 0) {
> 				return;
> 			}
>@@ -454,7 +454,7 @@
> 	private int countOptionalIUs = 0;
> 	private QueryableArray patches;
> 
>-	private void expandOptionalRequirement(String iuVar, IInstallableUnit iu, RequiredCapability req) {
>+	private void expandOptionalRequirement(String iuVar, IInstallableUnit iu, IRequiredCapability req) {
> 		if (iuVar == null)
> 			iuVar = getVariable(iu);
> 		String abstractVar = getAbstractVariable();
>@@ -568,7 +568,7 @@
> 		}
> 	}
> 
>-	private void expandNormalRequirement(String varIu, IInstallableUnit iu, RequiredCapability req) {
>+	private void expandNormalRequirement(String varIu, IInstallableUnit iu, IRequiredCapability req) {
> 		//Generate the regular requirement
> 		if (varIu == null)
> 			varIu = getVariable(iu);
>@@ -616,7 +616,7 @@
> 		return patches.query(new ApplicablePatchQuery(iu), new Collector(), null);
> 	}
> 
>-	private void expandRequirement(String var, IInstallableUnit iu, RequiredCapability req) {
>+	private void expandRequirement(String var, IInstallableUnit iu, IRequiredCapability req) {
> 		if (req.isOptional())
> 			expandOptionalRequirement(var, iu, req);
> 		else
>Index: src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java,v
>retrieving revision 1.4
>diff -u -r1.4 RequirementBasedFilter.java
>--- src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java	10 Feb 2008 22:45:37 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java	15 Dec 2008 07:48:31 -0000
>@@ -9,12 +9,12 @@
> package org.eclipse.equinox.internal.p2.director;
> 
> 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.metadata.IRequiredCapability;
> 
> public class RequirementBasedFilter extends IUFilter {
>-	private RequiredCapability[] reqs;
>+	private IRequiredCapability[] reqs;
> 
>-	public RequirementBasedFilter(RequiredCapability[] toFilterOn) {
>+	public RequirementBasedFilter(IRequiredCapability[] toFilterOn) {
> 		reqs = toFilterOn;
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/director/Recommendation.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Recommendation.java,v
>retrieving revision 1.3
>diff -u -r1.3 Recommendation.java
>--- src/org/eclipse/equinox/internal/p2/director/Recommendation.java	10 Feb 2008 22:45:37 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/director/Recommendation.java	15 Dec 2008 07:48:31 -0000
>@@ -8,8 +8,7 @@
>  ******************************************************************************/
> package org.eclipse.equinox.internal.p2.director;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> import org.eclipse.osgi.service.resolver.VersionRange;
> import org.osgi.framework.Version;
> 
>@@ -30,7 +29,7 @@
> 		return newValue;
> 	}
> 
>-	public boolean matches(RequiredCapability toMatch) {
>+	public boolean matches(IRequiredCapability toMatch) {
> 		if (!toMatch.getNamespace().equals(applyOn.getNamespace()))
> 			return false;
> 		if (!toMatch.getName().equals(applyOn.getName()))
>Index: src/org/eclipse/equinox/internal/p2/director/Slicer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java,v
>retrieving revision 1.11
>diff -u -r1.11 Slicer.java
>--- src/org/eclipse/equinox/internal/p2/director/Slicer.java	1 Dec 2008 16:00:12 -0000	1.11
>+++ src/org/eclipse/equinox/internal/p2/director/Slicer.java	15 Dec 2008 07:48:31 -0000
>@@ -86,7 +86,7 @@
> 	}
> 
> 	// Check whether the requirement is applicable
>-	private boolean isApplicable(RequiredCapability req) {
>+	private boolean isApplicable(IRequiredCapability req) {
> 		String filter = req.getFilter();
> 		if (filter == null)
> 			return true;
>@@ -116,7 +116,7 @@
> 			return;
> 		}
> 
>-		RequiredCapability[] reqs = getRequiredCapabilities(iu);
>+		IRequiredCapability[] reqs = getRequiredCapabilities(iu);
> 		if (reqs.length == 0) {
> 			return;
> 		}
>@@ -132,7 +132,7 @@
> 		}
> 	}
> 
>-	private RequiredCapability[] getRequiredCapabilities(IInstallableUnit iu) {
>+	private IRequiredCapability[] getRequiredCapabilities(IInstallableUnit iu) {
> 		if (!(iu instanceof IInstallableUnitPatch)) {
> 			return iu.getRequiredCapabilities();
> 		}
>@@ -148,7 +148,7 @@
> 		return aggregatedCapabilities;
> 	}
> 
>-	private void expandRequirement(IInstallableUnit iu, RequiredCapability req) {
>+	private void expandRequirement(IInstallableUnit iu, IRequiredCapability req) {
> 		Collector matches = possibilites.query(new CapabilityQuery(req), new Collector(), null);
> 		int validMatches = 0;
> 		for (Iterator iterator = matches.iterator(); iterator.hasNext();) {
>Index: src/org/eclipse/equinox/internal/p2/director/QueryableArray.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/QueryableArray.java,v
>retrieving revision 1.6
>diff -u -r1.6 QueryableArray.java
>--- src/org/eclipse/equinox/internal/p2/director/QueryableArray.java	1 Dec 2008 15:59:15 -0000	1.6
>+++ src/org/eclipse/equinox/internal/p2/director/QueryableArray.java	15 Dec 2008 07:48:31 -0000
>@@ -19,9 +19,9 @@
> public class QueryableArray implements IQueryable {
> 	static class IUCapability {
> 		final IInstallableUnit iu;
>-		final ProvidedCapability capability;
>+		final IProvidedCapability capability;
> 
>-		public IUCapability(IInstallableUnit iu, ProvidedCapability capability) {
>+		public IUCapability(IInstallableUnit iu, IProvidedCapability capability) {
> 			this.iu = iu;
> 			this.capability = capability;
> 		}
>@@ -43,7 +43,7 @@
> 	private Collector queryCapability(CapabilityQuery query, Collector collector, IProgressMonitor monitor) {
> 		generateNamedCapabilityIndex();
> 
>-		RequiredCapability[] requiredCapabilities = query.getRequiredCapabilities();
>+		IRequiredCapability[] requiredCapabilities = query.getRequiredCapabilities();
> 		Collection resultIUs = null;
> 		for (int i = 0; i < requiredCapabilities.length; i++) {
> 			Collection matchingIUs = findMatchingIUs(requiredCapabilities[i]);
>@@ -61,7 +61,7 @@
> 		return collector;
> 	}
> 
>-	private Collection findMatchingIUs(RequiredCapability requiredCapability) {
>+	private Collection findMatchingIUs(IRequiredCapability requiredCapability) {
> 		List iuCapabilities = (List) namedCapabilityIndex.get(requiredCapability.getName());
> 		if (iuCapabilities == null)
> 			return null;
>@@ -83,7 +83,7 @@
> 		for (Iterator iterator = dataSet.iterator(); iterator.hasNext();) {
> 			IInstallableUnit iu = (IInstallableUnit) iterator.next();
> 
>-			ProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
>+			IProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
> 			for (int i = 0; i < providedCapabilities.length; i++) {
> 				String name = providedCapabilities[i].getName();
> 				List iuCapabilities = (List) namedCapabilityIndex.get(name);
>Index: src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java,v
>retrieving revision 1.25
>diff -u -r1.25 NewDependencyExpander.java
>--- src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java	3 Dec 2008 19:31:51 -0000	1.25
>+++ src/org/eclipse/equinox/internal/p2/director/NewDependencyExpander.java	15 Dec 2008 07:48:30 -0000
>@@ -37,9 +37,9 @@
> 		 * The environment against which capability filters are evaluated for this match.
> 		 */
> 		Dictionary env;
>-		RequiredCapability req;
>+		IRequiredCapability req;
> 
>-		public Match(RequiredCapability range, Dictionary environment) {
>+		public Match(IRequiredCapability range, Dictionary environment) {
> 			this.req = range;
> 			this.env = environment;
> 			candidates = new HashSet(2);
>@@ -63,7 +63,7 @@
> 		String name;
> 		String namespace;
> 
>-		MatchKey(RequiredCapability capability) {
>+		MatchKey(IRequiredCapability capability) {
> 			this.namespace = capability.getNamespace();
> 			this.name = capability.getName();
> 		}
>@@ -126,9 +126,9 @@
> 			return true;
> 		}
> 
>-		public RequiredCapability[] getRequiredCapabilities() {
>+		public IRequiredCapability[] getRequiredCapabilities() {
> 			ArrayList result = new ArrayList();
>-			ProvidedCapability[] caps = wrapped.getProvidedCapabilities();
>+			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));
> 			}
>@@ -155,15 +155,15 @@
> 			return wrapped.getProperties();
> 		}
> 
>-		public ProvidedCapability[] getProvidedCapabilities() {
>+		public IProvidedCapability[] getProvidedCapabilities() {
> 			return wrapped.getProvidedCapabilities();
> 		}
> 
>-		public TouchpointData[] getTouchpointData() {
>+		public ITouchpointData[] getTouchpointData() {
> 			return wrapped.getTouchpointData();
> 		}
> 
>-		public TouchpointType getTouchpointType() {
>+		public ITouchpointType getTouchpointType() {
> 			return wrapped.getTouchpointType();
> 		}
> 
>@@ -195,15 +195,15 @@
> 			return wrapped.getUpdateDescriptor();
> 		}
> 
>-		public License getLicense() {
>+		public ILicense getLicense() {
> 			return wrapped.getLicense();
> 		}
> 
>-		public Copyright getCopyright() {
>+		public ICopyright getCopyright() {
> 			return wrapped.getCopyright();
> 		}
> 
>-		public boolean satisfies(RequiredCapability candidate) {
>+		public boolean satisfies(IRequiredCapability candidate) {
> 			return wrapped.satisfies(candidate);
> 		}
> 	}
>@@ -254,10 +254,10 @@
> 	/**
> 	 * Creates a problem status for the given unsatisfied dependency.
> 	 */
>-	private void addUnsatisfied(RequiredCapability req, Collection toAdd, MultiStatus problems) {
>+	private void addUnsatisfied(IRequiredCapability req, Collection toAdd, MultiStatus problems) {
> 		for (Iterator it = toAdd.iterator(); it.hasNext();) {
> 			IInstallableUnit unit = (IInstallableUnit) it.next();
>-			RequiredCapability[] required = unit.getRequiredCapabilities();
>+			IRequiredCapability[] required = unit.getRequiredCapabilities();
> 			for (int i = 0; i < required.length; i++) {
> 				if (required[i].equals(req)) {
> 					UnsatisfiedCapability unsatisfied = new UnsatisfiedCapability(req, unit);
>@@ -357,7 +357,7 @@
> 				ProvidedCapability capForCurrent = MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, current.getId(), current.getVersion());
> 				Map toAdd = new HashMap();
> 				for (int i = 0; i < matches.length; i++) {
>-					RequiredCapability[] reqs = matches[i].getRequiredCapabilities();
>+					IRequiredCapability[] reqs = matches[i].getRequiredCapabilities();
> 					boolean isReallyAFragment = false;
> 					for (int j = 0; j < reqs.length; j++) {
> 						isReallyAFragment = capForCurrent.satisfies(reqs[j]);
>@@ -477,9 +477,9 @@
> 		//map of MatchKey->Match
> 		for (Iterator iterator = ius.iterator(); iterator.hasNext();) {
> 			IInstallableUnit currentUnit = (IInstallableUnit) iterator.next();
>-			RequiredCapability[] toAdd = currentUnit.getRequiredCapabilities();
>+			IRequiredCapability[] toAdd = currentUnit.getRequiredCapabilities();
> 			outer: for (int i = 0; i < toAdd.length; i++) {
>-				RequiredCapability current = toAdd[i];
>+				IRequiredCapability current = toAdd[i];
> 				if (isApplicable(current) && !isMeta(current) && !current.isOptional()) {
> 					MatchKey key = new MatchKey(current);
> 					List match = (List) must.get(key);
>@@ -584,7 +584,7 @@
> 	}
> 
> 	// Check whether the requirement is applicable
>-	private boolean isApplicable(RequiredCapability req) {
>+	private boolean isApplicable(IRequiredCapability req) {
> 		String filter = req.getFilter();
> 		if (filter == null)
> 			return true;
>@@ -600,7 +600,7 @@
> 	 * 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(RequiredCapability requiredCapability) {
>+	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$
>@@ -614,7 +614,7 @@
> 		return null;
> 	}
> 
>-	private Dictionary mergeEnvironments(Dictionary context, RequiredCapability newCapability) {
>+	private Dictionary mergeEnvironments(Dictionary context, IRequiredCapability newCapability) {
> 		String[] newSelectors = newCapability.getSelectors();
> 		if (newSelectors == null || newSelectors.length == 0)
> 			return context;
>@@ -635,7 +635,7 @@
> 		return false;
> 	}
> 
>-	private boolean requirementEnabled(RequiredCapability req) {
>+	private boolean requirementEnabled(IRequiredCapability req) {
> 		if (req.isOptional())
> 			return false;
> 		return isApplicable(req);
>Index: src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java,v
>retrieving revision 1.3
>diff -u -r1.3 RecommendationDescriptor.java
>--- src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java	10 Feb 2008 22:45:37 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/director/RecommendationDescriptor.java	15 Dec 2008 07:48:31 -0000
>@@ -10,8 +10,8 @@
> 
> import java.util.*;
> import org.eclipse.core.runtime.*;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
> import org.eclipse.osgi.service.resolver.VersionRange;
> 
> public class RecommendationDescriptor {
>@@ -28,7 +28,7 @@
> 		return recommendations;
> 	}
> 
>-	public Recommendation findRecommendation(RequiredCapability toMatch) {
>+	public Recommendation findRecommendation(IRequiredCapability toMatch) {
> 		for (Iterator iterator = recommendations.iterator(); iterator.hasNext();) {
> 			Recommendation name = (Recommendation) iterator.next();
> 			if (name.matches(toMatch))
>Index: src/org/eclipse/equinox/internal/p2/director/Picker.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java,v
>retrieving revision 1.4
>diff -u -r1.4 Picker.java
>--- src/org/eclipse/equinox/internal/p2/director/Picker.java	11 Feb 2008 05:30:45 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/director/Picker.java	15 Dec 2008 07:48:30 -0000
>@@ -36,8 +36,8 @@
> 		this.filters = new ArrayList(2);
> 	}
> 
>-	public Collection[] findInstallableUnit(String id, VersionRange range, RequiredCapability searchedCapability) {
>-		IInstallableUnit[][] tmp = findInstallableUnit(id, range, new RequiredCapability[] {searchedCapability}, false);
>+	public Collection[] findInstallableUnit(String id, VersionRange range, IRequiredCapability searchedCapability) {
>+		IInstallableUnit[][] tmp = findInstallableUnit(id, range, new IRequiredCapability[] {searchedCapability}, false);
> 		return new Collection[] {Arrays.asList(tmp[0]), Arrays.asList(tmp[1])};
> 	}
> 
>@@ -62,14 +62,14 @@
> 		secondChoiceSet = (IInstallableUnit[]) secondChoice.toArray(new IInstallableUnit[secondChoice.size()]);
> 	}
> 
>-	public IInstallableUnit[][] findInstallableUnit(String id, VersionRange range, RequiredCapability[] searchedCapability, boolean fragmentsOnly) {
>+	public IInstallableUnit[][] findInstallableUnit(String id, VersionRange range, IRequiredCapability[] searchedCapability, boolean fragmentsOnly) {
> 		return new IInstallableUnit[][] {findInstallableUnit(preferredSet, id, range, searchedCapability, fragmentsOnly), findInstallableUnit(secondChoiceSet, id, range, searchedCapability, fragmentsOnly)};
> 	}
> 
> 	//TODO what should be the return value when all the parameters are null. Is it even a valid call?
> 	//TODO A lot of improvement could be done on this algorithm, for example
> 	// - remove from the set of searchedCapability the one that are found
>-	private IInstallableUnit[] findInstallableUnit(IInstallableUnit[] pool, String id, VersionRange range, RequiredCapability[] searchedCapability, boolean fragmentsOnly) {
>+	private IInstallableUnit[] findInstallableUnit(IInstallableUnit[] pool, String id, VersionRange range, IRequiredCapability[] searchedCapability, boolean fragmentsOnly) {
> 		if (pool == null || pool.length == 0)
> 			return new IInstallableUnit[0];
> 		Set candidates = new HashSet();
>@@ -90,7 +90,7 @@
> 				IInstallableUnit candidate = pool[i];
> 				for (int k = 0; k < searchedCapability.length; k++) {
> 					boolean valid = false;
>-					ProvidedCapability[] capabilities = candidate.getProvidedCapabilities();
>+					IProvidedCapability[] capabilities = candidate.getProvidedCapabilities();
> 					if (capabilities.length == 0)
> 						valid = false;
> 					for (int j = 0; j < capabilities.length; j++) {
>@@ -110,10 +110,10 @@
> 		return pool;
> 	}
> 
>-	private RequiredCapability[] rewrite(RequiredCapability[] requiredCapabilities) {
>+	private IRequiredCapability[] rewrite(IRequiredCapability[] requiredCapabilities) {
> 		if (recommendations == null)
> 			return requiredCapabilities;
>-		RequiredCapability[] result = new RequiredCapability[requiredCapabilities.length];
>+		IRequiredCapability[] result = new IRequiredCapability[requiredCapabilities.length];
> 		for (int i = 0; i < requiredCapabilities.length; i++) {
> 			result[i] = getRecommendation(requiredCapabilities[i]);
> 			if (result[i] == null)
>@@ -122,7 +122,7 @@
> 		return result;
> 	}
> 
>-	private RequiredCapability getRecommendation(RequiredCapability match) {
>+	private IRequiredCapability getRecommendation(IRequiredCapability match) {
> 		Recommendation foundRecommendation = recommendations.findRecommendation(match);
> 		return foundRecommendation != null ? foundRecommendation.newValue() : match;
> 	}
>#P org.eclipse.equinox.p2.ui.admin
>Index: src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java,v
>retrieving revision 1.10
>diff -u -r1.10 IUImplementationGroup.java
>--- src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java	10 Feb 2008 22:45:52 -0000	1.10
>+++ src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java	15 Dec 2008 07:48:33 -0000
>@@ -149,24 +149,24 @@
> 		if (value != null) {
> 			namespace.setText(value);
> 		}
>-		TouchpointType type = iu.getTouchpointType();
>+		ITouchpointType type = iu.getTouchpointType();
> 		if (type != null) {
> 			touchpointType.setText(type.getId());
> 		}
>-		TouchpointData[] data = iu.getTouchpointData();
>+		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);
> 
>-		RequiredCapability[] req = iu.getRequiredCapabilities();
>+		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);
>-		ProvidedCapability[] prov = iu.getProvidedCapabilities();
>+		IProvidedCapability[] prov = iu.getProvidedCapabilities();
> 		items = new String[prov.length];
> 		for (int i = 0; i < prov.length; i++) {
> 			items[i] = prov[i].toString();
>#P org.eclipse.equinox.p2.touchpoint.eclipse
>Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 CollectAction.java
>--- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java	7 Nov 2008 16:25:55 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java	15 Dec 2008 07:48:35 -0000
>@@ -42,7 +42,7 @@
> 		return Status.OK_STATUS;
> 	}
> 
>-	public static boolean isZipped(TouchpointData[] data) {
>+	public static boolean isZipped(ITouchpointData[] data) {
> 		if (data == null || data.length == 0)
> 			return false;
> 		for (int i = 0; i < data.length; i++) {
>Index: src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java,v
>retrieving revision 1.59
>diff -u -r1.59 Util.java
>--- src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java	14 Dec 2008 15:13:10 -0000	1.59
>+++ src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java	15 Dec 2008 07:48:35 -0000
>@@ -288,9 +288,9 @@
> 		return null;
> 	}
> 
>-	public static String getManifest(TouchpointData[] data) {
>+	public static String getManifest(ITouchpointData[] data) {
> 		for (int i = 0; i < data.length; i++) {
>-			TouchpointInstruction manifestInstruction = data[i].getInstruction("manifest"); //$NON-NLS-1$
>+			ITouchpointInstruction manifestInstruction = data[i].getInstruction("manifest"); //$NON-NLS-1$
> 			if (manifestInstruction == null)
> 				return null;
> 			String manifest = manifestInstruction.getBody();
>#P org.eclipse.equinox.p2.tests.ui
>Index: src/org/eclipse/equinox/p2/tests/ui/query/IUPropertyUtilsTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/IUPropertyUtilsTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 IUPropertyUtilsTest.java
>--- src/org/eclipse/equinox/p2/tests/ui/query/IUPropertyUtilsTest.java	5 Dec 2008 15:29:10 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/ui/query/IUPropertyUtilsTest.java	15 Dec 2008 07:48:36 -0000
>@@ -41,9 +41,9 @@
> 		assertTrue("1.0", !result.isEmpty());
> 		IInstallableUnit unit = (IInstallableUnit) result.iterator().next();
> 
>-		Copyright copyright = org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils.getCopyright(unit);
>+		ICopyright copyright = org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils.getCopyright(unit);
> 		assertEquals("1.1", "Test Copyright", copyright.getBody());
>-		License license = IUPropertyUtils.getLicense(unit);
>+		ILicense license = IUPropertyUtils.getLicense(unit);
> 		assertEquals("1.2", "Test License", license.getBody());
> 		//		assertEquals("1.3", "license.html", license.getURL().toExternalForm());
> 		String name = IUPropertyUtils.getIUProperty(unit, IInstallableUnit.PROP_NAME);
>#P org.eclipse.equinox.p2.tests
>Index: src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest2.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest2.java,v
>retrieving revision 1.1
>diff -u -r1.1 SDKPatchingTest2.java
>--- src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest2.java	4 Dec 2008 02:27:14 -0000	1.1
>+++ src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest2.java	15 Dec 2008 07:48:41 -0000
>@@ -4,6 +4,7 @@
> import java.util.ArrayList;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry;
>+import org.eclipse.equinox.internal.p2.metadata.InstallableUnit;
> 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;
>@@ -28,7 +29,7 @@
> 		assertNotNull(profile);
> 
> 		//create a patch to install a new version of jdt.launching
>-		MetadataFactory.InstallableUnitDescription newJDTLaunching = createIUDescriptor((IInstallableUnit) profile.query(new InstallableUnitQuery("org.eclipse.jdt.launching"), new Collector(), new NullProgressMonitor()).iterator().next());
>+		MetadataFactory.InstallableUnitDescription newJDTLaunching = createIUDescriptor((InstallableUnit) profile.query(new InstallableUnitQuery("org.eclipse.jdt.launching"), new Collector(), new NullProgressMonitor()).iterator().next());
> 		Version newJDTLaunchingVersion = new Version(3, 5, 0, "zeNewVersion");
> 		changeVersion(newJDTLaunching, newJDTLaunchingVersion);
> 		newIUs.add(MetadataFactory.createInstallableUnit(newJDTLaunching));
>@@ -40,7 +41,7 @@
> 		newIUs.add(patchInstallingJDTLaunching);
> 
> 		//create a patch to install a new version of jdt.debug.ui
>-		MetadataFactory.InstallableUnitDescription newDebugUI = createIUDescriptor((IInstallableUnit) profile.query(new InstallableUnitQuery("org.eclipse.jdt.debug.ui"), new Collector(), new NullProgressMonitor()).iterator().next());
>+		MetadataFactory.InstallableUnitDescription newDebugUI = createIUDescriptor((InstallableUnit) profile.query(new InstallableUnitQuery("org.eclipse.jdt.debug.ui"), new Collector(), new NullProgressMonitor()).iterator().next());
> 		Version newDebugVersion = new Version(3, 3, 0, "zeNewVersion");
> 		changeVersion(newDebugUI, newDebugVersion);
> 		newIUs.add(MetadataFactory.createInstallableUnit(newDebugUI));
>Index: src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest1.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest1.java,v
>retrieving revision 1.1
>diff -u -r1.1 SDKPatchingTest1.java
>--- src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest1.java	4 Dec 2008 02:27:14 -0000	1.1
>+++ src/org/eclipse/equinox/p2/tests/planner/SDKPatchingTest1.java	15 Dec 2008 07:48:41 -0000
>@@ -4,6 +4,7 @@
> import java.util.ArrayList;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry;
>+import org.eclipse.equinox.internal.p2.metadata.InstallableUnit;
> 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;
>@@ -26,7 +27,7 @@
> 		profile = registry.getProfile("SDKProfile");
> 		assertNotNull(profile);
> 
>-		MetadataFactory.InstallableUnitDescription newCommon = createIUDescriptor((IInstallableUnit) profile.query(new InstallableUnitQuery("org.eclipse.equinox.common"), new Collector(), new NullProgressMonitor()).iterator().next());
>+		MetadataFactory.InstallableUnitDescription newCommon = createIUDescriptor((InstallableUnit) profile.query(new InstallableUnitQuery("org.eclipse.equinox.common"), new Collector(), new NullProgressMonitor()).iterator().next());
> 		Version newVersionCommon = new Version(3, 5, 0, "zeNewVersion");
> 		changeVersion(newCommon, newVersionCommon);
> 		newIUs.add(MetadataFactory.createInstallableUnit(newCommon));
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 JREActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java	12 Dec 2008 21:10:05 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -82,7 +82,7 @@
> 		assertTrue(foo.getTouchpointType().getVersion().equals(new Version("1.0.0"))); //$NON-NLS-1$
> 
> 		// check provided capabilities
>-		ProvidedCapability[] fooProvidedCapabilities = foo.getProvidedCapabilities();
>+		IProvidedCapability[] fooProvidedCapabilities = foo.getProvidedCapabilities();
> 		assertTrue(fooProvidedCapabilities.length == numProvidedCapabilities);
> 
> 		ArrayList barIUs = new ArrayList(publisherResult.getIUs("config.a.jre", IPublisherResult.ROOT)); //$NON-NLS-1$
>@@ -93,11 +93,11 @@
> 		assertTrue(((TouchpointInstruction) instructions.get("install")).getBody().equals("unzip(source:@artifact, target:${installFolder});")); //$NON-NLS-1$//$NON-NLS-2$
> 		assertTrue(((TouchpointInstruction) instructions.get("uninstall")).getBody().equals("cleanupzip(source:@artifact, target:${installFolder});")); //$NON-NLS-1$ //$NON-NLS-2$
> 
>-		RequiredCapability[] requiredCapability = bar.getRequiredCapabilities();
>+		IRequiredCapability[] requiredCapability = bar.getRequiredCapabilities();
> 		verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, "a.jre", new VersionRange(JREVersion, true, new Version(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE), true)); //$NON-NLS-1$ 
> 		assertTrue(requiredCapability.length == 1);
> 
>-		ProvidedCapability[] providedCapability = bar.getProvidedCapabilities();
>+		IProvidedCapability[] providedCapability = bar.getProvidedCapabilities();
> 		verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, "config.a.jre", JREVersion); //$NON-NLS-1$ 
> 		assertTrue(providedCapability.length == 1);
> 
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 EquinoxExecutableActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java	3 Oct 2008 19:49:40 -0000	1.3
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -92,10 +92,10 @@
> 			IInstallableUnit possibleEclipse = (IInstallableUnit) iuList.get(i);
> 			if (possibleEclipse.getId().equals(flavorArg + idBase + ".executable." + configSpec)) {//$NON-NLS-1$ 
> 				IInstallableUnitFragment fragment = (IInstallableUnitFragment) iuList.get(i);
>-				ProvidedCapability[] providedCapability = fragment.getProvidedCapabilities();
>+				IProvidedCapability[] providedCapability = fragment.getProvidedCapabilities();
> 				verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, flavorArg + idBase + ".executable." + configSpec, version); //$NON-NLS-1$ 
> 				assertTrue(providedCapability.length == 1);
>-				RequiredCapability[] requiredCapability = fragment.getRequiredCapabilities();
>+				IRequiredCapability[] requiredCapability = fragment.getRequiredCapabilities();
> 				verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$ 
> 				assertTrue(requiredCapability.length == 1);
> 				assertTrue(fragment.getFilter().equals("(& (osgi.ws=" + ws + ")(osgi.os=" + os + ")(osgi.arch=" + arch + "))")); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
>@@ -112,10 +112,10 @@
> 			IInstallableUnit possibleEclipse = (IInstallableUnit) iuList.get(i);
> 			if (possibleEclipse.getId().equals((idBase + ".executable." + configSpec + ".eclipse"))) { //$NON-NLS-1$//$NON-NLS-2$
> 				assertTrue(possibleEclipse.getVersion().equals(version));
>-				ProvidedCapability[] providedCapability = possibleEclipse.getProvidedCapabilities();
>+				IProvidedCapability[] providedCapability = possibleEclipse.getProvidedCapabilities();
> 				verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec + ".eclipse", version); //$NON-NLS-1$ //$NON-NLS-2$ 
> 				assertTrue(providedCapability.length == 1);
>-				RequiredCapability[] req = possibleEclipse.getRequiredCapabilities();
>+				IRequiredCapability[] req = possibleEclipse.getRequiredCapabilities();
> 				assertTrue(req.length == 0);
> 				return;//pass
> 			}
>@@ -138,12 +138,12 @@
> 				assertTrue(eKey.getClassifier().equals("binary")); //$NON-NLS-1$
> 				assertTrue(eKey.getId().equals(idBase + ".executable." + configSpec)); //$NON-NLS-1$
> 				assertTrue(eKey.getVersion().equals(version));
>-				ProvidedCapability[] providedCapabilities = possibleExec.getProvidedCapabilities();
>+				IProvidedCapability[] providedCapabilities = possibleExec.getProvidedCapabilities();
> 				verifyProvidedCapability(providedCapabilities, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec, version); //$NON-NLS-1$ 
> 				verifyProvidedCapability(providedCapabilities, flavorArg + idBase, idBase + ".executable", version); //$NON-NLS-1$
> 				assertTrue(providedCapabilities.length == 2);
> 
>-				RequiredCapability[] requiredCapability = possibleExec.getRequiredCapabilities();
>+				IRequiredCapability[] requiredCapability = possibleExec.getRequiredCapabilities();
> 				verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.launcher." + (idBase.equals("mac") || idBase.equals("macCocoa") ? configSpec.substring(0, configSpec.lastIndexOf(".")) : configSpec), VersionRange.emptyRange); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
> 				assertTrue(requiredCapability.length == 1);
> 				return;//pass
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 ConfigCUsActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java	3 Oct 2008 19:49:40 -0000	1.3
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -57,13 +57,13 @@
> 		assertTrue(iu.getId().equalsIgnoreCase(flavor + id + ".configuration")); //$NON-NLS-1$
> 
> 		//verify ProvidedCapabilities
>-		ProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
>+		IProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
> 		verifyProvidedCapability(providedCapabilities, "org.eclipse.equinox.p2.iu", iu.getId(), version); //$NON-NLS-1$
> 		//		verifyProvidedCapability(providedCapabilities, flavor + id, id + ".config", version); //$NON-NLS-1$
> 		assertTrue(providedCapabilities.length == 1);
> 
> 		//verify RequiredCapabilities
>-		RequiredCapability[] requiredCapability = iu.getRequiredCapabilities();
>+		IRequiredCapability[] requiredCapability = iu.getRequiredCapabilities();
> 		verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, flavor + id + ".config." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$
> 		verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, flavor + id + ".ini." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$
> 		assertTrue(requiredCapability.length == 2);
>@@ -83,7 +83,7 @@
> 				assertTrue(iu.getVersion().equals(version));
> 				assertTrue(iu.getProperty("org.eclipse.equinox.p2.type.fragment").equals("true")); //$NON-NLS-1$//$NON-NLS-2$
> 				assertFalse(iu.isSingleton());
>-				ProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
>+				IProvidedCapability[] providedCapabilities = iu.getProvidedCapabilities();
> 				verifyProvidedCapability(providedCapabilities, IInstallableUnit.NAMESPACE_IU_ID, flavor + id + "." + cuType + "." + configSpec, version); //$NON-NLS-1$//$NON-NLS-2$
> 				verifyProvidedCapability(providedCapabilities, flavor + id, id + "." + cuType, version); //$NON-NLS-1$
> 				assertTrue(providedCapabilities.length == 2);
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/ActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ActionTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 ActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/ActionTest.java	12 Dec 2008 21:10:05 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/ActionTest.java	15 Dec 2008 07:48:41 -0000
>@@ -55,14 +55,14 @@
> 		return (String[]) result.toArray(new String[result.size()]);
> 	}
> 
>-	protected void verifyProvidedCapability(ProvidedCapability[] prov, String namespace, String name, Version version) {
>+	protected void verifyProvidedCapability(IProvidedCapability[] prov, String namespace, String name, Version version) {
> 		for (int i = 0; i < prov.length; i++)
> 			if (prov[i].getName().equalsIgnoreCase(name) && prov[i].getNamespace().equalsIgnoreCase(namespace) && prov[i].getVersion().equals(version))
> 				return; // pass
> 		Assert.fail("Missing ProvidedCapability: " + name + version.toString()); //$NON-NLS-1$
> 	}
> 
>-	protected void verifyRequiredCapability(RequiredCapability[] required, String namespace, String name, VersionRange range) {
>+	protected void verifyRequiredCapability(IRequiredCapability[] required, String namespace, String name, VersionRange range) {
> 		for (int i = 0; i < required.length; i++)
> 			if (required[i].getName().equalsIgnoreCase(name) && required[i].getNamespace().equalsIgnoreCase(namespace) && required[i].getRange().equals(range))
> 				return;
>@@ -104,18 +104,18 @@
> 		return map;
> 	}
> 
>-	protected void contains(ProvidedCapability[] capabilities, String namespace, String name, Version version) {
>+	protected void contains(IProvidedCapability[] capabilities, String namespace, String name, Version version) {
> 		for (int i = 0; i < capabilities.length; i++) {
>-			ProvidedCapability capability = capabilities[i];
>+			IProvidedCapability capability = capabilities[i];
> 			if (capability.getNamespace().equals(namespace) && capability.getName().equals(name) && capability.getVersion().equals(version))
> 				return;
> 		}
> 		fail();
> 	}
> 
>-	protected void contains(RequiredCapability[] capabilities, String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple) {
>+	protected void contains(IRequiredCapability[] capabilities, String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple) {
> 		for (int i = 0; i < capabilities.length; i++) {
>-			RequiredCapability capability = capabilities[i];
>+			IRequiredCapability capability = capabilities[i];
> 			if (filter == null) {
> 				if (capability.getFilter() != null)
> 					continue;
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 RootIUActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java	3 Dec 2008 22:54:35 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -17,7 +17,7 @@
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Status;
> 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.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
> import org.eclipse.equinox.internal.provisional.p2.query.Query;
> import org.eclipse.equinox.p2.publisher.IPublisherResult;
>@@ -270,7 +270,7 @@
> 		IInstallableUnit iu = (IInstallableUnit) ius.get(0);
> 		assertTrue(iu != null);
> 		assertTrue(iu.getVersion().equals(versionArg));
>-		RequiredCapability[] required = iu.getRequiredCapabilities();
>+		IRequiredCapability[] required = iu.getRequiredCapabilities();
> 		if ((testSpec & EMPTY) > 0)
> 			assertEquals(required.length, 0);
> 		String confirmedIUs = ""; //$NON-NLS-1$
>@@ -296,7 +296,7 @@
> 			debug("Confirmed \t\t  Empty"); //$NON-NLS-1$
> 	}
> 
>-	private boolean contains(RequiredCapability[] required, String iu) {
>+	private boolean contains(IRequiredCapability[] required, String iu) {
> 		for (int i = 0; i < required.length; i++)
> 			if (required[i].getName().equalsIgnoreCase(iu))
> 				return true;
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 BundlesActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java	25 Nov 2008 16:01:16 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -124,22 +124,22 @@
> 		assertEquals("1.1", bundle1IU.getVersion(), TEST1_BUNDLE_VERSION);
> 
> 		// check required capabilities
>-		RequiredCapability[] requiredCapability = bundle1IU.getRequiredCapabilities();
>+		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
>-		ProvidedCapability[] providedCapabilities = bundle1IU.getProvidedCapabilities();
>+		IProvidedCapability[] providedCapabilities = bundle1IU.getProvidedCapabilities();
> 		verifyProvidedCapability(providedCapabilities, PROVBUNDLE_NAMESPACE, TEST1_PROVBUNDLE_NAME, TEST1_BUNDLE_VERSION);
> 		verifyProvidedCapability(providedCapabilities, OSGI, TEST1_PROVBUNDLE_NAME, TEST1_BUNDLE_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);
> 
>-		TouchpointData[] data = bundle1IU.getTouchpointData();
>+		ITouchpointData[] data = bundle1IU.getTouchpointData();
> 		boolean found = false;
> 		for (int i = 0; i < data.length; i++) {
>-			TouchpointInstruction configure = data[i].getInstruction("configure");
>+			ITouchpointInstruction configure = data[i].getInstruction("configure");
> 			if (configure == null)
> 				continue;
> 			String body = configure.getBody();
>@@ -159,14 +159,14 @@
> 		assertEquals(bundle2IU.getVersion(), BUNDLE2_VERSION);
> 
> 		// check required capabilities
>-		RequiredCapability[] requiredCapabilities = bundle2IU.getRequiredCapabilities();
>+		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
>-		ProvidedCapability[] providedCapabilities = bundle2IU.getProvidedCapabilities();
>+		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);
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 EquinoxLauncherCUActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java	24 Oct 2008 19:22:51 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -17,7 +17,7 @@
> 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.internal.provisional.p2.metadata.IProvidedCapability;
> import org.eclipse.equinox.p2.publisher.IPublisherResult;
> import org.eclipse.equinox.p2.publisher.PublisherResult;
> import org.eclipse.equinox.p2.publisher.actions.IVersionAdvice;
>@@ -71,7 +71,7 @@
> 				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);
> 
>-				ProvidedCapability[] cap = iu.getProvidedCapabilities();
>+				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);
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 ProductActionWithAdviceFileTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java	3 Dec 2008 22:54:35 -0000	1.1
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java	15 Dec 2008 07:48:42 -0000
>@@ -14,7 +14,7 @@
> import java.io.IOException;
> import java.util.Collection;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointData;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData;
> import org.eclipse.equinox.p2.publisher.IPublisherResult;
> import org.eclipse.equinox.p2.publisher.PublisherInfo;
> import org.eclipse.equinox.p2.publisher.eclipse.ProductAction;
>@@ -45,7 +45,7 @@
> 		Collection productIUs = publisherResult.getIUs("productWithAdvice.product", IPublisherResult.NON_ROOT);
> 		assertEquals("1.0", 1, productIUs.size());
> 		IInstallableUnit product = (IInstallableUnit) productIUs.iterator().next();
>-		TouchpointData[] data = product.getTouchpointData();
>+		ITouchpointData[] data = product.getTouchpointData();
> 		assertEquals("1.1", 1, data.length);
> 		String configure = data[0].getInstruction("configure").getBody();
> 		assertEquals("1.2", "addRepository(type:0,location:http${#58}//download.eclipse.org/releases/fred);addRepository(type:1,location:http${#58}//download.eclipse.org/releases/fred);", configure);
>Index: src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java,v
>retrieving revision 1.6
>diff -u -r1.6 FeaturesActionTest.java
>--- src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java	25 Nov 2008 16:01:16 -0000	1.6
>+++ src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java	15 Dec 2008 07:48:42 -0000
>@@ -88,14 +88,14 @@
> 		assertTrue(foo.getTouchpointType().getVersion().equals(fooVersion));
> 
> 		//zipped=true
>-		TouchpointData[] tpData = foo.getTouchpointData();
>+		ITouchpointData[] tpData = foo.getTouchpointData();
> 		String fooValue = ((TouchpointInstruction) tpData[0].getInstructions().get("zipped")).getBody(); //$NON-NLS-1$
> 		assertTrue(fooValue.equalsIgnoreCase("true")); //$NON-NLS-1$
> 
>-		RequiredCapability[] fooRequiredCapabilities = foo.getRequiredCapabilities();
>+		IRequiredCapability[] fooRequiredCapabilities = foo.getRequiredCapabilities();
> 		assertTrue(fooRequiredCapabilities.length == 0);
> 
>-		ProvidedCapability[] fooProvidedCapabilities = foo.getProvidedCapabilities();
>+		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$
>@@ -107,7 +107,7 @@
> 		IInstallableUnit fooGroup = (IInstallableUnit) fooIUs.get(0);
> 		tpData = fooGroup.getTouchpointData();
> 		assertEquals(1, tpData.length);
>-		TouchpointInstruction instruction = tpData[0].getInstruction("install");
>+		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());
> 
>@@ -133,11 +133,11 @@
> 		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)
>-		RequiredCapability[] barRequiredCapabilities = bar.getRequiredCapabilities();
>+		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);
> 
>-		ProvidedCapability[] barProvidedCapabilities = bar.getProvidedCapabilities();
>+		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$
>Index: src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java,v
>retrieving revision 1.25
>diff -u -r1.25 PhaseTest.java
>--- src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java	4 Dec 2008 21:41:48 -0000	1.25
>+++ src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java	15 Dec 2008 07:48:40 -0000
>@@ -82,7 +82,7 @@
> 			if (parsedActions != null)
> 				return parsedActions;
> 
>-			TouchpointType type = unit.getTouchpointType();
>+			ITouchpointType type = unit.getTouchpointType();
> 			if (type == null || type == TouchpointType.NONE)
> 				return null;
> 
>Index: src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java,v
>retrieving revision 1.12
>diff -u -r1.12 FragmentTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java	28 Feb 2008 01:11:03 -0000	1.12
>+++ src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java	15 Dec 2008 07:48:40 -0000
>@@ -86,7 +86,7 @@
> 
> 	public void testDefaultIUCapability() {
> 		IInstallableUnit iu = createEclipseIU("ui.test1");
>-		ProvidedCapability[] cap = iu.getProvidedCapabilities();
>+		IProvidedCapability[] cap = iu.getProvidedCapabilities();
> 		for (int i = 0; i < cap.length; i++) {
> 			if (cap[i].getNamespace().equals(IInstallableUnit.NAMESPACE_IU_ID)) {
> 				assertEquals(cap[i].getNamespace(), IInstallableUnit.NAMESPACE_IU_ID);
>Index: src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java,v
>retrieving revision 1.13
>diff -u -r1.13 IUPersistenceTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java	30 Oct 2008 03:59:39 -0000	1.13
>+++ src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java	15 Dec 2008 07:48:41 -0000
>@@ -401,20 +401,20 @@
> 	}
> 
> 	private static String[][] extractProvides(IInstallableUnit iu) {
>-		ProvidedCapability[] provydes = iu.getProvidedCapabilities();
>+		IProvidedCapability[] provydes = iu.getProvidedCapabilities();
> 		String[][] tuples = new String[provydes.length][3];
> 		for (int i = 0; i < provydes.length; i++) {
>-			ProvidedCapability next = provydes[i];
>+			IProvidedCapability next = provydes[i];
> 			tuples[i] = new String[] {next.getNamespace(), next.getName(), next.getVersion().toString()};
> 		}
> 		return tuples;
> 	}
> 
> 	private static String[][] extractRequires(IInstallableUnit iu) {
>-		RequiredCapability[] requyres = iu.getRequiredCapabilities();
>+		IRequiredCapability[] requyres = iu.getRequiredCapabilities();
> 		String[][] tuples = new String[requyres.length][4];
> 		for (int i = 0; i < requyres.length; i++) {
>-			RequiredCapability next = requyres[i];
>+			IRequiredCapability next = requyres[i];
> 			tuples[i] = new String[] {next.getNamespace(), next.getName(), next.getRange().toString(), Boolean.valueOf(next.isOptional()).toString()};
> 		}
> 		return tuples;
>Index: src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java,v
>retrieving revision 1.13
>diff -u -r1.13 FragmentMethodTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java	28 Feb 2008 01:11:03 -0000	1.13
>+++ src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java	15 Dec 2008 07:48:40 -0000
>@@ -27,10 +27,10 @@
> 	private static final String TEST_REQUIRED = "testRequired";
> 	IInstallableUnit iu1;
> 	IInstallableUnit iu3;
>-	RequiredCapability[] iu1Deps;
>-	RequiredCapability[] iu3Deps;
>-	ProvidedCapability[] iu1Caps;
>-	ProvidedCapability[] iu3Caps;
>+	IRequiredCapability[] iu1Deps;
>+	IRequiredCapability[] iu3Deps;
>+	IProvidedCapability[] iu1Caps;
>+	IProvidedCapability[] iu3Caps;
> 
> 	protected void setUp() throws Exception {
> 		super.setUp();
>@@ -64,10 +64,10 @@
> 	}
> 
> 	public void testCapabilities() {
>-		ProvidedCapability[] iuCapabilities = iu1Caps;
>-		ProvidedCapability[] initialFragmentCapabilities = iu3Caps;
>+		IProvidedCapability[] iuCapabilities = iu1Caps;
>+		IProvidedCapability[] initialFragmentCapabilities = iu3Caps;
> 
>-		ProvidedCapability[] mergedCapabilities = iu1.getProvidedCapabilities();
>+		IProvidedCapability[] mergedCapabilities = iu1.getProvidedCapabilities();
> 		for (int i = 0; i < iuCapabilities.length; i++) {
> 			FragmentTest.assertContainsWithEquals(mergedCapabilities, iuCapabilities[i]);
> 		}
>Index: src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 IUPatchPersistenceTest.java
>--- src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java	18 Aug 2008 21:44:03 -0000	1.4
>+++ src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java	15 Dec 2008 07:48:40 -0000
>@@ -349,10 +349,10 @@
> 	}
> 
> 	private static String[][] extractProvides(IInstallableUnit iu) {
>-		ProvidedCapability[] provydes = iu.getProvidedCapabilities();
>+		IProvidedCapability[] provydes = iu.getProvidedCapabilities();
> 		String[][] tuples = new String[provydes.length][3];
> 		for (int i = 0; i < provydes.length; i++) {
>-			ProvidedCapability next = provydes[i];
>+			IProvidedCapability next = provydes[i];
> 			tuples[i] = new String[] {next.getNamespace(), next.getName(), next.getVersion().toString()};
> 		}
> 		return tuples;
>Index: src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java,v
>retrieving revision 1.77
>diff -u -r1.77 AbstractProvisioningTest.java
>--- src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java	12 Dec 2008 21:10:05 -0000	1.77
>+++ src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java	15 Dec 2008 07:48:38 -0000
>@@ -17,6 +17,7 @@
> import org.eclipse.core.runtime.*;
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
>+import org.eclipse.equinox.internal.p2.metadata.InstallableUnit;
> import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;
> import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
> import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
>@@ -442,7 +443,7 @@
> 	}
> 
> 	public static void changeVersion(InstallableUnitDescription desc, Version newVersion) {
>-		ProvidedCapability[] capabilities = desc.getProvidedCapabilities();
>+		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);
>@@ -450,25 +451,25 @@
> 		desc.setVersion(newVersion);
> 	}
> 
>-	public static MetadataFactory.InstallableUnitDescription createIUDescriptor(IInstallableUnit prototype) {
>+	public static MetadataFactory.InstallableUnitDescription createIUDescriptor(InstallableUnit prototype) {
> 		InstallableUnitDescription desc = new MetadataFactory.InstallableUnitDescription();
> 		desc.setArtifacts(prototype.getArtifacts());
>-		ProvidedCapability originalCapabilities[] = prototype.getProvidedCapabilities();
>+		ProvidedCapability originalCapabilities[] = (ProvidedCapability[]) prototype.getProvidedCapabilities();
> 		ProvidedCapability newCapabilities[] = new ProvidedCapability[originalCapabilities.length];
> 		for (int i = 0; i < originalCapabilities.length; i++) {
> 			newCapabilities[i] = MetadataFactory.createProvidedCapability(originalCapabilities[i].getNamespace(), originalCapabilities[i].getName(), originalCapabilities[i].getVersion());
> 		}
> 		desc.setCapabilities(newCapabilities);
>-		desc.setCopyright(prototype.getCopyright());
>+		desc.setCopyright((Copyright) prototype.getCopyright());
> 		desc.setFilter(prototype.getFilter());
> 		desc.setId(prototype.getId());
>-		desc.setLicense(prototype.getLicense());
>-		RequiredCapability[] originalRequirements = prototype.getRequiredCapabilities();
>+		desc.setLicense((License) prototype.getLicense());
>+		RequiredCapability[] originalRequirements = (RequiredCapability[]) prototype.getRequiredCapabilities();
> 		RequiredCapability[] newRequirements = new RequiredCapability[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());
> 		}
>-		desc.setRequiredCapabilities(prototype.getRequiredCapabilities());
>+		desc.setRequiredCapabilities((RequiredCapability[]) prototype.getRequiredCapabilities());
> 		desc.setSingleton(prototype.isSingleton());
> 		desc.setTouchpointType(MetadataFactory.createTouchpointType(prototype.getTouchpointType().getId(), prototype.getTouchpointType().getVersion()));
> 		desc.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(prototype.getUpdateDescriptor().getId(), prototype.getUpdateDescriptor().getRange(), prototype.getUpdateDescriptor().getSeverity(), prototype.getUpdateDescriptor().getDescription()));
>@@ -1039,7 +1040,7 @@
> 	/*
> 	 * Compare 2 copyright objects and fail if they are not considered equal.
> 	 */
>-	protected static void assertEquals(String message, Copyright cpyrt1, Copyright cpyrt2) {
>+	protected static void assertEquals(String message, ICopyright cpyrt1, ICopyright cpyrt2) {
> 		if (cpyrt1 == cpyrt2)
> 			return;
> 		if (cpyrt1 == null || cpyrt2 == null) {
>Index: src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java,v
>retrieving revision 1.19
>diff -u -r1.19 UpdateSiteTest.java
>--- src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java	27 Oct 2008 18:51:19 -0000	1.19
>+++ src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java	15 Dec 2008 07:48:43 -0000
>@@ -424,7 +424,7 @@
> 		Collector result = metadataRepo.query(query, new Collector(), null);
> 		assertEquals("1.0", 1, result.size());
> 		IInstallableUnit featureIU = (IInstallableUnit) result.iterator().next();
>-		RequiredCapability[] required = featureIU.getRequiredCapabilities();
>+		IRequiredCapability[] required = featureIU.getRequiredCapabilities();
> 		for (int i = 0; i < required.length; i++) {
> 			if (required[i].getName().equals("org.eclipse.ui.ide")) {
> 				assertEquals("2.0", VersionRange.emptyRange, required[i].getRange());
>@@ -471,7 +471,7 @@
> 		Collector result = repository.query(new InstallableUnitQuery("test.feature.feature.jar"), new Collector(), getMonitor());
> 		assertTrue("1.0", !result.isEmpty());
> 		IInstallableUnit unit = (IInstallableUnit) result.iterator().next();
>-		TouchpointData[] data = unit.getTouchpointData();
>+		ITouchpointData[] data = unit.getTouchpointData();
> 		assertEquals("1.1", 1, data.length);
> 		Map instructions = data[0].getInstructions();
> 		assertEquals("1.2", 1, instructions.size());
>Index: src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java,v
>retrieving revision 1.20
>diff -u -r1.20 RepositoryListenerTest.java
>--- src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java	7 Nov 2008 16:26:02 -0000	1.20
>+++ src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java	15 Dec 2008 07:48:40 -0000
>@@ -33,7 +33,7 @@
> 		return new TestSuite(RepositoryListenerTest.class);
> 	}
> 
>-	public static boolean isZipped(TouchpointData[] data) {
>+	public static boolean isZipped(ITouchpointData[] data) {
> 		if (data == null || data.length == 0)
> 			return false;
> 		for (int i = 0; i < data.length; i++) {
>Index: src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 ResolutionHelperTest.java
>--- src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java	10 Feb 2008 22:45:02 -0000	1.3
>+++ src/org/eclipse/equinox/p2/tests/director/ResolutionHelperTest.java	15 Dec 2008 07:48:39 -0000
>@@ -60,7 +60,7 @@
> 
> 		assertEquals("1.0", 1, unsatisfied.length);
> 		assertEquals("1.1", "match", unsatisfied[0].getUnsatisfiedUnit().getId());
>-		RequiredCapability capability = unsatisfied[0].getRequiredCapability();
>+		IRequiredCapability capability = unsatisfied[0].getRequiredCapability();
> 		assertEquals("1.4", "test.capability", capability.getNamespace());
> 		assertEquals("1.5", "test", capability.getName());
> 	}
>@@ -89,7 +89,7 @@
> 
> 		assertEquals("1.0", 1, unsatisfied.length);
> 		assertEquals("1.1", "match", unsatisfied[0].getUnsatisfiedUnit().getId());
>-		RequiredCapability capability = unsatisfied[0].getRequiredCapability();
>+		IRequiredCapability capability = unsatisfied[0].getRequiredCapability();
> 		assertEquals("1.4", "test.capability", capability.getNamespace());
> 		assertEquals("1.5", "test", capability.getName());
> 	}
>@@ -120,7 +120,7 @@
> 		unsatisfied = rh.install(installSet, available);
> 		assertEquals("1.1", 1, unsatisfied.length);
> 		assertEquals("1.2", "toInstall", unsatisfied[0].getUnsatisfiedUnit().getId());
>-		RequiredCapability capability = unsatisfied[0].getRequiredCapability();
>+		IRequiredCapability capability = unsatisfied[0].getRequiredCapability();
> 		assertEquals("1.3", "test.capability", capability.getNamespace());
> 		assertEquals("1.4", "test", capability.getName());
> 
>@@ -233,7 +233,7 @@
> 
> 		assertEquals("1.0", 1, unsatisfied.length);
> 		assertEquals("1.1", "match", unsatisfied[0].getUnsatisfiedUnit().getId());
>-		RequiredCapability capability = unsatisfied[0].getRequiredCapability();
>+		IRequiredCapability capability = unsatisfied[0].getRequiredCapability();
> 		assertEquals("1.4", "test.capability", capability.getNamespace());
> 		assertEquals("1.5", "does.not.exist", capability.getName());
> 	}
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java,v
>retrieving revision 1.5
>diff -u -r1.5 CategoryElement.java
>--- src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java	25 Nov 2008 18:45:50 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java	15 Dec 2008 07:48:45 -0000
>@@ -12,8 +12,7 @@
> 
> import java.util.*;
> import org.eclipse.core.runtime.IProgressMonitor;
>-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.metadata.*;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.QueryProvider;
> 
>@@ -26,7 +25,7 @@
> public class CategoryElement extends RemoteQueriedElement implements IIUElement {
> 
> 	private ArrayList ius = new ArrayList(1);
>-	private RequiredCapability[] requirements;
>+	private IRequiredCapability[] requirements;
> 
> 	public CategoryElement(Object parent, IInstallableUnit iu) {
> 		super(parent);
>@@ -85,7 +84,7 @@
> 		ius.add(iu);
> 	}
> 
>-	public RequiredCapability[] getRequirements() {
>+	public IRequiredCapability[] getRequirements() {
> 		if (ius == null || ius.isEmpty())
> 			return new RequiredCapability[0];
> 		if (requirements == null) {
>Index: src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java,v
>retrieving revision 1.5
>diff -u -r1.5 RollbackProfileElement.java
>--- src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java	25 Nov 2008 18:45:50 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/ui/model/RollbackProfileElement.java	15 Dec 2008 07:48:45 -0000
>@@ -19,7 +19,7 @@
> 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.internal.provisional.p2.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.query.IQueryable;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
> import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
>@@ -134,7 +134,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.p2.ui.model.IUElement#getRequirements()
> 	 */
>-	public RequiredCapability[] getRequirements() {
>+	public IRequiredCapability[] getRequirements() {
> 		return iu.getRequiredCapabilities();
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java,v
>retrieving revision 1.20
>diff -u -r1.20 AvailableIUElement.java
>--- src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java	3 Dec 2008 22:44:40 -0000	1.20
>+++ src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java	15 Dec 2008 07:48:45 -0000
>@@ -19,7 +19,7 @@
> 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.internal.provisional.p2.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
> import org.eclipse.equinox.internal.provisional.p2.ui.operations.ProvisioningUtil;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
>@@ -127,7 +127,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.p2.ui.model.IUElement#getRequirements()
> 	 */
>-	public RequiredCapability[] getRequirements() {
>+	public IRequiredCapability[] getRequirements() {
> 		return iu.getRequiredCapabilities();
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/ui/model/IIUElement.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/IIUElement.java,v
>retrieving revision 1.2
>diff -u -r1.2 IIUElement.java
>--- src/org/eclipse/equinox/internal/p2/ui/model/IIUElement.java	25 Nov 2008 18:45:50 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/ui/model/IIUElement.java	15 Dec 2008 07:48:45 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.core.runtime.IProgressMonitor;
> 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.metadata.IRequiredCapability;
> 
> /**
>  * Interface for elements that represent IU's.
>@@ -49,7 +49,7 @@
> 
> 	public void computeSize(IProgressMonitor monitor);
> 
>-	public RequiredCapability[] getRequirements();
>+	public IRequiredCapability[] getRequirements();
> 
> 	public Object getParent(Object obj);
> 
>Index: src/org/eclipse/equinox/internal/p2/ui/query/UncategorizedElementCollector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/UncategorizedElementCollector.java,v
>retrieving revision 1.2
>diff -u -r1.2 UncategorizedElementCollector.java
>--- src/org/eclipse/equinox/internal/p2/ui/query/UncategorizedElementCollector.java	7 Oct 2008 23:04:42 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/ui/query/UncategorizedElementCollector.java	15 Dec 2008 07:48:46 -0000
>@@ -13,7 +13,7 @@
> import java.util.*;
> import org.eclipse.equinox.internal.p2.ui.model.QueriedElementCollector;
> 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.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.query.Collector;
> import org.eclipse.equinox.internal.provisional.p2.query.IQueryable;
> 
>@@ -95,7 +95,7 @@
> 		Iterator iter = categories.iterator();
> 		while (iter.hasNext()) {
> 			IInstallableUnit categoryIU = (IInstallableUnit) iter.next();
>-			RequiredCapability[] requirements = categoryIU.getRequiredCapabilities();
>+			IRequiredCapability[] requirements = categoryIU.getRequiredCapabilities();
> 			for (int i = 0; i < requirements.length; i++) {
> 				if (requirements[i].getNamespace().equals(IInstallableUnit.NAMESPACE_IU_ID)) {
> 					IInstallableUnit[] arrayAllOthers = (IInstallableUnit[]) allOthers.toArray(new IInstallableUnit[allOthers.size()]);
>Index: src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementCollector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementCollector.java,v
>retrieving revision 1.4
>diff -u -r1.4 CategoryElementCollector.java
>--- src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementCollector.java	25 Nov 2008 18:35:33 -0000	1.4
>+++ src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementCollector.java	15 Dec 2008 07:48:46 -0000
>@@ -48,7 +48,7 @@
> 		if (!(match instanceof IInstallableUnit))
> 			return true;
> 		IInstallableUnit iu = (IInstallableUnit) match;
>-		RequiredCapability[] requirements = iu.getRequiredCapabilities();
>+		IRequiredCapability[] requirements = iu.getRequiredCapabilities();
> 		for (int i = 0; i < requirements.length; i++) {
> 			if (requirements[i].getNamespace().equals(IInstallableUnit.NAMESPACE_IU_ID)) {
> 				referredIUs.add(requirements[i].getName());
>Index: src/org/eclipse/equinox/internal/p2/ui/query/AnyRequiredCapabilityQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/AnyRequiredCapabilityQuery.java,v
>retrieving revision 1.3
>diff -u -r1.3 AnyRequiredCapabilityQuery.java
>--- src/org/eclipse/equinox/internal/p2/ui/query/AnyRequiredCapabilityQuery.java	17 Oct 2008 20:38:14 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/ui/query/AnyRequiredCapabilityQuery.java	15 Dec 2008 07:48:45 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.equinox.internal.p2.ui.query;
> 
> 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.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.query.Query;
> 
> /**
>@@ -19,12 +19,12 @@
>  * meet any one of the given capabilities.  
>  */
> public class AnyRequiredCapabilityQuery extends Query {
>-	private RequiredCapability[] requirements;
>+	private IRequiredCapability[] requirements;
> 
> 	/**
> 	 * Creates a new query for the capabilities of the given IU.
> 	 */
>-	public AnyRequiredCapabilityQuery(RequiredCapability[] requirements) {
>+	public AnyRequiredCapabilityQuery(IRequiredCapability[] requirements) {
> 		this.requirements = requirements;
> 	}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java,v
>retrieving revision 1.8
>diff -u -r1.8 IULicensePropertyPage.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java	10 Oct 2008 19:58:38 -0000	1.8
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IULicensePropertyPage.java	15 Dec 2008 07:48:46 -0000
>@@ -13,7 +13,7 @@
> import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
> import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.License;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;
> import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>@@ -32,7 +32,7 @@
> 
> 	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
> 		// Get the license in the default locale
>-		final License license = IUPropertyUtils.getLicense(iu);
>+		final ILicense license = IUPropertyUtils.getLicense(iu);
> 		if (license != null && license.getBody().length() > 0) {
> 			Composite composite = new Composite(parent, SWT.NONE);
> 			GridLayout layout = new GridLayout();
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java,v
>retrieving revision 1.7
>diff -u -r1.7 IUCopyrightPropertyPage.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java	10 Oct 2008 19:58:38 -0000	1.7
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/dialogs/IUCopyrightPropertyPage.java	15 Dec 2008 07:48:46 -0000
>@@ -13,7 +13,7 @@
> import java.net.MalformedURLException;
> import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
> import org.eclipse.equinox.internal.p2.ui.dialogs.IUPropertyPage;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.Copyright;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
> import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
> import org.eclipse.osgi.util.NLS;
>@@ -33,7 +33,7 @@
> 
> 	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
> 		// Get the copyright in the current locale
>-		final Copyright copyright = IUPropertyUtils.getCopyright(iu);
>+		final ICopyright copyright = IUPropertyUtils.getCopyright(iu);
> 		if (copyright != null && copyright.getBody().length() > 0) {
> 			Composite composite = new Composite(parent, SWT.NONE);
> 			GridLayout layout = new GridLayout();
>Index: src/org/eclipse/equinox/internal/p2/ui/SimpleLicenseManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/SimpleLicenseManager.java,v
>retrieving revision 1.2
>diff -u -r1.2 SimpleLicenseManager.java
>--- src/org/eclipse/equinox/internal/p2/ui/SimpleLicenseManager.java	7 Oct 2008 23:04:43 -0000	1.2
>+++ src/org/eclipse/equinox/internal/p2/ui/SimpleLicenseManager.java	15 Dec 2008 07:48:45 -0000
>@@ -11,16 +11,14 @@
>  *******************************************************************************/
> package org.eclipse.equinox.internal.p2.ui;
> 
>-import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
>-
>-import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
>-
> import java.io.*;
> import java.math.BigInteger;
> import java.util.*;
> import javax.xml.parsers.*;
> import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.License;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.ILicense;
>+import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
>+import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.LicenseManager;
> import org.eclipse.ui.statushandlers.StatusManager;
> import org.w3c.dom.*;
>@@ -37,21 +35,21 @@
> 	java.util.Set accepted = new HashSet();
> 
> 	public boolean accept(IInstallableUnit iu) {
>-		License license = IUPropertyUtils.getLicense(iu);
>+		ILicense license = IUPropertyUtils.getLicense(iu);
> 		if (license != null)
> 			accepted.add(license.getDigest());
> 		return true;
> 	}
> 
> 	public boolean reject(IInstallableUnit iu) {
>-		License license = IUPropertyUtils.getLicense(iu);
>+		ILicense license = IUPropertyUtils.getLicense(iu);
> 		if (license != null)
> 			accepted.remove(license.getDigest());
> 		return true;
> 	}
> 
> 	public boolean isAccepted(IInstallableUnit iu) {
>-		License license = IUPropertyUtils.getLicense(iu);
>+		ILicense license = IUPropertyUtils.getLicense(iu);
> 		if (license == null)
> 			return true;
> 		return accepted.contains(license.getDigest());
>Index: src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java,v
>retrieving revision 1.15
>diff -u -r1.15 AcceptLicensesWizardPage.java
>--- src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java	25 Nov 2008 18:45:49 -0000	1.15
>+++ src/org/eclipse/equinox/internal/p2/ui/dialogs/AcceptLicensesWizardPage.java	15 Dec 2008 07:48:45 -0000
>@@ -18,8 +18,7 @@
> import org.eclipse.equinox.internal.provisional.p2.director.ProvisioningPlan;
> import org.eclipse.equinox.internal.provisional.p2.engine.InstallableUnitOperand;
> import org.eclipse.equinox.internal.provisional.p2.engine.Operand;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.License;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> import org.eclipse.equinox.internal.provisional.p2.ui.IUPropertyUtils;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUI;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy;
>@@ -215,7 +214,7 @@
> 	}
> 
> 	private String getLicenseBody(IInstallableUnit iu) {
>-		License license = IUPropertyUtils.getLicense(iu);
>+		ILicense license = IUPropertyUtils.getLicense(iu);
> 		if (license != null && license.getBody() != null)
> 			return license.getBody();
> 		// shouldn't happen because we already reduced the list to those
>@@ -254,7 +253,7 @@
> 		for (int i = 0; i < iusToCheck.length; i++) {
> 			IInstallableUnit iu = iusToCheck[i];
> 			String name = labelProvider.getText(iu);
>-			License license = IUPropertyUtils.getLicense(iu);
>+			ILicense license = IUPropertyUtils.getLicense(iu);
> 			// It has a license, is it already accepted?
> 			if (license != null) {
> 				if (!policy.getLicenseManager().isAccepted(iu)) {
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/IUPropertyUtils.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/IUPropertyUtils.java,v
>retrieving revision 1.3
>diff -u -r1.3 IUPropertyUtils.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/IUPropertyUtils.java	10 Oct 2008 19:58:38 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/IUPropertyUtils.java	15 Dec 2008 07:48:46 -0000
>@@ -35,12 +35,12 @@
> 	private static Map LocaleCollectorCache = new HashMap(2);
> 
> 	// Get the license in the default locale.
>-	public static License getLicense(IInstallableUnit iu) {
>+	public static ILicense getLicense(IInstallableUnit iu) {
> 		return getLicense(iu, getCurrentLocale());
> 	}
> 
> 	// Get the copyright in the default locale.
>-	public static Copyright getCopyright(IInstallableUnit iu) {
>+	public static ICopyright getCopyright(IInstallableUnit iu) {
> 		return getCopyright(iu, getCurrentLocale());
> 	}
> 
>@@ -49,8 +49,8 @@
> 		return getIUProperty(iu, propertyKey, getCurrentLocale());
> 	}
> 
>-	public static License getLicense(IInstallableUnit iu, Locale locale) {
>-		License license = iu.getLicense();
>+	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;
>@@ -59,8 +59,8 @@
> 		return new License(license.getLocation(), body);
> 	}
> 
>-	public static Copyright getCopyright(IInstallableUnit iu, Locale locale) {
>-		Copyright copyright = iu.getCopyright();
>+	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;
>@@ -101,9 +101,9 @@
> 				boolean haveHost = false;
> 				if (object instanceof IInstallableUnitFragment) {
> 					IInstallableUnitFragment fragment = (IInstallableUnitFragment) object;
>-					RequiredCapability[] hosts = fragment.getHost();
>+					IRequiredCapability[] hosts = fragment.getHost();
> 					for (int i = 0; i < hosts.length; i++) {
>-						RequiredCapability nextHost = hosts[i];
>+						IRequiredCapability nextHost = hosts[i];
> 						if (IInstallableUnit.NAMESPACE_IU_ID.equals(nextHost.getNamespace()) && //
> 								theUnit.getId().equals(nextHost.getName()) && //
> 								nextHost.getRange() != null && //
>@@ -174,9 +174,9 @@
> 				boolean haveLocale = false;
> 				if (object instanceof IInstallableUnitFragment) {
> 					IInstallableUnitFragment fragment = (IInstallableUnitFragment) object;
>-					ProvidedCapability[] provides = fragment.getProvidedCapabilities();
>+					IProvidedCapability[] provides = fragment.getProvidedCapabilities();
> 					for (int j = 0; j < provides.length && !haveLocale; j++) {
>-						ProvidedCapability nextProvide = provides[j];
>+						IProvidedCapability nextProvide = provides[j];
> 						if (NAMESPACE_IU_LOCALIZATION.equals(nextProvide.getNamespace())) {
> 							String providedLocale = nextProvide.getName();
> 							if (providedLocale != null) {
>Index: src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java,v
>retrieving revision 1.6
>diff -u -r1.6 InstalledIUElement.java
>--- src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java	25 Nov 2008 18:40:10 -0000	1.6
>+++ src/org/eclipse/equinox/internal/provisional/p2/ui/model/InstalledIUElement.java	15 Dec 2008 07:48:46 -0000
>@@ -14,7 +14,7 @@
> import org.eclipse.equinox.internal.p2.ui.model.IIUElement;
> import org.eclipse.equinox.internal.p2.ui.model.QueriedElement;
> 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.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.ui.ProvUIImages;
> import org.eclipse.equinox.internal.provisional.p2.ui.policy.QueryProvider;
> 
>@@ -83,7 +83,7 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.equinox.internal.p2.ui.model.IUElement#getRequirements()
> 	 */
>-	public RequiredCapability[] getRequirements() {
>+	public IRequiredCapability[] getRequirements() {
> 		return iu.getRequiredCapabilities();
> 	}
> 
>#P org.eclipse.equinox.p2.metadata
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java,v
>retrieving revision 1.3
>diff -u -r1.3 CapabilityQuery.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java	17 Oct 2008 20:38:15 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/query/CapabilityQuery.java	15 Dec 2008 07:48:49 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.equinox.internal.provisional.p2.metadata.query;
> 
> 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.metadata.IRequiredCapability;
> import org.eclipse.equinox.internal.provisional.p2.query.Query;
> 
> /**
>@@ -19,14 +19,14 @@
>  * capabilities that match one or more required capabilities.
>  */
> public class CapabilityQuery extends Query {
>-	private RequiredCapability[] required;
>+	private IRequiredCapability[] required;
> 
> 	/**
> 	 * Creates a new query on the given required capability.
> 	 * @param required The required capability
> 	 */
>-	public CapabilityQuery(RequiredCapability required) {
>-		this.required = new RequiredCapability[] {required};
>+	public CapabilityQuery(IRequiredCapability required) {
>+		this.required = new IRequiredCapability[] {required};
> 	}
> 
> 	/**
>@@ -35,7 +35,7 @@
> 	 * for this query to be satisfied.
> 	 * @param required The required capabilities
> 	 */
>-	public CapabilityQuery(RequiredCapability[] required) {
>+	public CapabilityQuery(IRequiredCapability[] required) {
> 		this.required = required;
> 	}
> 
>@@ -43,7 +43,7 @@
> 	 * Returns the required capability that this query is matching against.
> 	 * @return the required capability that this query is matching against.
> 	 */
>-	public RequiredCapability[] getRequiredCapabilities() {
>+	public IRequiredCapability[] getRequiredCapabilities() {
> 		return required;
> 	}
> 
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java,v
>retrieving revision 1.6
>diff -u -r1.6 RequiredCapability.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java	3 Dec 2008 19:31:52 -0000	1.6
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/RequiredCapability.java	15 Dec 2008 07:48:49 -0000
>@@ -24,7 +24,7 @@
>  * 
>  * @see IInstallableUnit#NAMESPACE_IU_ID
>  */
>-public class RequiredCapability {
>+public class RequiredCapability implements IRequiredCapability {
> 	private static final String[] NO_SELECTORS = new String[0];
> 
> 	private String filter;
>@@ -81,33 +81,36 @@
> 		return true;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#getFilter()
>+	 */
> 	public String getFilter() {
> 		return filter;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#getName()
>+	 */
> 	public String getName() {
> 		return name;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#getNamespace()
>+	 */
> 	public String getNamespace() {
> 		return namespace;
> 	}
> 
>-	/**
>-	 * 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.
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#getRange()
> 	 */
> 	public VersionRange getRange() {
> 		return range;
> 	}
> 
>-	/**
>-	 * 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.
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#getSelectors()
> 	 */
> 	public String[] getSelectors() {
> 		return selectors;
>@@ -125,30 +128,37 @@
> 		return result;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#isMultiple()
>+	 */
> 	public boolean isMultiple() {
> 		return multiple;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#isOptional()
>+	 */
> 	public boolean isOptional() {
> 		return optional;
> 	}
> 
>-	/**
>-	 * TODO This object shouldn't be mutable since it makes equality unstable, and
>-	 * introduces lifecycle issues (how are the changes persisted, etc)
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#setFilter(java.lang.String)
> 	 */
> 	public void setFilter(String filter) {
> 		this.filter = filter;
> 	}
> 
>-	/**
>-	 * TODO This object shouldn't be mutable since it makes equality unstable, and
>-	 * introduces lifecycle issues (how are the changes persisted, etc)
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#setSelectors(java.lang.String[])
> 	 */
> 	public void setSelectors(String[] selectors) {
> 		this.selectors = selectors;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IRequiredCapability#isGreedy()
>+	 */
> 	public boolean isGreedy() {
> 		return greedy;
> 	}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java,v
>retrieving revision 1.2
>diff -u -r1.2 TouchpointType.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java	5 Dec 2008 22:14:24 -0000	1.2
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointType.java	15 Dec 2008 07:48:49 -0000
>@@ -16,7 +16,7 @@
>  * Identifies a particular touchpoint. A touchpoint is identified by an id 
>  * and a version.
>  */
>-public class TouchpointType {
>+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.
>@@ -42,10 +42,16 @@
> 		return id.equals(other.id) && version.equals(other.version);
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType#getId()
>+	 */
> 	public String getId() {
> 		return id;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointType#getVersion()
>+	 */
> 	public Version getVersion() {
> 		return version;
> 	}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/License.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/License.java,v
>retrieving revision 1.3
>diff -u -r1.3 License.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/License.java	10 Oct 2008 19:58:45 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/License.java	15 Dec 2008 07:48:49 -0000
>@@ -21,7 +21,7 @@
>  * 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 class License {
>+public class License implements ILicense {
> 	/**
> 	 * The <code>body</code> contains the descriptive text for the license. This may
> 	 * be a summary for a full license specified in a URL.
>@@ -54,27 +54,22 @@
> 		this.location = location;
> 	}
> 
>-	/**
>-	 * Returns the location of a document containing the full license.
>-	 * 
>-	 * @return the location of the license document, or <code>null</code>
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ILicense#getLocation()
> 	 */
> 	public URI getLocation() {
> 		return location;
> 	}
> 
>-	/**
>-	 * Returns the license body.
>-	 * @return the license body, never <code>null</code>
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ILicense#getBody()
> 	 */
> 	public String getBody() {
> 		return body;
> 	}
> 
>-	/**
>-	 * 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>
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ILicense#getDigest()
> 	 */
> 	public synchronized BigInteger getDigest() {
> 		if (digest == null)
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointInstruction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointInstruction.java,v
>retrieving revision 1.5
>diff -u -r1.5 TouchpointInstruction.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointInstruction.java	7 Nov 2008 16:35:52 -0000	1.5
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointInstruction.java	15 Dec 2008 07:48:49 -0000
>@@ -48,7 +48,7 @@
>  * @noextend This class is not intended to be subclassed by clients.
>  * @see MetadataFactory#createTouchpointInstruction(String, String)
>  */
>-public class TouchpointInstruction {
>+public class TouchpointInstruction implements ITouchpointInstruction {
> 
> 	private final String body;
> 	private final String importAttribute;
>@@ -128,17 +128,17 @@
> 		return true;
> 	}
> 
>-	/**
>-	 * 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
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction#getBody()
> 	 */
> 	public String getBody() {
> 		return body;
> 	}
> 
> 	//TODO What is this? Please doc
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointInstruction#getImportAttribute()
>+	 */
> 	public String getImportAttribute() {
> 		return importAttribute;
> 	}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java,v
>retrieving revision 1.15
>diff -u -r1.15 MetadataFactory.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java	5 Dec 2008 22:14:24 -0000	1.15
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java	15 Dec 2008 07:48:49 -0000
>@@ -32,7 +32,7 @@
> 		public void addProvidedCapabilities(Collection additional) {
> 			if (additional == null || additional.size() == 0)
> 				return;
>-			ProvidedCapability[] current = unit().getProvidedCapabilities();
>+			IProvidedCapability[] current = unit().getProvidedCapabilities();
> 			ProvidedCapability[] result = new ProvidedCapability[additional.size() + current.length];
> 			System.arraycopy(current, 0, result, 0, current.length);
> 			int j = current.length;
>@@ -44,7 +44,7 @@
> 		public void addRequiredCapabilities(Collection additional) {
> 			if (additional == null || additional.size() == 0)
> 				return;
>-			RequiredCapability[] current = unit().getRequiredCapabilities();
>+			IRequiredCapability[] current = unit().getRequiredCapabilities();
> 			RequiredCapability[] result = new RequiredCapability[additional.size() + current.length];
> 			System.arraycopy(current, 0, result, 0, current.length);
> 			int j = current.length;
>@@ -62,11 +62,11 @@
> 			return unit().getId();
> 		}
> 
>-		public ProvidedCapability[] getProvidedCapabilities() {
>+		public IProvidedCapability[] getProvidedCapabilities() {
> 			return unit().getProvidedCapabilities();
> 		}
> 
>-		public RequiredCapability[] getRequiredCapabilities() {
>+		public IRequiredCapability[] getRequiredCapabilities() {
> 			return unit().getRequiredCapabilities();
> 		}
> 
>@@ -76,7 +76,7 @@
> 		 * 
> 		 * @return The current touchpoint data on this description
> 		 */
>-		public TouchpointData[] getTouchpointData() {
>+		public ITouchpointData[] getTouchpointData() {
> 			return unit().getTouchpointData();
> 
> 		}
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java,v
>retrieving revision 1.15
>diff -u -r1.15 IInstallableUnit.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java	17 Oct 2008 20:38:15 -0000	1.15
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnit.java	15 Dec 2008 07:48:48 -0000
>@@ -192,13 +192,13 @@
> 
> 	public String getProperty(String key);
> 
>-	public ProvidedCapability[] getProvidedCapabilities();
>+	public IProvidedCapability[] getProvidedCapabilities();
> 
>-	public RequiredCapability[] getRequiredCapabilities();
>+	public IRequiredCapability[] getRequiredCapabilities();
> 
>-	public TouchpointData[] getTouchpointData();
>+	public ITouchpointData[] getTouchpointData();
> 
>-	public TouchpointType getTouchpointType();
>+	public ITouchpointType getTouchpointType();
> 
> 	public Version getVersion();
> 
>@@ -224,7 +224,7 @@
> 	 * @return <code>true</code> if this unit satisfies the given required
> 	 * capability, and <code>false</code> otherwise.
> 	 */
>-	public boolean satisfies(RequiredCapability candidate);
>+	public boolean satisfies(IRequiredCapability candidate);
> 
> 	/**
> 	 * Returns the unresolved equivalent of this installable unit. If this unit is
>@@ -248,11 +248,11 @@
> 	 * Returns the license that applies to this installable unit.
> 	 * @return the license that applies to this installable unit or <code>null</code>
> 	 */
>-	public License getLicense();
>+	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 Copyright getCopyright();
>+	public ICopyright getCopyright();
> }
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointData.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointData.java,v
>retrieving revision 1.6
>diff -u -r1.6 TouchpointData.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointData.java	13 Dec 2008 02:55:43 -0000	1.6
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/TouchpointData.java	15 Dec 2008 07:48:49 -0000
>@@ -22,7 +22,7 @@
>  * @noextend This class is not intended to be subclassed by clients.
>  * @see MetadataFactory#createTouchpointData(Map)
>  */
>-public class TouchpointData {
>+public class TouchpointData implements ITouchpointData {
> 
> 	/**
> 	 * Map of (String->TouchpointInstruction). The set
>@@ -58,18 +58,15 @@
> 		this.instructions = instructions;
> 	}
> 
>-	/**
>-	 * Returns the touchpoint instruction corresponding to the given key.
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData#getInstruction(java.lang.String)
> 	 */
>-	public TouchpointInstruction getInstruction(String instructionKey) {
>+	public ITouchpointInstruction getInstruction(String instructionKey) {
> 		return (TouchpointInstruction) instructions.get(instructionKey);
> 	}
> 
>-	/**
>-	 * Returns an unmodifiable map of the touchpoint instructions. The map
>-	 * keys are strings, and the values are instances of {@link TouchpointInstruction}.
>-	 *
>-	 * @return the touchpoint instructions
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ITouchpointData#getInstructions()
> 	 */
> 	public Map getInstructions() {
> 		return Collections.unmodifiableMap(instructions);
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/Copyright.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/Copyright.java,v
>retrieving revision 1.2
>diff -u -r1.2 Copyright.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/Copyright.java	10 Oct 2008 19:58:45 -0000	1.2
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/Copyright.java	15 Dec 2008 07:48:48 -0000
>@@ -17,7 +17,7 @@
>  * 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 class Copyright {
>+public class Copyright implements ICopyright {
> 	/**
> 	 * The <code>body</code> contains the descriptive text for the copyright. This may
> 	 * be a summary for a copyright specified in a URL.
>@@ -43,19 +43,15 @@
> 		this.body = body;
> 	}
> 
>-	/**
>-	 * Returns the location of a document containing the copyright notice.
>-	 * 
>-	 * @return The location of the copyright notice, or <code>null</code>
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright#getLocation()
> 	 */
> 	public URI getLocation() {
> 		return location;
> 	}
> 
>-	/**
>-	 * Returns the license body.
>-	 * 
>-	 * @return the license body, never <code>null</code>
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.ICopyright#getBody()
> 	 */
> 	public String getBody() {
> 		return body;
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java,v
>retrieving revision 1.3
>diff -u -r1.3 IInstallableUnitFragment.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java	28 Feb 2008 01:10:58 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/IInstallableUnitFragment.java	15 Dec 2008 07:48:48 -0000
>@@ -9,5 +9,5 @@
> package org.eclipse.equinox.internal.provisional.p2.metadata;
> 
> public interface IInstallableUnitFragment extends IInstallableUnit {
>-	public RequiredCapability[] getHost();
>+	public IRequiredCapability[] getHost();
> }
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java,v
>retrieving revision 1.2
>diff -u -r1.2 ProvidedCapability.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java	17 Oct 2008 20:38:15 -0000	1.2
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/ProvidedCapability.java	15 Dec 2008 07:48:49 -0000
>@@ -16,7 +16,7 @@
> /**
>  * Describes a capability as exposed or required by an installable unit
>  */
>-public class ProvidedCapability {
>+public class ProvidedCapability implements IProvidedCapability {
> 	private final String name;
> 	private final String namespace;
> 	private final Version version;
>@@ -37,14 +37,23 @@
> 		return false;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability#getName()
>+	 */
> 	public String getName() {
> 		return name;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability#getNamespace()
>+	 */
> 	public String getNamespace() {
> 		return namespace;
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability#getVersion()
>+	 */
> 	public Version getVersion() {
> 		return version;
> 	}
>@@ -53,12 +62,10 @@
> 		return namespace.hashCode() * name.hashCode() * version.hashCode();
> 	}
> 
>-	/**
>-	 * 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.
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.equinox.internal.provisional.p2.metadata.IProvidedCapability#satisfies(org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability)
> 	 */
>-	public boolean satisfies(RequiredCapability candidate) {
>+	public boolean satisfies(IRequiredCapability candidate) {
> 		if (getName() == null || !getName().equals(candidate.getName()))
> 			return false;
> 		if (getNamespace() == null || !getNamespace().equals(candidate.getNamespace()))
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/IArtifactKey.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/IArtifactKey.java,v
>retrieving revision 1.3
>diff -u -r1.3 IArtifactKey.java
>--- src/org/eclipse/equinox/internal/provisional/p2/metadata/IArtifactKey.java	25 Feb 2008 22:13:20 -0000	1.3
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/IArtifactKey.java	15 Dec 2008 07:48:48 -0000
>@@ -21,6 +21,7 @@
>  */
> 
> public interface IArtifactKey {
>+	static final String SEPARATOR = ","; //$NON-NLS-1$
> 
> 	/**
> 	 * Returns the classifier for this artifact key. The returned value can be empty.
>Index: src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java,v
>retrieving revision 1.10
>diff -u -r1.10 ResolvedInstallableUnit.java
>--- src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java	3 Dec 2008 03:06:01 -0000	1.10
>+++ src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java	15 Dec 2008 07:48:48 -0000
>@@ -62,7 +62,7 @@
> 		return original.getProperties();
> 	}
> 
>-	public ProvidedCapability[] getProvidedCapabilities() {
>+	public IProvidedCapability[] getProvidedCapabilities() {
> 		ArrayList result = new ArrayList();
> 		result.addAll(Arrays.asList(original.getProvidedCapabilities()));
> 		for (int i = 0; i < fragments.length; i++) {
>@@ -71,7 +71,7 @@
> 		return (ProvidedCapability[]) result.toArray(new ProvidedCapability[result.size()]);
> 	}
> 
>-	public RequiredCapability[] getRequiredCapabilities() {
>+	public IRequiredCapability[] getRequiredCapabilities() {
> 		ArrayList result = new ArrayList();
> 		result.addAll(Arrays.asList(original.getRequiredCapabilities()));
> 		for (int i = 0; i < fragments.length; i++) {
>@@ -81,11 +81,11 @@
> 
> 	}
> 
>-	public TouchpointData[] getTouchpointData() {
>+	public ITouchpointData[] getTouchpointData() {
> 		ArrayList result = new ArrayList();
> 		result.addAll(Arrays.asList(original.getTouchpointData()));
> 		for (int i = 0; i < fragments.length; i++) {
>-			TouchpointData[] data = fragments[i].getTouchpointData();
>+			ITouchpointData[] data = fragments[i].getTouchpointData();
> 			for (int j = 0; j < data.length; j++) {
> 				result.add(data[j]);
> 			}
>@@ -93,7 +93,7 @@
> 		return (TouchpointData[]) result.toArray(new TouchpointData[result.size()]);
> 	}
> 
>-	public TouchpointType getTouchpointType() {
>+	public ITouchpointType getTouchpointType() {
> 		return original.getTouchpointType();
> 	}
> 
>@@ -154,16 +154,16 @@
> 		return original.getUpdateDescriptor();
> 	}
> 
>-	public License getLicense() {
>+	public ILicense getLicense() {
> 		return original.getLicense();
> 	}
> 
>-	public Copyright getCopyright() {
>+	public ICopyright getCopyright() {
> 		return original.getCopyright();
> 	}
> 
>-	public boolean satisfies(RequiredCapability candidate) {
>-		ProvidedCapability[] provides = getProvidedCapabilities();
>+	public boolean satisfies(IRequiredCapability candidate) {
>+		IProvidedCapability[] provides = getProvidedCapabilities();
> 		for (int i = 0; i < provides.length; i++)
> 			if (provides[i].satisfies(candidate))
> 				return true;
>Index: src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java,v
>retrieving revision 1.8
>diff -u -r1.8 ArtifactKey.java
>--- src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java	25 Feb 2008 22:13:20 -0000	1.8
>+++ src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java	15 Dec 2008 07:48:48 -0000
>@@ -22,7 +22,6 @@
>  * See {link IArtifact for a description of the lifecycle of artifact keys) 
>  */
> public class ArtifactKey implements IArtifactKey {
>-	private static final String SEPARATOR = ","; //$NON-NLS-1$
> 
> 	private final String id;
> 	private final String classifier;
>Index: src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java,v
>retrieving revision 1.6
>diff -u -r1.6 InstallableUnitFragment.java
>--- src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java	28 Feb 2008 01:10:59 -0000	1.6
>+++ src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java	15 Dec 2008 07:48:48 -0000
>@@ -10,8 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.equinox.internal.p2.metadata;
> 
>-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnitFragment;
>-import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability;
>+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
> 
> public class InstallableUnitFragment extends InstallableUnit implements IInstallableUnitFragment {
> 
>@@ -29,7 +28,7 @@
> 	}
> 
> 	private void addRequiredCapability(RequiredCapability[] toAdd) {
>-		RequiredCapability[] current = super.getRequiredCapabilities();
>+		IRequiredCapability[] current = super.getRequiredCapabilities();
> 		RequiredCapability[] result = new RequiredCapability[current.length + toAdd.length];
> 		System.arraycopy(current, 0, result, 0, current.length);
> 		System.arraycopy(toAdd, 0, result, current.length, toAdd.length);
>@@ -40,7 +39,7 @@
> 		return true;
> 	}
> 
>-	public RequiredCapability[] getHost() {
>+	public IRequiredCapability[] getHost() {
> 		return hostRequirements;
> 	}
> }
>Index: src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java,v
>retrieving revision 1.13
>diff -u -r1.13 InstallableUnit.java
>--- src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java	24 Oct 2008 18:24:16 -0000	1.13
>+++ src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java	15 Dec 2008 07:48:48 -0000
>@@ -135,21 +135,21 @@
> 		return properties().getProperty(key);
> 	}
> 
>-	public ProvidedCapability[] getProvidedCapabilities() {
>+	public IProvidedCapability[] getProvidedCapabilities() {
> 		return providedCapabilities;
> 	}
> 
>-	public RequiredCapability[] getRequiredCapabilities() {
>+	public IRequiredCapability[] getRequiredCapabilities() {
> 		return requires;
> 
> 	}
> 
>-	public TouchpointData[] getTouchpointData() {
>+	public ITouchpointData[] getTouchpointData() {
> 		return (touchpointData == null ? NO_TOUCHPOINT_DATA //
> 				: (TouchpointData[]) touchpointData.toArray(new TouchpointData[touchpointData.size()]));
> 	}
> 
>-	public TouchpointType getTouchpointType() {
>+	public ITouchpointType getTouchpointType() {
> 		return touchpointType != null ? touchpointType : TouchpointType.NONE;
> 	}
> 
>@@ -261,7 +261,7 @@
> 		this.license = license;
> 	}
> 
>-	public License getLicense() {
>+	public ILicense getLicense() {
> 		return license;
> 	}
> 
>@@ -269,12 +269,12 @@
> 		this.copyright = copyright;
> 	}
> 
>-	public Copyright getCopyright() {
>+	public ICopyright getCopyright() {
> 		return copyright;
> 	}
> 
>-	public boolean satisfies(RequiredCapability candidate) {
>-		ProvidedCapability[] provides = getProvidedCapabilities();
>+	public boolean satisfies(IRequiredCapability candidate) {
>+		IProvidedCapability[] provides = getProvidedCapabilities();
> 		for (int i = 0; i < provides.length; i++)
> 			if (provides[i].satisfies(candidate))
> 				return true;
>Index: src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java,v
>retrieving revision 1.1
>diff -u -r1.1 InstallableUnitPatch.java
>--- src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java	14 Aug 2008 19:50:34 -0000	1.1
>+++ src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java	15 Dec 2008 07:48:48 -0000
>@@ -16,7 +16,7 @@
> 	private RequiredCapability[][] scope;
> 
> 	private void addRequiredCapability(RequiredCapability[] toAdd) {
>-		RequiredCapability[] current = super.getRequiredCapabilities();
>+		IRequiredCapability[] current = super.getRequiredCapabilities();
> 		RequiredCapability[] result = new RequiredCapability[current.length + toAdd.length];
> 		System.arraycopy(current, 0, result, 0, current.length);
> 		System.arraycopy(toAdd, 0, result, current.length, toAdd.length);
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/ICopyright.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/ICopyright.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/ICopyright.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/ICopyright.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,31 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+import java.net.URI;
>+
>+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 abstract URI getLocation();
>+
>+	/**
>+	 * Returns the license body.
>+	 * 
>+	 * @return the license body, never <code>null</code>
>+	 */
>+	public abstract String getBody();
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointData.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointData.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointData.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointData.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+import java.util.Map;
>+
>+public interface ITouchpointData {
>+
>+	/**
>+	 * Returns the touchpoint instruction corresponding to the given key.
>+	 */
>+	public abstract ITouchpointInstruction getInstruction(String instructionKey);
>+
>+	/**
>+	 * Returns an unmodifiable map of the touchpoint instructions. The map
>+	 * keys are strings, and the values are instances of {@link TouchpointInstruction}.
>+	 *
>+	 * @return the touchpoint instructions
>+	 */
>+	public abstract Map getInstructions();
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/IRequiredCapability.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/IRequiredCapability.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/IRequiredCapability.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/IRequiredCapability.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,57 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+import org.eclipse.osgi.service.resolver.VersionRange;
>+
>+public interface IRequiredCapability {
>+
>+	public abstract String getFilter();
>+
>+	public abstract String getName();
>+
>+	public abstract 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 abstract 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 abstract String[] getSelectors();
>+
>+	public abstract boolean isMultiple();
>+
>+	public abstract 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 abstract 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 abstract void setSelectors(String[] selectors);
>+
>+	public abstract boolean isGreedy();
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointInstruction.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointInstruction.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointInstruction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointInstruction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,26 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+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 abstract String getBody();
>+
>+	//TODO What is this? Please doc
>+	public abstract String getImportAttribute();
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/ILicense.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/ILicense.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/ILicense.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/ILicense.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,38 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+import java.math.BigInteger;
>+import java.net.URI;
>+
>+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 abstract URI getLocation();
>+
>+	/**
>+	 * Returns the license body.
>+	 * @return the license body, never <code>null</code>
>+	 */
>+	public abstract 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 abstract BigInteger getDigest();
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/IProvidedCapability.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/IProvidedCapability.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/IProvidedCapability.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/IProvidedCapability.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+import org.osgi.framework.Version;
>+
>+public interface IProvidedCapability {
>+
>+	public abstract String getName();
>+
>+	public abstract String getNamespace();
>+
>+	public abstract 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 abstract boolean satisfies(IRequiredCapability candidate);
>+
>+}
>\ No newline at end of file
>Index: src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointType.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointType.java
>diff -N src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/provisional/p2/metadata/ITouchpointType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,21 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.equinox.internal.provisional.p2.metadata;
>+
>+import org.osgi.framework.Version;
>+
>+public interface ITouchpointType {
>+
>+	public abstract String getId();
>+
>+	public abstract Version getVersion();
>+
>+}
>\ No newline at end of file
>#P org.eclipse.equinox.p2.publisher
>Index: src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java,v
>retrieving revision 1.12
>diff -u -r1.12 AbstractPublisherAction.java
>--- src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java	12 Dec 2008 21:11:50 -0000	1.12
>+++ src/org/eclipse/equinox/p2/publisher/AbstractPublisherAction.java	15 Dec 2008 07:48:51 -0000
>@@ -174,14 +174,14 @@
> 			RequiredCapability[] requiredAdvice = entry.getRequiredCapabilities(iu);
> 			ProvidedCapability[] providedAdvice = entry.getProvidedCapabilities(iu);
> 			if (providedAdvice != null) {
>-				RequiredCapability[] current = iu.getRequiredCapabilities();
>+				IRequiredCapability[] current = iu.getRequiredCapabilities();
> 				RequiredCapability[] result = new RequiredCapability[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) {
>-				ProvidedCapability[] current = iu.getProvidedCapabilities();
>+				IProvidedCapability[] current = iu.getProvidedCapabilities();
> 				ProvidedCapability[] result = new ProvidedCapability[providedAdvice.length + current.length];
> 				System.arraycopy(providedAdvice, 0, result, 0, providedAdvice.length);
> 				System.arraycopy(current, 0, result, providedAdvice.length, current.length);
>Index: src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java,v
>retrieving revision 1.14
>diff -u -r1.14 BundlesAction.java
>--- src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java	4 Dec 2008 15:07:56 -0000	1.14
>+++ src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java	15 Dec 2008 07:48:54 -0000
>@@ -263,14 +263,14 @@
> 			RequiredCapability[] requiredAdvice = entry.getRequiredCapabilities(iu);
> 			ProvidedCapability[] providedAdvice = entry.getProvidedCapabilities(iu);
> 			if (providedAdvice != null) {
>-				RequiredCapability[] current = iu.getRequiredCapabilities();
>+				IRequiredCapability[] current = iu.getRequiredCapabilities();
> 				RequiredCapability[] result = new RequiredCapability[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) {
>-				ProvidedCapability[] current = iu.getProvidedCapabilities();
>+				IProvidedCapability[] current = iu.getProvidedCapabilities();
> 				ProvidedCapability[] result = new ProvidedCapability[providedAdvice.length + current.length];
> 				System.arraycopy(providedAdvice, 0, result, 0, providedAdvice.length);
> 				System.arraycopy(current, 0, result, providedAdvice.length, current.length);

Actions: View | Diff

Attachments on bug 256359: 120442 | 121187 | 121190 | 121197 | 121223 | 121328