13 files changed, 49 insertions, 49 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/Activator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/Activator.java
index d6799e045..485d39c30 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/Activator.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.generator;
+package org.eclipse.equinox.internal.p2.metadata.generator;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 public class Activator implements BundleActivator {
 	public static BundleContext context = null;
-	public static String ID = "org.eclipse.equinox.prov.metadata.generator";
+	public static String ID = "org.eclipse.equinox.p2.metadata.generator";
 
 	public static BundleContext getContext() {
 		return context;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/EclipseGeneratorApplication.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java
index 0f43eda25..2c7d1248a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/EclipseGeneratorApplication.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.generator;
+package org.eclipse.equinox.internal.p2.metadata.generator;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -17,14 +17,14 @@ import java.util.Map;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.equinox.internal.prov.artifact.repository.ArtifactRepositoryManager;
-import org.eclipse.equinox.internal.prov.metadata.repository.MetadataRepositoryManager;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.metadata.generator.EclipseInstallGeneratorInfoProvider;
-import org.eclipse.equinox.prov.metadata.generator.Generator;
-import org.eclipse.equinox.prov.metadata.repository.*;
+import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRepositoryManager;
+import org.eclipse.equinox.internal.p2.metadata.repository.MetadataRepositoryManager;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.metadata.generator.EclipseInstallGeneratorInfoProvider;
+import org.eclipse.equinox.p2.metadata.generator.Generator;
+import org.eclipse.equinox.p2.metadata.repository.*;
 import org.osgi.framework.ServiceRegistration;
 
 public class EclipseGeneratorApplication implements IApplication {
@@ -245,7 +245,7 @@ public class EclipseGeneratorApplication implements IApplication {
 		// 	the given repo location is not an existing repo so we have to create something
 		// TODO for now create a Simple repo by default.
 		String repositoryName = artifactLocation + " - artifacts"; //$NON-NLS-1$
-		IWritableArtifactRepository result = (IWritableArtifactRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.artifact.repository.simpleRepository"); //$NON-NLS-1$
+		IWritableArtifactRepository result = (IWritableArtifactRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.artifact.repository.simpleRepository"); //$NON-NLS-1$
 		if (result != null)
 			provider.setArtifactRepository(result);
 	}
@@ -272,7 +272,7 @@ public class EclipseGeneratorApplication implements IApplication {
 		// 	the given repo location is not an existing repo so we have to create something
 		// TODO for now create a random repo by default.
 		String repositoryName = metadataLocation + " - metadata"; //$NON-NLS-1$
-		IWritableMetadataRepository result = (IWritableMetadataRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.metadata.repository.simpleRepository"); //$NON-NLS-1$
+		IWritableMetadataRepository result = (IWritableMetadataRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.metadata.repository.simpleRepository"); //$NON-NLS-1$
 		if (result != null)
 			provider.setMetadataRepository(result);
 	}
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/features/FeatureParser.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java
index 8ef5249d5..79d43b06f 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/features/FeatureParser.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.generator.features;
+package org.eclipse.equinox.internal.p2.metadata.generator.features;
 
 import java.io.*;
 import java.net.URL;
 import javax.xml.parsers.*;
-import org.eclipse.equinox.prov.metadata.generator.Feature;
-import org.eclipse.equinox.prov.metadata.generator.FeatureEntry;
+import org.eclipse.equinox.p2.metadata.generator.Feature;
+import org.eclipse.equinox.p2.metadata.generator.FeatureEntry;
 import org.eclipse.osgi.util.NLS;
 import org.xml.sax.*;
 import org.xml.sax.helpers.DefaultHandler;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/BundleDescriptionFactory.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/BundleDescriptionFactory.java
index 0f0c07611..1314f46a5 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/BundleDescriptionFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/BundleDescriptionFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.io.*;
 import java.util.*;
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleException;
 public class BundleDescriptionFactory {
 	static final String DIR = "dir";
 	static final String JAR = "jar";
-	static String BUNDLE_FILE_KEY = "eclipse.prov.bundle.format";
+	static String BUNDLE_FILE_KEY = "eclipse.p2.bundle.format";
 
 	StateObjectFactory factory;
 	State state;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/EclipseInstallGeneratorInfoProvider.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
index 4117eeda1..62843b476 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/EclipseInstallGeneratorInfoProvider.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
@@ -8,18 +8,18 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.prov.metadata.generator.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IWritableArtifactRepository;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IWritableMetadataRepository;
+import org.eclipse.equinox.internal.p2.metadata.generator.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IWritableArtifactRepository;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IWritableMetadataRepository;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
 import org.osgi.framework.*;
 import org.osgi.util.tracker.ServiceTracker;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/Feature.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Feature.java
index 289e1243c..ec2bb9e30 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/Feature.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Feature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.util.ArrayList;
 
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/FeatureEntry.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/FeatureEntry.java
index b7bdfd373..03496171e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/FeatureEntry.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/FeatureEntry.java
@@ -6,7 +6,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 /**
  */
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java
index b2f85fe99..54683cd26 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/Generator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java
@@ -6,7 +6,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -14,13 +14,13 @@ import java.util.*;
 import java.util.Map.Entry;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.internal.prov.metadata.generator.Activator;
-import org.eclipse.equinox.internal.prov.metadata.generator.features.FeatureParser;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.IWritableArtifactRepository;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.metadata.generator.Activator;
+import org.eclipse.equinox.internal.p2.metadata.generator.features.FeatureParser;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IWritableArtifactRepository;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.osgi.service.resolver.*;
 import org.osgi.framework.Version;
 
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/GeneratorBundleInfo.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/GeneratorBundleInfo.java
index 11009c567..3c1227edd 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/GeneratorBundleInfo.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/GeneratorBundleInfo.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.io.ByteArrayInputStream;
 import org.eclipse.equinox.frameworkadmin.BundleInfo;
-import org.eclipse.equinox.prov.core.helpers.Headers;
+import org.eclipse.equinox.p2.core.helpers.Headers;
 import org.eclipse.osgi.util.ManifestElement;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/IGeneratorInfo.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IGeneratorInfo.java
index 72af1ead7..dca557b9a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/IGeneratorInfo.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IGeneratorInfo.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Set;
 import org.eclipse.equinox.frameworkadmin.ConfigData;
 import org.eclipse.equinox.frameworkadmin.LauncherData;
-import org.eclipse.equinox.prov.artifact.repository.IWritableArtifactRepository;
-import org.eclipse.equinox.prov.metadata.repository.IWritableMetadataRepository;
+import org.eclipse.equinox.p2.artifact.repository.IWritableArtifactRepository;
+import org.eclipse.equinox.p2.metadata.repository.IWritableMetadataRepository;
 
 public interface IGeneratorInfo {
 	public boolean addDefaultIUs();
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/IPlatformEntry.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IPlatformEntry.java
index 132eecca3..42df77823 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/IPlatformEntry.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IPlatformEntry.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 public interface IPlatformEntry {
 	public String getOS();
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/MetadataGeneratorHelper.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/MetadataGeneratorHelper.java
index e315d5ba5..da5046589 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/MetadataGeneratorHelper.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/MetadataGeneratorHelper.java
@@ -8,17 +8,17 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 import java.io.*;
 import java.util.*;
 import org.eclipse.equinox.frameworkadmin.BundleInfo;
-import org.eclipse.equinox.internal.prov.metadata.ArtifactKey;
-import org.eclipse.equinox.internal.prov.metadata.generator.Activator;
-import org.eclipse.equinox.prov.artifact.repository.ArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
+import org.eclipse.equinox.internal.p2.metadata.generator.Activator;
+import org.eclipse.equinox.p2.artifact.repository.ArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.metadata.*;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
 import org.eclipse.osgi.service.resolver.*;
 import org.eclipse.osgi.util.ManifestElement;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/URLEntry.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/URLEntry.java
index fb628f82d..dbccf5bd1 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/URLEntry.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/URLEntry.java
@@ -7,7 +7,7 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.equinox.prov.metadata.generator;
+package org.eclipse.equinox.p2.metadata.generator;
 
 public class URLEntry {
 	private String annotation;