Initial rename (before testing)

6 files changed, 44 insertions, 44 deletions

diff --git a/bundles/org.eclipse.equinox.p2.console/.project b/bundles/org.eclipse.equinox.p2.console/.project
index 7c645a5cb..55fbe7f26 100644
--- a/bundles/org.eclipse.equinox.p2.console/.project
+++ b/bundles/org.eclipse.equinox.p2.console/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.equinox.prov.console</name>
+	<name>org.eclipse.equinox.p2.console</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF
index d9dbf8884..eb84b4358 100644
--- a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Provisioning Console Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.console
+Bundle-SymbolicName: org.eclipse.equinox.p2.console
 Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.internal.prov.console.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.console.Activator
 Bundle-Vendor: IBM
 Eclipse-LazyStart: true
-Export-Package: org.eclipse.equinox.internal.prov.console;x-friends:="org.eclipse.equinox.prov.director.app,org.eclipse.equinox.prov.tools"
+Export-Package: org.eclipse.equinox.internal.p2.console;x-friends:="org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.tools"
 Import-Package: org.eclipse.core.runtime;common=split,
  org.eclipse.equinox.configurator,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.director,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.installregistry,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.query,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.director,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.installregistry,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
  org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional,
  org.eclipse.osgi.service.environment;version="1.0.0",
  org.eclipse.osgi.service.resolver;version="1.1.0",
diff --git a/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch b/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch
index d255cbeb7..ba1013988 100644
--- a/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch
+++ b/bundles/org.eclipse.equinox.p2.console/Provisioning console.launch
@@ -15,5 +15,5 @@
 <stringAttribute key="target_bundles" value="org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="false"/>
-<stringAttribute key="workspace_bundles" value="com.thoughtworks.xstream@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.prov.artifact.repository@default:default,org.eclipse.equinox.prov.console@default:true,org.eclipse.equinox.prov.core@default:default,org.eclipse.equinox.prov.director@default:default,org.eclipse.equinox.prov.download@default:default,org.eclipse.equinox.prov.engine@default:default,org.eclipse.equinox.prov.examplarysetup@default:true,org.eclipse.equinox.prov.metadata@default:default,org.eclipse.equinox.prov.metadata.repository@default:default,org.eclipse.equinox.prov.touchpoint.eclipse@default:default,org.eclipse.equinox.prov.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.mozilla.rhino@default:default"/>
+<stringAttribute key="workspace_bundles" value="com.thoughtworks.xstream@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.download@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.examplarysetup@default:true,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.mozilla.rhino@default:default"/>
 </launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/Activator.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java
index 28017a393..2d36bc894 100644
--- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.internal.prov.console;
+package org.eclipse.equinox.internal.p2.console;
 
-import org.eclipse.equinox.prov.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
 import org.osgi.framework.*;
 import org.osgi.util.tracker.ServiceTracker;
 import org.osgi.util.tracker.ServiceTrackerCustomizer;
 
 public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.equinox.prov.console"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.equinox.p2.console"; //$NON-NLS-1$
 	private static final String PROVIDER_NAME = "org.eclipse.osgi.framework.console.CommandProvider"; //$NON-NLS-1$
 	private static BundleContext context;
 
@@ -59,7 +59,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 	public Object addingService(ServiceReference reference) {
 		BundleContext context = Activator.getContext();
 		IProfileRegistry registry = (IProfileRegistry) context.getService(reference);
-		provider = new ProvCommandProvider(context.getProperty("eclipse.prov.profile"), registry);
+		provider = new ProvCommandProvider(context.getProperty("eclipse.p2.profile"), registry);
 		providerRegistration = context.registerService(PROVIDER_NAME, provider, null);
 		return registry;
 	}
diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/ProvCommandProvider.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java
index 698c17b90..a9d908b01 100644
--- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/ProvCommandProvider.java
+++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java
@@ -6,19 +6,19 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.eclipse.equinox.internal.prov.console;
+package org.eclipse.equinox.internal.p2.console;
 
 import java.net.*;
 import java.util.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.IProfileRegistry;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.query.Query;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.query.Query;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 import org.eclipse.osgi.service.resolver.VersionRange;
@@ -29,7 +29,7 @@ import org.eclipse.osgi.service.resolver.VersionRange;
  */
 public class ProvCommandProvider implements CommandProvider {
 	public static final String NEW_LINE = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-	private static final String IU_KIND_NAMESPACE = "org.eclipse.equinox.prov.type";
+	private static final String IU_KIND_NAMESPACE = "org.eclipse.equinox.p2.type";
 
 	//	private Profile profile;
 
diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/ProvisioningHelper.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
index 6e3099813..298911d9a 100644
--- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/ProvisioningHelper.java
+++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.equinox.internal.prov.console;
+package org.eclipse.equinox.internal.p2.console;
 
 import java.io.IOException;
 import java.net.URL;
@@ -17,18 +17,18 @@ import java.util.Properties;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.equinox.configurator.Configurator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepositoryManager;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.IProfileRegistry;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.query.CompoundIterator;
-import org.eclipse.equinox.prov.query.Query;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.query.CompoundIterator;
+import org.eclipse.equinox.p2.query.Query;
 import org.eclipse.osgi.service.environment.EnvironmentInfo;
 import org.eclipse.osgi.service.resolver.VersionRange;
 import org.osgi.framework.Version;
@@ -46,7 +46,7 @@ public class ProvisioningHelper {
 		// for convenience create and add a repo here
 		// TODO need to get rid o fthe factory method.
 		String repositoryName = location + " - metadata"; //$NON-NLS-1$
-		IMetadataRepository result = manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.metadata.repository.simpleRepository"); //$NON-NLS-1$
+		IMetadataRepository result = manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.metadata.repository.simpleRepository"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -77,7 +77,7 @@ public class ProvisioningHelper {
 
 		// could not load a repo at that location so create one as a convenience
 		String repositoryName = location + " - artifacts"; //$NON-NLS-1$
-		return manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.artifact.repository.simpleRepository"); //$NON-NLS-1$
+		return manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.artifact.repository.simpleRepository"); //$NON-NLS-1$
 	}
 
 	public static void removeArtifactRepository(URL location) {