clean up warnings

24 files changed, 163 insertions, 185 deletions

diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java
index d318b67fc..80380db60 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Activator.java
@@ -20,11 +20,11 @@ public class Activator implements BundleActivator {
 		return context;
 	}
 
-	public void start(BundleContext context) throws Exception {
-		Activator.context = context;
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
 	}
 
-	public void stop(BundleContext context) throws Exception {
+	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
index ed027a03f..76e321431 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
@@ -26,6 +26,8 @@ public class Messages extends NLS {
 	public static String exception_noFeaturesOrLocations;
 	public static String exception_invalidSiteReference;
 	public static String exception_invalidSiteReferenceInFeature;
+	public static String exception_repoMustBeURL;
+	public static String exception_sourcePath;
 
 	public static String message_generatingMetadata;
 	public static String message_generationCompleted;
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
index 330779019..6b2547f6e 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ExecutablesDescriptor.java
@@ -33,14 +33,14 @@ public class ExecutablesDescriptor {
 		// TODO this may need to get more intelligent
 		// if MacOS its going to be baseName.app/Contents/MacOS/baseName
 		if (Constants.OS_MACOSX.equals(os)) {
-			return new File(root, baseName + ".app/Contents/MacOS/" + baseName);
+			return new File(root, baseName + ".app/Contents/MacOS/" + baseName); //$NON-NLS-1$
 		}
 		// if it is not Mac and not Windows it must be a UNIX flavor
 		if (!Constants.OS_WIN32.equals(os)) {
 			return new File(root, baseName);
 		}
 		// otherwise we are left with windows
-		return new File(root, baseName + ".exe");
+		return new File(root, baseName + ".exe"); //$NON-NLS-1$
 	}
 
 	/**
@@ -56,10 +56,10 @@ public class ExecutablesDescriptor {
 		if (executablesFeatureLocation == null || !executablesFeatureLocation.exists())
 			return null;
 		String[] config = AbstractPublisherAction.parseConfigSpec(configSpec);
-		File result = new File(executablesFeatureLocation, "bin/" + config[0] + "/" + config[1] + "/" + config[2]);
+		File result = new File(executablesFeatureLocation, "bin/" + config[0] + "/" + config[1] + "/" + config[2]); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		if (!result.exists())
 			return null;
-		return new ExecutablesDescriptor(config[1], "launcher", result, new File[] {result});
+		return new ExecutablesDescriptor(config[1], "launcher", result, new File[] {result}); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
index caa619101..88ab7a43d 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
@@ -21,6 +21,8 @@ exception_noArtifactRepo=An artifact repository must be specified in order to pu
 exception_noMetadataRepo=A metadata repository must be specified.
 exception_invalidSiteReference=Invalid site reference: {0}
 exception_invalidSiteReferenceInFeature=Invalid site reference {0} in feature {1}.
+exception_repoMustBeURL=Repository location ({0}) must be a URL.
+exception_sourcePath=Source location ({0}) must be a valid file-system path.
 message_generatingMetadata = Generating metadata for {0}.
 message_generationCompleted = Generation completed with success [{0} seconds].
 message_noSimpleconfigurator = Could not find simpleconfigurator bundle.
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
index b05b2cdfb..d731d785b 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
@@ -77,30 +77,30 @@ public abstract class AbstractPublisherApplication implements IApplication {
 		return status;
 	}
 
-	protected void initialize(PublisherInfo info) throws ProvisionException {
+	protected void initialize(PublisherInfo publisherInfo) throws ProvisionException {
 		if (inplace) {
 			File location = new File(source);
 			if (metadataLocation == null)
 				metadataLocation = location.toURI();
 			if (artifactLocation == null)
 				artifactLocation = location.toURI();
-			info.setArtifactOptions(info.getArtifactOptions() | IPublisherInfo.A_INDEX | IPublisherInfo.A_PUBLISH);
+			publisherInfo.setArtifactOptions(publisherInfo.getArtifactOptions() | IPublisherInfo.A_INDEX | IPublisherInfo.A_PUBLISH);
 		}
-		initializeRepositories(info);
+		initializeRepositories(publisherInfo);
 	}
 
 	protected IStatus createConfigurationEror(String message) {
 		return new Status(IStatus.ERROR, "org.eclipse.equinox.p2.publisher", message); //$NON-NLS-1$
 	}
 
-	protected void initializeRepositories(PublisherInfo info) throws ProvisionException {
+	protected void initializeRepositories(PublisherInfo publisherInfo) throws ProvisionException {
 		if (artifactLocation != null)
-			info.setArtifactRepository(Publisher.createArtifactRepository(artifactLocation, artifactRepoName, append, compress, reusePackedFiles));
-		else if ((info.getArtifactOptions() & IPublisherInfo.A_PUBLISH) > 0)
+			publisherInfo.setArtifactRepository(Publisher.createArtifactRepository(artifactLocation, artifactRepoName, append, compress, reusePackedFiles));
+		else if ((publisherInfo.getArtifactOptions() & IPublisherInfo.A_PUBLISH) > 0)
 			throw new ProvisionException(createConfigurationEror(Messages.exception_noArtifactRepo));
 		if (metadataLocation == null)
 			throw new ProvisionException(createConfigurationEror(Messages.exception_noMetadataRepo));
-		info.setMetadataRepository(Publisher.createMetadataRepository(metadataLocation, metadataRepoName, append, compress));
+		publisherInfo.setMetadataRepository(Publisher.createMetadataRepository(metadataLocation, metadataRepoName, append, compress));
 
 		if (contextMetadataRepositories != null && contextMetadataRepositories.length > 0) {
 			CompositeMetadataRepository contextMetadata = CompositeMetadataRepository.createMemoryComposite();
@@ -108,7 +108,7 @@ public abstract class AbstractPublisherApplication implements IApplication {
 				for (int i = 0; i < contextMetadataRepositories.length; i++)
 					contextMetadata.addChild(contextMetadataRepositories[i]);
 				if (contextMetadata.getChildren().size() > 0)
-					info.setContextMetadataRepository(contextMetadata);
+					publisherInfo.setContextMetadataRepository(contextMetadata);
 			}
 		}
 		if (contextArtifactRepositories != null && contextArtifactRepositories.length > 0) {
@@ -118,27 +118,27 @@ public abstract class AbstractPublisherApplication implements IApplication {
 					contextArtifact.addChild(contextArtifactRepositories[i]);
 
 				if (contextArtifact.getChildren().size() > 0)
-					info.setContextArtifactRepository(contextArtifact);
+					publisherInfo.setContextArtifactRepository(contextArtifact);
 			}
 		}
 	}
 
-	protected void processCommandLineArguments(String[] args, PublisherInfo info) throws Exception {
+	protected void processCommandLineArguments(String[] args, PublisherInfo publisherInfo) throws Exception {
 		if (args == null)
 			return;
 		for (int i = 0; i < args.length; i++) {
 			// check for args without parameters (i.e., a flag arg)
-			processFlag(args[i], info);
+			processFlag(args[i], publisherInfo);
 
 			// check for args with parameters. If we are at the last argument or if the next one
 			// has a '-' as the first character, then we can't have an arg with a parm so continue.
 			if (i == args.length - 1 || args[i + 1].startsWith("-")) //$NON-NLS-1$
 				continue;
-			processParameter(args[i], args[++i], info);
+			processParameter(args[i], args[++i], publisherInfo);
 		}
 	}
 
-	protected void processParameter(String arg, String parameter, PublisherInfo info) throws URISyntaxException {
+	protected void processParameter(String arg, String parameter, PublisherInfo publisherInfo) throws URISyntaxException {
 		try {
 			if (arg.equalsIgnoreCase("-metadataRepository") || arg.equalsIgnoreCase("-mr")) //$NON-NLS-1$ //$NON-NLS-2$
 				metadataLocation = URIUtil.fromString(parameter);
@@ -146,7 +146,7 @@ public abstract class AbstractPublisherApplication implements IApplication {
 			if (arg.equalsIgnoreCase("-artifactRepository") || arg.equalsIgnoreCase("-ar")) //$NON-NLS-1$ //$NON-NLS-2$
 				artifactLocation = URIUtil.fromString(parameter);
 		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException("Repository location (" + parameter + ") must be a URL."); //$NON-NLS-1$ //$NON-NLS-2$
+			throw new IllegalArgumentException(NLS.bind(Messages.exception_repoMustBeURL, parameter));
 		}
 
 		if (arg.equalsIgnoreCase("-metadataRepositoryName")) //$NON-NLS-1$
@@ -156,7 +156,7 @@ public abstract class AbstractPublisherApplication implements IApplication {
 			// check here to see if the location actually exists so we can fail gracefully now rather than unpredictably later
 			// see bug 272956 where we would fail with an NPE if someone gave us a URL instead of a file-system path
 			if (!new File(parameter).exists())
-				throw new IllegalArgumentException("Source location (" + parameter + ") must be a valid file-system path.");
+				throw new IllegalArgumentException(NLS.bind(Messages.exception_sourcePath, parameter));
 			source = parameter;
 		}
 
@@ -164,13 +164,13 @@ public abstract class AbstractPublisherApplication implements IApplication {
 			artifactRepoName = parameter;
 
 		if (arg.equalsIgnoreCase("-configs")) //$NON-NLS-1$
-			info.setConfigurations(AbstractPublisherAction.getArrayFromString(parameter, ",")); //$NON-NLS-1$
+			publisherInfo.setConfigurations(AbstractPublisherAction.getArrayFromString(parameter, ",")); //$NON-NLS-1$
 
 		if (arg.equalsIgnoreCase("-contextMetadata")) //$NON-NLS-1$
-			info.setContextMetadataRepository(processMetadataRepositoryList(parameter));
+			publisherInfo.setContextMetadataRepository(processMetadataRepositoryList(parameter));
 
 		if (arg.equalsIgnoreCase("-contextArtifacts")) //$NON-NLS-1$
-			info.setContextArtifactRepository(processArtifactRepositoryList(parameter));
+			publisherInfo.setContextArtifactRepository(processArtifactRepositoryList(parameter));
 	}
 
 	private IArtifactRepository processArtifactRepositoryList(String parameter) {
@@ -210,15 +210,15 @@ public abstract class AbstractPublisherApplication implements IApplication {
 		return result;
 	}
 
-	protected void processFlag(String arg, PublisherInfo info) {
+	protected void processFlag(String arg, PublisherInfo publisherInfo) {
 		if (arg.equalsIgnoreCase("-publishArtifacts") || arg.equalsIgnoreCase("-pa")) //$NON-NLS-1$ //$NON-NLS-2$
-			info.setArtifactOptions(info.getArtifactOptions() | IPublisherInfo.A_PUBLISH);
+			publisherInfo.setArtifactOptions(publisherInfo.getArtifactOptions() | IPublisherInfo.A_PUBLISH);
 
 		if (arg.equalsIgnoreCase("-publishArtifactRepository") || arg.equalsIgnoreCase("-par")) //$NON-NLS-1$ //$NON-NLS-2$
-			info.setArtifactOptions(info.getArtifactOptions() | IPublisherInfo.A_INDEX);
+			publisherInfo.setArtifactOptions(publisherInfo.getArtifactOptions() | IPublisherInfo.A_INDEX);
 
 		if (arg.equalsIgnoreCase("-overwriteArtifacts")) //$NON-NLS-1$ 
-			info.setArtifactOptions(info.getArtifactOptions() | IPublisherInfo.A_OVERWRITE);
+			publisherInfo.setArtifactOptions(publisherInfo.getArtifactOptions() | IPublisherInfo.A_OVERWRITE);
 
 		if (arg.equalsIgnoreCase("-append")) //$NON-NLS-1$
 			append = true;
@@ -276,18 +276,18 @@ public abstract class AbstractPublisherApplication implements IApplication {
 		return new PublisherInfo();
 	}
 
-	public Object run(PublisherInfo info) throws Exception {
+	public Object run(PublisherInfo publisherInfo) throws Exception {
 		try {
+			this.info = publisherInfo;
 			registerEventBus();
 			registerDefaultMetadataRepoManager();
 			registerDefaultArtifactRepoManager();
-			initialize(info);
-			validateInfo(info);
-			System.out.println(NLS.bind(Messages.message_generatingMetadata, info.getSummary()));
+			initialize(publisherInfo);
+			System.out.println(NLS.bind(Messages.message_generatingMetadata, publisherInfo.getSummary()));
 
 			long before = System.currentTimeMillis();
 			IPublisherAction[] actions = createActions();
-			Publisher publisher = createPublisher(info);
+			Publisher publisher = createPublisher(publisherInfo);
 			IStatus result = publisher.publish(actions, new NullProgressMonitor());
 			long after = System.currentTimeMillis();
 
@@ -307,15 +307,8 @@ public abstract class AbstractPublisherApplication implements IApplication {
 
 	protected abstract IPublisherAction[] createActions();
 
-	protected Publisher createPublisher(PublisherInfo info) {
-		return new Publisher(info);
-	}
-
-	protected void validateInfo(PublisherInfo info) {
-		//		if (info.getBaseLocation() == null && info.getProduct() == null) {
-		//			System.out.println(Messages.exception_baseLocationNotSpecified);
-		//			return new Integer(-1);
-		//		}
+	protected Publisher createPublisher(PublisherInfo publisherInfo) {
+		return new Publisher(publisherInfo);
 	}
 
 	public Object start(IApplicationContext context) throws Exception {
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java
index eb4810dd9..bee4129f0 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java
@@ -10,10 +10,9 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 import java.util.*;
 import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
 import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
 
 public class PublisherInfo implements IPublisherInfo {
@@ -89,7 +88,7 @@ public class PublisherInfo implements IPublisherInfo {
 	}
 
 	public String getSummary() {
-		return ".";
+		return "."; //$NON-NLS-1$
 	}
 
 }
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherResult.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherResult.java
index 9abe0d6a6..6428eda8a 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherResult.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherResult.java
@@ -10,11 +10,10 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 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.Version;
 import org.eclipse.equinox.internal.provisional.p2.metadata.query.*;
 
 public class PublisherResult implements IPublisherResult {
@@ -102,7 +101,7 @@ public class PublisherResult implements IPublisherResult {
 		return result == null ? EMPTY_COLLECTION : result;
 	}
 
-	private List flatten(Collection values) {
+	protected List flatten(Collection values) {
 		ArrayList result = new ArrayList();
 		for (Iterator i = values.iterator(); i.hasNext();)
 			for (Iterator j = ((HashSet) i.next()).iterator(); j.hasNext();)
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java
index 4cd405254..6614ee918 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java
@@ -10,9 +10,6 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.actions;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
-
 import java.io.*;
 import java.net.URL;
 import java.util.*;
@@ -30,7 +27,7 @@ import org.osgi.framework.BundleException;
 
 public class JREAction extends AbstractPublisherAction {
 	private static final String DEFAULT_JRE_NAME = "a.jre"; //$NON-NLS-1$
-	private static final Version DEFAULT_JRE_VERSION = new Version("1.6"); //$NON-NLS-1$
+	private static final Version DEFAULT_JRE_VERSION = Version.parseVersion("1.6"); //$NON-NLS-1$
 	private static final String DEFAULT_PROFILE = "/profiles/JavaSE-1.6.profile"; //$NON-NLS-1$
 	private static final String PROFILE_LOCATION = "jre.action.profile.location"; //$NON-NLS-1$
 	private static final String PROFILE_NAME = "osgi.java.profile.name"; //$NON-NLS-1$
@@ -139,7 +136,7 @@ public class JREAction extends AbstractPublisherAction {
 		int idx = profileName.indexOf('-');
 		if (idx != -1) {
 			try {
-				version = new Version(profileName.substring(idx + 1));
+				version = Version.parseVersion(profileName.substring(idx + 1));
 			} catch (IllegalArgumentException e) {
 				//ignore
 			}
@@ -148,14 +145,14 @@ public class JREAction extends AbstractPublisherAction {
 		if (version == null) {
 			try {
 				String targetVersion = profileProperties.getProperty(PROFILE_TARGET_VERSION);
-				version = targetVersion != null ? new Version(targetVersion) : null;
+				version = targetVersion != null ? Version.parseVersion(targetVersion) : null;
 			} catch (IllegalArgumentException e) {
 				//ignore
 			}
 		}
 
 		if (version == null)
-			version = new Version("1.6"); //$NON-NLS-1$
+			version = DEFAULT_JRE_VERSION;
 
 		iu.setVersion(version);
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/MergeResultsAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/MergeResultsAction.java
index d49b4f757..e43e0d0e5 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/MergeResultsAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/MergeResultsAction.java
@@ -23,14 +23,14 @@ public class MergeResultsAction extends AbstractPublisherAction {
 		this.mode = mode;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
 		MultiStatus finalStatus = new MultiStatus(MergeResultsAction.class.getName(), 0, "publishing result", null); //$NON-NLS-1$
 		for (int i = 0; i < actions.length; i++) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
 			IPublisherAction action = actions[i];
 			IPublisherResult result = new PublisherResult();
-			finalStatus.merge(action.perform(info, result, monitor));
+			finalStatus.merge(action.perform(publisherInfo, result, monitor));
 			results.merge(result, mode);
 		}
 		if (!finalStatus.isOK())
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootFilesAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootFilesAction.java
index 3311ae983..b45e16932 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootFilesAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootFilesAction.java
@@ -10,9 +10,6 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.actions;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
-
 import java.io.File;
 import java.util.*;
 import org.eclipse.core.runtime.*;
@@ -46,15 +43,16 @@ public class RootFilesAction extends AbstractPublisherAction {
 		this.flavor = flavor;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
+		setPublisherInfo(publisherInfo);
 		IPublisherResult innerResult = new PublisherResult();
 		// we have N platforms, generate a CU for each
 		// TODO try and find common properties across platforms
-		String[] configSpecs = info.getConfigurations();
+		String[] configSpecs = publisherInfo.getConfigurations();
 		for (int i = 0; i < configSpecs.length; i++) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
-			generateRootFileIUs(configSpecs[i], info, innerResult);
+			generateRootFileIUs(configSpecs[i], innerResult);
 		}
 		// merge the IUs  into the final result as non-roots and create a parent IU that captures them all
 		results.merge(innerResult, IPublisherResult.MERGE_ALL_NON_ROOT);
@@ -77,7 +75,7 @@ public class RootFilesAction extends AbstractPublisherAction {
 	 * Generates IUs and CUs for the files that make up the root files for a given
 	 * ws/os/arch combination.
 	 */
-	private void generateRootFileIUs(String configSpec, IPublisherInfo info, IPublisherResult result) {
+	private void generateRootFileIUs(String configSpec, IPublisherResult result) {
 		// Create the IU for the executable
 		InstallableUnitDescription iu = new MetadataFactory.InstallableUnitDescription();
 		iu.setSingleton(true);
@@ -119,7 +117,7 @@ public class RootFilesAction extends AbstractPublisherAction {
 		if ((info.getArtifactOptions() & (IPublisherInfo.A_INDEX | IPublisherInfo.A_PUBLISH)) > 0) {
 			// Create the artifact descriptor.  we have several files so no path on disk
 			IArtifactDescriptor descriptor = PublisherHelper.createArtifactDescriptor(key, null);
-			IRootFilesAdvice advice = getAdvice(configSpec, info);
+			IRootFilesAdvice advice = getAdvice(configSpec);
 			publishArtifact(descriptor, advice.getIncludedFiles(), advice.getExcludedFiles(), info, createPrefixComputer(advice.getRoot()));
 		}
 	}
@@ -137,7 +135,7 @@ public class RootFilesAction extends AbstractPublisherAction {
 	 * @param info - the publisher info holding the advice.
 	 * @return a compilation of <class>IRootfilesAdvice</class> from the <code>info</code>.
 	 */
-	private IRootFilesAdvice getAdvice(String configSpec, IPublisherInfo info) {
+	private IRootFilesAdvice getAdvice(String configSpec) {
 		Collection advice = info.getAdvice(configSpec, true, null, null, IRootFilesAdvice.class);
 		ArrayList inclusions = new ArrayList();
 		ArrayList exclusions = new ArrayList();
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/VersionAdvice.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/VersionAdvice.java
index 5ebf2fa79..629d2f45b 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/VersionAdvice.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/VersionAdvice.java
@@ -10,10 +10,9 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.actions;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 import java.io.*;
 import java.util.*;
+import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
 import org.eclipse.equinox.p2.publisher.AbstractAdvice;
 import org.eclipse.equinox.p2.publisher.IPublisherAdvice;
 
@@ -61,7 +60,7 @@ public class VersionAdvice extends AbstractAdvice implements IVersionAdvice {
 				if (idSuffix != null)
 					key += idSuffix;
 				String value = properties.getProperty(key);
-				setVersion(namespace, key, new Version(value));
+				setVersion(namespace, key, Version.parseVersion(value));
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AccumulateConfigDataAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AccumulateConfigDataAction.java
index 680366201..a1353770c 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AccumulateConfigDataAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AccumulateConfigDataAction.java
@@ -27,19 +27,19 @@ public class AccumulateConfigDataAction extends AbstractPublisherAction {
 		loader = new DataLoader(configurationLocation, executableLocation);
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
-		storeConfigData(info, configSpec, results);
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
+		storeConfigData(publisherInfo, configSpec, results);
 		return Status.OK_STATUS;
 	}
 
-	protected void storeConfigData(IPublisherInfo info, String configSpec, IPublisherResult result) {
+	protected void storeConfigData(IPublisherInfo publisherInfo, String config, IPublisherResult result) {
 		ConfigData data = loader.getConfigData();
 		if (data == null)
 			return;
-		info.addAdvice(new ConfigAdvice(data, configSpec));
+		publisherInfo.addAdvice(new ConfigAdvice(data, config));
 		LauncherData launcherData = loader.getLauncherData();
 		if (launcherData == null)
 			return;
-		info.addAdvice(new LaunchingAdvice(launcherData, configSpec));
+		publisherInfo.addAdvice(new LaunchingAdvice(launcherData, config));
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AdviceFileParser.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AdviceFileParser.java
index e19ec3776..289ce57d0 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AdviceFileParser.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/AdviceFileParser.java
@@ -8,9 +8,6 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
@@ -60,8 +57,8 @@ public class AdviceFileParser {
 	private static final String ARTIFACTS_PREFIX = "artifacts."; //$NON-NLS-1$
 	private static final String HOST_REQUIREMENTS_PREFIX = "hostRequirements."; //$NON-NLS-1$
 
-	public static final Version COMPATIBLE_VERSION = new Version(1, 0, 0);
-	public static final VersionRange VERSION_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, new Version(2, 0, 0), false);
+	public static final Version COMPATIBLE_VERSION = Version.createOSGi(1, 0, 0);
+	public static final VersionRange VERSION_TOLERANCE = new VersionRange(COMPATIBLE_VERSION, true, Version.createOSGi(2, 0, 0), false);
 
 	private Properties adviceProperties = new Properties();
 	private List adviceProvides = new ArrayList();
@@ -116,7 +113,7 @@ public class AdviceFileParser {
 	}
 
 	private void checkAdviceVersion(String adviceVersion) {
-		Version version = new Version(adviceVersion);
+		Version version = Version.parseVersion(adviceVersion);
 		if (!VERSION_TOLERANCE.isIncluded(version))
 			throw new IllegalStateException("bad version: " + version + ". Expected range was " + VERSION_TOLERANCE); //$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -178,7 +175,7 @@ public class AdviceFileParser {
 			} else if (token.equals(NAMESPACE)) {
 				namespace = currentValue();
 			} else if (token.equals(VERSION)) {
-				capabilityVersion = new Version(substituteVersionAndQualifier(currentValue()));
+				capabilityVersion = Version.parseVersion(substituteVersionAndQualifier(currentValue()));
 			} else {
 				// we ignore elements we do not understand
 			}
@@ -304,7 +301,7 @@ public class AdviceFileParser {
 				unitId = currentValue();
 				next();
 			} else if (token.equals(VERSION)) {
-				unitVersion = new Version(substituteVersionAndQualifier(currentValue()));
+				unitVersion = Version.parseVersion(substituteVersionAndQualifier(currentValue()));
 				next();
 			} else if (token.equals(SINGLETON)) {
 				unitSingleton = Boolean.valueOf(currentValue()).booleanValue();
@@ -322,7 +319,7 @@ public class AdviceFileParser {
 				unitTouchpointId = currentValue();
 				next();
 			} else if (token.equals(TOUCHPOINT_VERSION)) {
-				unitTouchpointVersion = new Version(substituteVersionAndQualifier(currentValue()));
+				unitTouchpointVersion = Version.parseVersion(substituteVersionAndQualifier(currentValue()));
 				next();
 			} else if (token.equals(UPDATE_ID)) {
 				unitUpdateId = currentValue();
@@ -463,7 +460,7 @@ public class AdviceFileParser {
 			} else if (token.equals(ID)) {
 				artifactId = currentValue();
 			} else if (token.equals(VERSION)) {
-				artifactVersion = new Version(substituteVersionAndQualifier(currentValue()));
+				artifactVersion = Version.parseVersion(substituteVersionAndQualifier(currentValue()));
 			} else {
 				// we ignore elements we do not understand
 			}
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java
index a1276dd47..b9272ded1 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ApplicationLauncherAction.java
@@ -55,16 +55,16 @@ public class ApplicationLauncherAction extends AbstractPublisherAction {
 		this.location = location;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
 		// Create the basic actions and run them putting the IUs in a temporary result
-		Collection actions = createActions(info);
-		createAdvice(info, results);
+		Collection actions = createActions(publisherInfo);
+		createAdvice(publisherInfo, results);
 		IPublisherResult innerResult = new PublisherResult();
 		MultiStatus finalStatus = new MultiStatus(ApplicationLauncherAction.class.getName(), 0, "publishing result", null); //$NON-NLS-1$
 		for (Iterator i = actions.iterator(); i.hasNext();) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
-			finalStatus.merge(((IPublisherAction) i.next()).perform(info, innerResult, monitor));
+			finalStatus.merge(((IPublisherAction) i.next()).perform(publisherInfo, innerResult, monitor));
 		}
 		if (!finalStatus.isOK())
 			return finalStatus;
@@ -77,15 +77,15 @@ public class ApplicationLauncherAction extends AbstractPublisherAction {
 	/**
 	 * Create advice needed by the actions related to and following this action
 	 */
-	private void createAdvice(IPublisherInfo info, IPublisherResult results) {
-		createLauncherAdvice(info, results);
+	private void createAdvice(IPublisherInfo publisherInfo, IPublisherResult results) {
+		createLauncherAdvice(publisherInfo, results);
 	}
 
 	/**
 	 * Create and register advice that will tell people what versions of the launcher bundle and 
 	 * fragments are in use in this particular result.
 	 */
-	private void createLauncherAdvice(IPublisherInfo info, IPublisherResult results) {
+	private void createLauncherAdvice(IPublisherInfo publisherInfo, IPublisherResult results) {
 		Collection ius = getIUs(results.getIUs(null, null), EquinoxLauncherCUAction.ORG_ECLIPSE_EQUINOX_LAUNCHER);
 		VersionAdvice advice = new VersionAdvice();
 		boolean found = false;
@@ -99,7 +99,7 @@ public class ApplicationLauncherAction extends AbstractPublisherAction {
 			found = true;
 		}
 		if (found)
-			info.addAdvice(advice);
+			publisherInfo.addAdvice(advice);
 	}
 
 	private Collection getIUs(Collection ius, String prefix) {
@@ -121,18 +121,18 @@ public class ApplicationLauncherAction extends AbstractPublisherAction {
 		result.addIU(rootIU, IPublisherResult.ROOT);
 	}
 
-	private Collection createActions(IPublisherInfo info) {
+	private Collection createActions(IPublisherInfo publisherInfo) {
 		Collection actions = new ArrayList();
 		actions.add(new EquinoxLauncherCUAction(flavor, configSpecs));
 		actions.addAll(createExecutablesActions(configSpecs));
 		return actions;
 	}
 
-	protected Collection createExecutablesActions(String[] configSpecs) {
-		Collection actions = new ArrayList(configSpecs.length);
-		for (int i = 0; i < configSpecs.length; i++) {
-			ExecutablesDescriptor executables = computeExecutables(configSpecs[i]);
-			IPublisherAction action = new EquinoxExecutableAction(executables, configSpecs[i], id, version, flavor);
+	protected Collection createExecutablesActions(String[] configs) {
+		Collection actions = new ArrayList(configs.length);
+		for (int i = 0; i < configs.length; i++) {
+			ExecutablesDescriptor executables = computeExecutables(configs[i]);
+			IPublisherAction action = new EquinoxExecutableAction(executables, configs[i], id, version, flavor);
 			actions.add(action);
 		}
 		return actions;
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
index 111d51966..4eb4bda37 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
@@ -10,9 +10,6 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
-
 import java.io.*;
 import java.util.*;
 import java.util.jar.JarFile;
@@ -28,6 +25,8 @@ import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
 import org.eclipse.equinox.internal.provisional.p2.artifact.repository.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.*;
+import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
+import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;
 import org.eclipse.equinox.p2.publisher.*;
@@ -80,8 +79,8 @@ public class BundlesAction extends AbstractPublisherAction {
 	private static final String CAPABILITY_NS_OSGI_BUNDLE = "osgi.bundle"; //$NON-NLS-1$
 	private static final String CAPABILITY_NS_OSGI_FRAGMENT = "osgi.fragment"; //$NON-NLS-1$
 
-	public static final IProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new Version(1, 0, 0));
-	public static final IProvidedCapability SOURCE_BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, new Version(1, 0, 0));
+	public static final IProvidedCapability BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, Version.createOSGi(1, 0, 0));
+	public static final IProvidedCapability SOURCE_BUNDLE_CAPABILITY = MetadataFactory.createProvidedCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, Version.createOSGi(1, 0, 0));
 
 	static final String DEFAULT_BUNDLE_LOCALIZATION = "plugin"; //$NON-NLS-1$
 
@@ -98,7 +97,7 @@ public class BundlesAction extends AbstractPublisherAction {
 	private BundleDescription[] bundles;
 
 	public static IArtifactKey createBundleArtifactKey(String bsn, String version) {
-		return new ArtifactKey(OSGI_BUNDLE_CLASSIFIER, bsn, new Version(version));
+		return new ArtifactKey(OSGI_BUNDLE_CLASSIFIER, bsn, Version.parseVersion(version));
 	}
 
 	public static IInstallableUnit createBundleConfigurationUnit(String hostId, Version cuVersion, boolean isBundleFragment, GeneratorBundleInfo configInfo, String configurationFlavor, String filter) {
@@ -114,11 +113,11 @@ public class BundlesAction extends AbstractPublisherAction {
 		Version hostVersion = Version.parseVersion(configInfo.getVersion());
 		cu.setHost(new IRequiredCapability[] { //
 				MetadataFactory.createRequiredCapability(CAPABILITY_NS_OSGI_BUNDLE, hostId, new VersionRange(hostVersion, true, PublisherHelper.versionMax, true), null, false, false, true), //
-						MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new VersionRange(new Version(1, 0, 0), true, new Version(2, 0, 0), false), null, false, false, false)});
+						MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, new VersionRange(Version.createOSGi(1, 0, 0), true, Version.createOSGi(2, 0, 0), false), null, false, false, false)});
 
 		//Adds capabilities for fragment, self, and describing the flavor supported
 		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
-		cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, cuVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
+		cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, cuVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, Version.createOSGi(1, 0, 0))});
 
 		Map touchpointData = new HashMap();
 		touchpointData.put("install", "installBundle(bundle:${artifact})"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -326,12 +325,12 @@ public class BundlesAction extends AbstractPublisherAction {
 		InstallableUnitFragmentDescription cu = new InstallableUnitFragmentDescription();
 		String configUnitId = PublisherHelper.createDefaultConfigUnitId(OSGI_BUNDLE_CLASSIFIER, configurationFlavor);
 		cu.setId(configUnitId);
-		Version configUnitVersion = new Version(1, 0, 0);
+		Version configUnitVersion = Version.createOSGi(1, 0, 0);
 		cu.setVersion(configUnitVersion);
 
 		// Add capabilities for fragment, self, and describing the flavor supported
 		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
-		cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
+		cu.setCapabilities(new IProvidedCapability[] {PublisherHelper.createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, Version.createOSGi(1, 0, 0))});
 
 		// Create a required capability on bundles
 		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(PublisherHelper.NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_BUNDLE, VersionRange.emptyRange, null, false, true, false)};
@@ -601,35 +600,35 @@ public class BundlesAction extends AbstractPublisherAction {
 		return Status.OK_STATUS;
 	}
 
-	protected void publishArtifact(IArtifactDescriptor descriptor, File base, File[] inclusions, IPublisherInfo info) {
-		IArtifactRepository destination = info.getArtifactRepository();
+	protected void publishArtifact(IArtifactDescriptor descriptor, File base, File[] inclusions, IPublisherInfo publisherInfo) {
+		IArtifactRepository destination = publisherInfo.getArtifactRepository();
 		if (descriptor == null || destination == null)
 			return;
 
 		// publish the given files
-		publishArtifact(descriptor, inclusions, null, info, createRootPrefixComputer(base));
+		publishArtifact(descriptor, inclusions, null, publisherInfo, createRootPrefixComputer(base));
 	}
 
-	protected void publishArtifact(IArtifactDescriptor descriptor, File jarFile, IPublisherInfo info) {
+	protected void publishArtifact(IArtifactDescriptor descriptor, File jarFile, IPublisherInfo publisherInfo) {
 		// no files to publish so this is done.
-		if (jarFile == null || info == null)
+		if (jarFile == null || publisherInfo == null)
 			return;
 
 		// if the destination already contains the descriptor, there is nothing to do.
-		IArtifactRepository destination = info.getArtifactRepository();
+		IArtifactRepository destination = publisherInfo.getArtifactRepository();
 		if (destination == null || destination.contains(descriptor))
 			return;
 
-		super.publishArtifact(descriptor, jarFile, info);
+		super.publishArtifact(descriptor, jarFile, publisherInfo);
 
 		// if we are assimilating pack200 files then add the packed descriptor
 		// into the repo assuming it does not already exist.
 		boolean reuse = "true".equals(destination.getProperties().get(AbstractPublisherApplication.PUBLISH_PACK_FILES_AS_SIBLINGS)); //$NON-NLS-1$
-		if (reuse && (info.getArtifactOptions() & IPublisherInfo.A_PUBLISH) > 0) {
+		if (reuse && (publisherInfo.getArtifactOptions() & IPublisherInfo.A_PUBLISH) > 0) {
 			File packFile = new Path(jarFile.getAbsolutePath()).addFileExtension("pack.gz").toFile(); //$NON-NLS-1$
 			if (packFile.exists()) {
 				IArtifactDescriptor ad200 = createPack200ArtifactDescriptor(descriptor.getArtifactKey(), packFile, descriptor.getProperty(IArtifactDescriptor.ARTIFACT_SIZE));
-				publishArtifact(ad200, packFile, info);
+				publishArtifact(ad200, packFile, publisherInfo);
 			}
 		}
 	}
@@ -722,14 +721,14 @@ public class BundlesAction extends AbstractPublisherAction {
 	/**
 	 * Adds advice for any p2.inf file found in this bundle.
 	 */
-	private void createAdviceFileAdvice(BundleDescription bundleDescription, IPublisherInfo info) {
+	private void createAdviceFileAdvice(BundleDescription bundleDescription, IPublisherInfo publisherInfo) {
 		String location = bundleDescription.getLocation();
 		if (location == null)
 			return;
 
 		AdviceFileAdvice advice = new AdviceFileAdvice(bundleDescription.getSymbolicName(), Version.fromOSGiVersion(bundleDescription.getVersion()), new Path(location), AdviceFileAdvice.BUNDLE_ADVICE_FILE);
 		if (advice.containsAdvice())
-			info.addAdvice(advice);
+			publisherInfo.addAdvice(advice);
 
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
index 5f1fc9801..0a494365a 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
@@ -10,8 +10,6 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 import java.io.File;
 import java.util.*;
 import java.util.Map.Entry;
@@ -66,7 +64,7 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 	}
 
 	public static String getAbstractCUCapabilityId(String id, String type, String flavor, String configSpec) {
-		return id + "." + type;
+		return id + "." + type; //$NON-NLS-1$
 	}
 
 	/**
@@ -85,22 +83,22 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 		this.version = version;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
 		IPublisherResult innerResult = new PublisherResult();
 		this.outerResults = results;
-		this.info = info;
+		this.info = publisherInfo;
 		// we have N platforms, generate a CU for each
 		// TODO try and find common properties across platforms
-		String[] configSpecs = info.getConfigurations();
+		String[] configSpecs = publisherInfo.getConfigurations();
 		for (int i = 0; i < configSpecs.length; i++) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
 			String configSpec = configSpecs[i];
-			Collection configAdvice = info.getAdvice(configSpec, false, id, version, IConfigAdvice.class);
+			Collection configAdvice = publisherInfo.getAdvice(configSpec, false, id, version, IConfigAdvice.class);
 			BundleInfo[] bundles = fillInBundles(configAdvice, results);
-			publishBundleCUs(info, bundles, configSpec, innerResult);
+			publishBundleCUs(publisherInfo, bundles, configSpec, innerResult);
 			publishConfigIUs(configAdvice, innerResult, configSpec);
-			Collection launchingAdvice = info.getAdvice(configSpec, false, id, version, IExecutableAdvice.class);
+			Collection launchingAdvice = publisherInfo.getAdvice(configSpec, false, id, version, IExecutableAdvice.class);
 			publishIniIUs(launchingAdvice, innerResult, configSpec);
 		}
 		// merge the IUs  into the final result as non-roots and create a parent IU that captures them all
@@ -290,7 +288,7 @@ public class ConfigCUsAction extends AbstractPublisherAction {
 	 * Publish the CUs related to the given set of bundles.  This generally covers the start-level and 
 	 * and whether or not the bundle is to be started.
 	 */
-	protected void publishBundleCUs(IPublisherInfo info, BundleInfo[] bundles, String configSpec, IPublisherResult result) {
+	protected void publishBundleCUs(IPublisherInfo publisherInfo, BundleInfo[] bundles, String configSpec, IPublisherResult result) {
 		if (bundles == null)
 			return;
 
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/DefaultCUsAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/DefaultCUsAction.java
index 8f96357e8..30734f329 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/DefaultCUsAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/DefaultCUsAction.java
@@ -30,7 +30,8 @@ public class DefaultCUsAction extends AbstractPublisherAction {
 		this.start = start;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
+		setPublisherInfo(publisherInfo);
 		generateDefaultConfigIU(results);
 		return Status.OK_STATUS;
 	}
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java
index 2fefc2add..57a314618 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EclipseInstallAction.java
@@ -10,14 +10,12 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.IVersionedId;
-
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 import java.io.File;
 import java.util.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.publisher.eclipse.ExecutablesDescriptor;
+import org.eclipse.equinox.internal.provisional.p2.metadata.IVersionedId;
+import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
 import org.eclipse.equinox.p2.publisher.*;
 import org.eclipse.equinox.p2.publisher.actions.*;
 
@@ -33,6 +31,7 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 	protected boolean start = false;
 
 	protected EclipseInstallAction() {
+		//hidden
 	}
 
 	public EclipseInstallAction(String source, String id, Version version, String name, String executableName, String flavor, IVersionedId[] topLevel, String[] nonRootFiles, boolean start) {
@@ -47,15 +46,15 @@ public class EclipseInstallAction extends AbstractPublisherAction {
 		this.start = start;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
 		monitor = SubMonitor.convert(monitor);
-		this.info = info;
+		this.info = publisherInfo;
 		IPublisherAction[] actions = createActions();
 		MultiStatus finalStatus = new MultiStatus(EclipseInstallAction.class.getName(), 0, "publishing result", null); //$NON-NLS-1$
 		for (int i = 0; i < actions.length; i++) {
 			if (monitor.isCanceled())
 				return Status.CANCEL_STATUS;
-			finalStatus.merge(actions[i].perform(info, results, monitor));
+			finalStatus.merge(actions[i].perform(publisherInfo, results, monitor));
 		}
 		if (!finalStatus.isOK())
 			return finalStatus;
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java
index ea14db7bc..4cca5d42f 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java
@@ -10,9 +10,6 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
-
 import java.io.File;
 import java.util.*;
 import org.eclipse.core.runtime.*;
@@ -50,6 +47,7 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 	protected String flavor;
 
 	protected EquinoxExecutableAction() {
+		//hidden
 	}
 
 	public EquinoxExecutableAction(ExecutablesDescriptor executables, String configSpec, String idBase, Version version, String flavor) {
@@ -60,11 +58,12 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 		this.flavor = flavor;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult result, IProgressMonitor monitor) {
-		ExecutablesDescriptor brandedExecutables = brandExecutables(info, executables);
+	public IStatus perform(IPublisherInfo publisherinfo, IPublisherResult result, IProgressMonitor monitor) {
+		setPublisherInfo(publisherinfo);
+		ExecutablesDescriptor brandedExecutables = brandExecutables(executables);
 		try {
-			publishExecutableIU(info, brandedExecutables, result);
-			publishExecutableCU(info, brandedExecutables, result);
+			publishExecutableIU(brandedExecutables, result);
+			publishExecutableCU(brandedExecutables, result);
 			publishExecutableSetter(brandedExecutables, result);
 		} finally {
 			if (brandedExecutables.isTemporary())
@@ -100,7 +99,7 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 	 * Publishes IUs and CUs for the files that make up the launcher for a given
 	 * ws/os/arch combination.
 	 */
-	protected void publishExecutableIU(IPublisherInfo info, ExecutablesDescriptor execDescriptor, IPublisherResult result) {
+	protected void publishExecutableIU(ExecutablesDescriptor execDescriptor, IPublisherResult result) {
 		// Create the IU for the executable
 		InstallableUnitDescription iu = new MetadataFactory.InstallableUnitDescription();
 		String id = getExecutableId();
@@ -137,11 +136,11 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 	}
 
 	private String getExecutableId() {
-		return createCUIdString(idBase, TYPE, "", configSpec);
+		return createCUIdString(idBase, TYPE, "", configSpec); //$NON-NLS-1$
 	}
 
 	// Create the CU that installs (e.g., unzips) the executable
-	private void publishExecutableCU(IPublisherInfo info, ExecutablesDescriptor execDescriptor, IPublisherResult result) {
+	private void publishExecutableCU(ExecutablesDescriptor execDescriptor, IPublisherResult result) {
 		InstallableUnitFragmentDescription cu = new InstallableUnitFragmentDescription();
 		String id = createCUIdString(idBase, TYPE, flavor, configSpec);
 		cu.setId(id);
@@ -187,10 +186,10 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 	 * @param descriptor the executable descriptor to brand.
 	 * @return the new descriptor
 	 */
-	protected ExecutablesDescriptor brandExecutables(IPublisherInfo info, ExecutablesDescriptor descriptor) {
+	protected ExecutablesDescriptor brandExecutables(ExecutablesDescriptor descriptor) {
 		ExecutablesDescriptor result = new ExecutablesDescriptor(descriptor);
 		result.makeTemporaryCopy();
-		IBrandingAdvice advice = getBrandingAdvice(info);
+		IBrandingAdvice advice = getBrandingAdvice();
 		if (advice == null)
 			partialBrandExecutables(result);
 		else
@@ -198,7 +197,7 @@ public class EquinoxExecutableAction extends AbstractPublisherAction {
 		return result;
 	}
 
-	private IBrandingAdvice getBrandingAdvice(IPublisherInfo info) {
+	private IBrandingAdvice getBrandingAdvice() {
 		// there is expected to only be one branding advice for a given configspec so
 		// just return the first one we find.
 		Collection advice = info.getAdvice(configSpec, true, null, null, IBrandingAdvice.class);
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java
index c85cc07aa..46dd2d2e2 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxLauncherCUAction.java
@@ -10,13 +10,12 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 import java.util.Collection;
 import java.util.Iterator;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;
 import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
 import org.eclipse.equinox.p2.publisher.*;
 import org.eclipse.equinox.p2.publisher.actions.IVersionAdvice;
 
@@ -41,9 +40,10 @@ public class EquinoxLauncherCUAction extends AbstractPublisherAction {
 		this.configSpecs = configSpecs;
 	}
 
-	public IStatus perform(IPublisherInfo info, IPublisherResult results, IProgressMonitor monitor) {
-		publishCU(ORG_ECLIPSE_EQUINOX_LAUNCHER, null, info, results);
-		publishLauncherFragmentCUs(info, results);
+	public IStatus perform(IPublisherInfo publisherInfo, IPublisherResult results, IProgressMonitor monitor) {
+		setPublisherInfo(publisherInfo);
+		publishCU(ORG_ECLIPSE_EQUINOX_LAUNCHER, null, results);
+		publishLauncherFragmentCUs(results);
 		return Status.OK_STATUS;
 	}
 
@@ -51,11 +51,11 @@ public class EquinoxLauncherCUAction extends AbstractPublisherAction {
 	 * For each of the configurations we are publishing, create a launcher fragment
 	 * CU if there is version advice for the fragment.
 	 */
-	private void publishLauncherFragmentCUs(IPublisherInfo info, IPublisherResult results) {
+	private void publishLauncherFragmentCUs(IPublisherResult results) {
 		for (int i = 0; i < configSpecs.length; i++) {
 			String configSpec = configSpecs[i];
 			String id = ORG_ECLIPSE_EQUINOX_LAUNCHER + '.' + configSpec;
-			publishCU(id, configSpec, info, results);
+			publishCU(id, configSpec, results);
 		}
 	}
 
@@ -64,7 +64,7 @@ public class EquinoxLauncherCUAction extends AbstractPublisherAction {
 	 * launcher bundle iu then set it up as the startup JAR.  If it is a launcher fragment then 
 	 * configure it in as the launcher.library for this configuration.
 	 */
-	private void publishCU(String id, String configSpec, IPublisherInfo info, IPublisherResult results) {
+	private void publishCU(String id, String configSpec, IPublisherResult results) {
 		Collection advice = info.getAdvice(configSpec, true, id, null, IVersionAdvice.class);
 		for (Iterator j = advice.iterator(); j.hasNext();) {
 			IVersionAdvice versionSpec = (IVersionAdvice) j.next();
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java
index 98c5e0224..a6d484cda 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/InstallPublisherApplication.java
@@ -10,19 +10,15 @@
  ******************************************************************************/
 package org.eclipse.equinox.p2.publisher.eclipse;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.IVersionedId;
-
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionedId;
+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
 import org.eclipse.equinox.p2.publisher.*;
 
 public class InstallPublisherApplication extends AbstractPublisherApplication {
 
 	protected String id;
-	protected Version version = new Version("1.0.0"); //$NON-NLS-1$
+	protected Version version = Version.parseVersion("1.0.0"); //$NON-NLS-1$
 	protected String name;
 	protected String executableName;
 	protected String flavor;
@@ -31,23 +27,24 @@ public class InstallPublisherApplication extends AbstractPublisherApplication {
 	protected String[] rootExclusions;
 
 	public InstallPublisherApplication() {
+		//hidden
 	}
 
-	protected void processFlag(String arg, PublisherInfo info) {
-		super.processFlag(arg, info);
+	protected void processFlag(String arg, PublisherInfo publisherInfo) {
+		super.processFlag(arg, publisherInfo);
 
 		if (arg.equalsIgnoreCase("-startAll")) //$NON-NLS-1$
 			start = true;
 	}
 
-	protected void processParameter(String arg, String parameter, PublisherInfo info) throws URISyntaxException {
-		super.processParameter(arg, parameter, info);
+	protected void processParameter(String arg, String parameter, PublisherInfo publisherInfo) throws URISyntaxException {
+		super.processParameter(arg, parameter, publisherInfo);
 
 		if (arg.equalsIgnoreCase("-id")) //$NON-NLS-1$
 			id = parameter;
 
 		if (arg.equalsIgnoreCase("-version")) //$NON-NLS-1$
-			version = new Version(parameter);
+			version = Version.parseVersion(parameter);
 
 		if (arg.equalsIgnoreCase("-name")) //$NON-NLS-1$
 			name = parameter;
@@ -62,7 +59,7 @@ public class InstallPublisherApplication extends AbstractPublisherApplication {
 			topLevel = createVersionedIdList(parameter);
 
 		if (arg.equalsIgnoreCase("-rootExclusions")) //$NON-NLS-1$
-			rootExclusions = AbstractPublisherAction.getArrayFromString(parameter, ",");
+			rootExclusions = AbstractPublisherAction.getArrayFromString(parameter, ","); //$NON-NLS-1$
 	}
 
 	private IVersionedId[] createVersionedIdList(String parameter) {
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductPublisherApplication.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductPublisherApplication.java
index 08aede714..1f96c5c02 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductPublisherApplication.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/ProductPublisherApplication.java
@@ -24,6 +24,7 @@ public class ProductPublisherApplication extends AbstractPublisherApplication {
 	private String flavor;
 
 	public ProductPublisherApplication() {
+		//hidden
 	}
 
 	protected IPublisherAction[] createActions() {
@@ -44,8 +45,8 @@ public class ProductPublisherApplication extends AbstractPublisherApplication {
 		return new ProductAction(source, productDescriptor, flavor, executablesFeature);
 	}
 
-	protected void processParameter(String arg, String parameter, PublisherInfo info) throws URISyntaxException {
-		super.processParameter(arg, parameter, info);
+	protected void processParameter(String arg, String parameter, PublisherInfo publisherInfo) throws URISyntaxException {
+		super.processParameter(arg, parameter, publisherInfo);
 
 		if (arg.equalsIgnoreCase("-productFile")) //$NON-NLS-1$
 			product = parameter;
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/URLEntry.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/URLEntry.java
index cc47b68bb..b9566e8a8 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/URLEntry.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/eclipse/URLEntry.java
@@ -16,6 +16,7 @@ public class URLEntry {
 	private String url;
 
 	public URLEntry() {
+		//empty
 	}
 
 	public URLEntry(String url, String annotation) {
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java
index 1bbe49f15..d3dc25338 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/spi/p2/publisher/PublisherHelper.java
@@ -12,9 +12,6 @@
  *******************************************************************************/
 package org.eclipse.equinox.spi.p2.publisher;
 
-import org.eclipse.equinox.internal.provisional.p2.metadata.Version;
-import org.eclipse.equinox.internal.provisional.p2.metadata.VersionRange;
-
 import java.io.*;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -84,12 +81,12 @@ public class PublisherHelper {
 
 	public static final String ECLIPSE_INSTALL_HANDLER_PROP = "org.eclipse.update.installHandler"; //$NON-NLS-1$
 
-	public static final Version versionMax = new Version(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+	public static final Version versionMax = Version.createOSGi(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
-	public static final ITouchpointType TOUCHPOINT_NATIVE = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.native", new Version(1, 0, 0)); //$NON-NLS-1$
-	public static final ITouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", new Version(1, 0, 0)); //$NON-NLS-1$
+	public static final ITouchpointType TOUCHPOINT_NATIVE = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.native", Version.createOSGi(1, 0, 0)); //$NON-NLS-1$
+	public static final ITouchpointType TOUCHPOINT_OSGI = MetadataFactory.createTouchpointType("org.eclipse.equinox.p2.osgi", Version.createOSGi(1, 0, 0)); //$NON-NLS-1$
 
-	public static final IProvidedCapability FEATURE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, new Version(1, 0, 0));
+	public static final IProvidedCapability FEATURE_CAPABILITY = MetadataFactory.createProvidedCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, Version.createOSGi(1, 0, 0));
 
 	public static IArtifactDescriptor createArtifactDescriptor(IArtifactKey key, File pathOnDisk) {
 		//TODO this size calculation is bogus
@@ -144,7 +141,7 @@ public class PublisherHelper {
 	}
 
 	public static IProvidedCapability makeTranslationCapability(String hostId, Locale locale) {
-		return MetadataFactory.createProvidedCapability(NAMESPACE_IU_LOCALIZATION, locale.toString(), new Version(1, 0, 0));
+		return MetadataFactory.createProvidedCapability(NAMESPACE_IU_LOCALIZATION, locale.toString(), Version.createOSGi(1, 0, 0));
 	}
 
 	public static String createDefaultConfigUnitId(String classifier, String configurationFlavor) {
@@ -155,12 +152,12 @@ public class PublisherHelper {
 		InstallableUnitFragmentDescription cu = new InstallableUnitFragmentDescription();
 		String configUnitId = createDefaultConfigUnitId(ECLIPSE_FEATURE_CLASSIFIER, configurationFlavor);
 		cu.setId(configUnitId);
-		Version configUnitVersion = new Version(1, 0, 0);
+		Version configUnitVersion = Version.createOSGi(1, 0, 0);
 		cu.setVersion(configUnitVersion);
 
 		// Add capabilities for fragment, self, and describing the flavor supported
 		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
-		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
+		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, Version.createOSGi(1, 0, 0))});
 
 		// Create a required capability on features
 		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_FEATURE, VersionRange.emptyRange, null, true, true, false)};
@@ -179,12 +176,12 @@ public class PublisherHelper {
 		InstallableUnitFragmentDescription cu = new InstallableUnitFragmentDescription();
 		String configUnitId = createDefaultConfigUnitId("source", configurationFlavor); //$NON-NLS-1$
 		cu.setId(configUnitId);
-		Version configUnitVersion = new Version(1, 0, 0);
+		Version configUnitVersion = Version.createOSGi(1, 0, 0);
 		cu.setVersion(configUnitVersion);
 
 		// Add capabilities for fragment, self, and describing the flavor supported
 		cu.setProperty(IInstallableUnit.PROP_TYPE_FRAGMENT, Boolean.TRUE.toString());
-		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, new Version(1, 0, 0))});
+		cu.setCapabilities(new IProvidedCapability[] {createSelfCapability(configUnitId, configUnitVersion), MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_FLAVOR, configurationFlavor, Version.createOSGi(1, 0, 0))});
 
 		// Create a required capability on source providers
 		IRequiredCapability[] reqs = new IRequiredCapability[] {MetadataFactory.createRequiredCapability(NAMESPACE_ECLIPSE_TYPE, TYPE_ECLIPSE_SOURCE, VersionRange.emptyRange, null, true, true, false)};