Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2007-09-30 18:56:11 +0000
committerJohn Arthorne2007-09-30 18:56:11 +0000
commit1f7cf4b36818b7f9aa128b430b0717ee03267454 (patch)
tree43fdeb4be6a1dbd37de60cb1257a0ee5667f6d27
parent2ccb446cc885495686cc9eb430c4a98031b3cfc5 (diff)
downloadrt.equinox.p2-1f7cf4b36818b7f9aa128b430b0717ee03267454.tar.gz
rt.equinox.p2-1f7cf4b36818b7f9aa128b430b0717ee03267454.tar.xz
rt.equinox.p2-1f7cf4b36818b7f9aa128b430b0717ee03267454.zip
Initial rename (before testing)
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF18
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml12
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd12
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd10
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/Activator.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryIO.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRepositoryIO.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRepositoryManager.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRequest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ECFTransport.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/FileDownloadRequest.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/MirrorRequest.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SignatureVerifier.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SimpleArtifactRepository.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SimpleArtifactRepository.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SimpleArtifactRepositoryFactory.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SimpleArtifactRepositoryFactory.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Unpack200Step.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/Unpack200Step.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/ArtifactDescriptor.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/ArtifactDescriptor.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactDescriptor.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactDescriptor.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepository.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepository.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryFactory.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepositoryFactory.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryManager.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepositoryManager.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRequest.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRequest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IWritableArtifactRepository.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IWritableArtifactRepository.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/Mapper.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/Mapper.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/RepositoryDescriptor.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/RepositoryDescriptor.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/Transport.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/Transport.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStep.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStep.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepDescriptor.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStepDescriptor.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepHandler.java (renamed from bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStepHandler.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.console/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF28
-rw-r--r--bundles/org.eclipse.equinox.p2.console/Provisioning console.launch2
-rw-r--r--bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/Activator.java (renamed from bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/Activator.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java (renamed from bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/ProvCommandProvider.java)18
-rw-r--r--bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvisioningHelper.java (renamed from bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/prov/console/ProvisioningHelper.java)30
-rw-r--r--bundles/org.eclipse.equinox.p2.core/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF16
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Activator.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/BasicLocation.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker_JavaIo.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker_JavaIo.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker_JavaNio.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker_JavaNio.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Messages.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/messages.properties (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/ProvisionException.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/ProvisionException.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningEventBus.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/ProvisioningEventBus.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningListener.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/ProvisioningListener.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/SynchronousProvisioningListener.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/SynchronousProvisioningListener.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/ArrayUtils.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/ArrayUtils.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/FileUtils.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/FileUtils.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Headers.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Headers.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/LogHelper.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/LogHelper.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Messages.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/MultiStatus.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/MultiStatus.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/MultiStatusUtil.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/MultiStatusUtil.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/OrderedProperties.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/OrderedProperties.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/ServiceHelper.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/ServiceHelper.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/TwoTierMap.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/TwoTierMap.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/UnmodifiableProperties.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/UnmodifiableProperties.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Utils.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Utils.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/messages.properties (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/location/AgentLocation.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/location/AgentLocation.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/AbstractRepository.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/AbstractRepository.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IRepositoryInfo.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/IRepositoryInfo.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IWritableRepositoryInfo.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/IWritableRepositoryInfo.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/RepositoryCreationException.java (renamed from bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/RepositoryCreationException.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF22
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/config.ini26
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/director app.launch6
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/director.product6
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/plugin.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Activator.java (renamed from bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/prov/internal/director/app/Activator.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java (renamed from bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/prov/internal/director/app/Application.java)28
-rw-r--r--bundles/org.eclipse.equinox.p2.director/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF28
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/BasicIUFilter.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/DirectorActivator.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/IUFilter.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/IUTransformationHelper.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/OperationGenerator.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/Picker.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/RequirementBasedFilter.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/rollback/FormerState.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IDirector.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/IDirector.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/NewDependencyExpander.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/NewDependencyExpander.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/NewSimpleDirector.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/NewSimpleDirector.java)26
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/Oracle.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/Oracle.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/TrackedHashSet.java (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/TrackedHashSet.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/director.txt (renamed from bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/director.txt)0
-rw-r--r--bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java12
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF26
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/plugin.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd10
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/CommonDef.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/CommonDef.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/EngineActivator.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Messages.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/NullTouchpoint.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/TouchpointManager.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/messages.properties (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/AbstractProvisioningTransaction.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/AbstractProvisioningTransaction.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/BeginOperationEvent.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/BeginOperationEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/CommitOperationEvent.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/CommitOperationEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/DefaultPhaseSet.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/DefaultPhaseSet.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Engine.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Engine.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/EngineSession.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/EngineSession.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IProfileRegistry.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProvisioningAction.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IProvisioningAction.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ITouchpoint.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ITouchpoint.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ITouchpointAction.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ITouchpointAction.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IUPhase.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IUPhase.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitEvent.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/InstallableUnitEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Operand.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Operand.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Phase.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Phase.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PhaseSet.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/PhaseSet.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Profile.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Profile.java)34
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProfileEvent.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ProfileEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningConfigurationException.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ProvisioningConfigurationException.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/RollbackOperationEvent.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/RollbackOperationEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/SimpleProfileRegistry.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/SimpleProfileRegistry.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/TransactionEvent.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/TransactionEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Utils.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Utils.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Collect.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Collect.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Install.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Install.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Messages.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Uninstall.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Uninstall.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/messages.properties (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/IInstallRegistry.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/IInstallRegistry.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/IProfileInstallRegistry.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/IProfileInstallRegistry.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/InstallRegistry.java (renamed from bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/InstallRegistry.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.exemplarysetup/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF24
-rw-r--r--bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java (renamed from bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/prov/examplarysetup/Activator.java)28
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF12
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/config.ini22
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/installer.product24
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescription.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallDescription.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java16
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/testInstall.properties4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF24
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator CDT.launch6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator SDK.launch4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/generator.product6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/Activator.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/Activator.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/EclipseGeneratorApplication.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/EclipseGeneratorApplication.java)22
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/FeatureParser.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/prov/metadata/generator/features/FeatureParser.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/BundleDescriptionFactory.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/BundleDescriptionFactory.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/EclipseInstallGeneratorInfoProvider.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Feature.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/Feature.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/FeatureEntry.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/FeatureEntry.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/Generator.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/Generator.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/GeneratorBundleInfo.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/GeneratorBundleInfo.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IGeneratorInfo.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/IGeneratorInfo.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/IPlatformEntry.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/IPlatformEntry.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/MetadataGeneratorHelper.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/MetadataGeneratorHelper.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/p2/metadata/generator/URLEntry.java (renamed from bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/prov/metadata/generator/URLEntry.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF22
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd12
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/AbstractMetadataRepository.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/AbstractMetadataRepository.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/Activator.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/LocalMetadataRepository.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Messages.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataCache.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataCache.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataRepositoryIO.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataRepositoryManager.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/SimpleMetadataRepositoryFactory.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/URLMetadataRepository.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/messages.properties (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepository.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepository.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryFactory.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepositoryFactory.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryManager.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepositoryManager.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IWritableMetadataRepository.java (renamed from bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IWritableMetadataRepository.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF14
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/ArtifactKey.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InternalInstallableUnit.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/InternalInstallableUnit.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Messages.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/MetadataActivator.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/MetadataActivator.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/messages.properties (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ConstrainableElement.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ConstrainableElement.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IArtifactKey.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IArtifactKey.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnit.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitConstants.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnitConstants.java)22
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitFragment.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnitFragment.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IMetadataVisitor.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IMetadataVisitor.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IResolvedInstallableUnit.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IResolvedInstallableUnit.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IResolvedInstallableUnitFragment.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IResolvedInstallableUnitFragment.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Inclusion.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Inclusion.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/InstallableUnit.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/InstallableUnit.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/InstallableUnitFragment.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/InstallableUnitFragment.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ProvidedCapability.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ProvidedCapability.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Recommendation.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Recommendation.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RecommendationDescriptor.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/RecommendationDescriptor.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RequiredCapability.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/RequiredCapability.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ResolvedInstallableUnit.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ResolvedInstallableUnit.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ResolvedInstallableUnitFragment.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ResolvedInstallableUnitFragment.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Selector.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Selector.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointData.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/TouchpointData.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointType.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/TouchpointType.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundIterator.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/CompoundIterator.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryable.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/IQueryable.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/Query.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/Query.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryableArray.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/QueryableArray.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/ResolutionHelper.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/ResolutionHelper.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/StateMetadataMap.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/StateMetadataMap.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/Transformer.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/Transformer.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/UnsatisfiedCapability.java (renamed from bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/UnsatisfiedCapability.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF40
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/Test Director CDT.launch8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/Test Director SDK.launch10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall CDT.launch8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall SDK.launch4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/plugin.xml30
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AbstractProvisioningTest.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AutomatedTests.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestActivator.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestActivator.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestArtifactRepository.java)18
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestMetadataRepository.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/AllTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/AllTests.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/JarURLRepositoryTest.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Adder.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ByteShifter.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Counter.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/MD5Verifier.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/MD5Verifier.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Multiplier.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Pack200Unpacker.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Pack200Unpacker.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ProcessingStepHandlerTest.java)30
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AllTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AllTests.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AutomatedDirectorTest.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/Bug203637.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OperationGenerationTest.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest2.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/PickerTest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/RollbackTest.java)24
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/SingletonTest.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UninstallTest.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithEntryPoint.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithEntryPoint.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithoutEntryPoint.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithoutEntryPoint.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/AllTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/AllTests.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/DownloadManagerTest.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/AllTests.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/EngineTest.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseSetTest.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseTest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/ProfileTest.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/DirectorTest.java)32
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/End2EndTest.java)28
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/AllTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/AllTests.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentMethodTest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentTest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/MultipleIUAndFragmentTest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/OldTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/OldTest.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/RecommendationTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/RecommendationTest.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ResolutionHelperTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/ResolutionHelperTest.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllTests.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/AllTests.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/JarURLRepositoryTest.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.tools/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.tools/META-INF/MANIFEST.MF14
-rw-r--r--bundles/org.eclipse.equinox.p2.tools/ProvTools - compare repos.launch4
-rw-r--r--bundles/org.eclipse.equinox.p2.tools/ProvTools - list profile.launch6
-rw-r--r--bundles/org.eclipse.equinox.p2.tools/plugin.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/p2/tools/MetadataCompareApplication.java (renamed from bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/prov/tools/MetadataCompareApplication.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF18
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/plugin.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/prov/touchpoint/eclipse/Activator.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/prov/touchpoint/eclipse/EclipseTouchpoint.java)26
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF18
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Activator.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Activator.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupFiles.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/BackupFiles.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Messages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/NativeTouchpoint.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Permissions.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Permissions.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Util.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Util.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Zip.java (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Zip.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties (renamed from bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini30
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product34
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ProvAdminUIMessages.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/internal/ProvAdminUIMessages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/messages.properties (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/internal/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Activator.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/Activator.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Application.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/Application.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationActionBarAdvisor.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationWorkbenchAdvisor.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ProvisioningRCPPerspective.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ProvisioningRCPPerspective.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF38
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml52
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ArtifactRepositoriesView.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/MetadataRepositoriesView.java)28
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProfilesView.java)24
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvAdminUIMessages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvView.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvisioningPerspective.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvisioningPerspective.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/RepositoriesView.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddArtifactRepositoryDialog.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddMetadataRepositoryDialog.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddProfileDialog.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/UpdateAndInstallDialog.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/PreferenceConstants.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/ProvUIPreferenceInitializer.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/ProvisioningPrefPage.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/p2/ui/admin/ProvAdminUIActivator.java (renamed from bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/ProvAdminUIActivator.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF38
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml30
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKMessages.java (renamed from bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/ProvSDKMessages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java (renamed from bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/ProvSDKUIActivator.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/RepositoryManipulationDialog.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/UpdateAndInstallDialog.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java (renamed from bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/UpdateHandler.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties (renamed from bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/.project2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF40
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ApplyProfileChangesDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ApplyProfileChangesDialog.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ProvUIMessages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningPropertyManager.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ProvisioningPropertyManager.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/messages.properties)0
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ColocatedRepositoryInfo.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ColocatedRepositoryInfo.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ColocatedRepositoryUtil.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ColocatedRepositoryUtil.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IProfileChooser.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProvisioningProperties.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IProvisioningProperties.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IRepositoryManipulator.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUI.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIActivator.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUIActivator.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUIImages.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUndoSupport.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvisioningUndoSupport.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUtil.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvisioningUtil.java)38
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/BecomeAction.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/BecomeAction.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/InstallAction.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/ProfileModificationAction.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/ProfileModificationAction.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/ProvisioningAction.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/ProvisioningAction.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/UninstallAction.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/UpdateAction.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddColocatedRepositoryDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/AddColocatedRepositoryDialog.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/AddRepositoryDialog.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ColocatedRepositoryManipulatorGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ColocatedRepositoryManipulatorGroup.java)20
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ColocatedRepositoryPropertyPage.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ColocatedRepositoryPropertyPage.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUGroup.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUImplementationGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUImplementationGroup.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUImplementationPropertyPage.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUImplementationPropertyPage.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUPropertiesGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUPropertiesGroup.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUPropertyPage.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUPropertyPage.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfileGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ProfileGroup.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfilePropertyPage.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ProfilePropertyPage.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryGroup.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryImplementationGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryImplementationGroup.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryImplementationPropertyPage.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryImplementationPropertyPage.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryPropertyPage.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/UpdateAndInstallGroup.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllArtifactRepositories.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllArtifactRepositories.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllMetadataRepositories.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllMetadataRepositories.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllProfiles.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllProfiles.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositoryContentProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ArtifactRepositoryContentProvider.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AvailableIUContentProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AvailableIUContentProvider.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/InstalledIUElement.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryContentProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/MetadataRepositoryContentProvider.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileContentProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProfileContentProvider.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileFactory.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProfileFactory.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProvElement.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProvElement.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddArtifactRepositoryOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddColocatedRepositoryOperation.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddMetadataRepositoryOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddProfileOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/BecomeOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/BecomeOperation.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/IOperationConfirmer.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/IOperationConfirmer.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/InstallOperation.java)14
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProfileModificationOperation.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProfileOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProvisioningOperation.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveArtifactRepositoryOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveColocatedRepositoryOperation.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveMetadataRepositoryOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveProfilesOperation.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RepositoryOperation.java)2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UninstallOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/UninstallOperation.java)10
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UpdateOperation.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/UpdateOperation.java)12
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ColocatedRepositoryLabelProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/ColocatedRepositoryLabelProvider.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUCapabilityFilter.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUCapabilityFilter.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDetailsLabelProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUDetailsLabelProvider.java)8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUDragAdapter.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUGroupFilter.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUGroupFilter.java)6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUPropertyFilter.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUPropertyFilter.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/InstallIUDropAdapter.java)16
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InternalRepositoryFilter.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/InternalRepositoryFilter.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/ProvElementLabelProvider.java)18
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java (renamed from bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/StructuredViewerProvisioningListener.java)8
409 files changed, 1690 insertions, 1690 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/.project b/bundles/org.eclipse.equinox.p2.artifact.repository/.project
index c94254214..e03096bd7 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/.project
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.artifact.repository</name>
+ <name>org.eclipse.equinox.p2.artifact.repository</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
index ffbacbb41..9d3b8d201 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Artifact Repository Bundle (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.artifact.repository;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.artifact.repository;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Export-Package: org.eclipse.equinox.internal.prov.artifact.repository;x-friends:="org.eclipse.equinox.prov.metadata.generator,org.eclipse.equinox.prov.test,org.eclipse.equinox.prov.selfhosting",
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.artifact.repository.processing
+Export-Package: org.eclipse.equinox.internal.p2.artifact.repository;x-friends:="org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.test,org.eclipse.equinox.p2.selfhosting",
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.artifact.repository.processing
Import-Package: com.thoughtworks.xstream,
org.eclipse.core.runtime.preferences,
org.eclipse.equinox.internal.p2.jarprocessor;resolution:=optional,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository,
org.eclipse.equinox.p2.jarprocessor;resolution:=optional,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.metadata,
+ org.eclipse.equinox.p2.metadata,
org.eclipse.osgi.internal.provisional.verifier,
org.osgi.framework;version="1.3.0",
org.osgi.service.prefs;version="1.1.0",
org.osgi.util.tracker;version="1.3.0"
-Bundle-Activator: org.eclipse.equinox.internal.prov.artifact.repository.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.artifact.repository.Activator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml b/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml
index be934eedd..ecf0c11f8 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/plugin.xml
@@ -3,19 +3,19 @@
<plugin>
<extension-point id="artifactRepositories" name="Artifact Repositories" schema="schema/artifactRepositories.exsd"/>
<extension-point id="processingSteps" name="Processing Steps" schema="schema/processingSteps.exsd"/>
- <extension id="simpleRepository" point="org.eclipse.equinox.prov.artifact.repository.artifactRepositories">
+ <extension id="simpleRepository" point="org.eclipse.equinox.p2.artifact.repository.artifactRepositories">
<filter suffix="artifacts.xml"/>
- <factory class="org.eclipse.equinox.internal.prov.artifact.repository.SimpleArtifactRepositoryFactory"/>
+ <factory class="org.eclipse.equinox.internal.p2.artifact.repository.SimpleArtifactRepositoryFactory"/>
</extension>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
id="org.eclipse.equinox.p2.processing.Pack200Unpacker">
- <step class="org.eclipse.equinox.internal.prov.artifact.repository.Unpack200Step"/>
+ <step class="org.eclipse.equinox.internal.p2.artifact.repository.Unpack200Step"/>
</extension>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
id="org.eclipse.equinox.p2.processing.SignatureVerifier">
- <step class="org.eclipse.equinox.internal.prov.artifact.repository.SignatureVerifier"/>
+ <step class="org.eclipse.equinox.internal.p2.artifact.repository.SignatureVerifier"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd
index 18db7af66..62c0adc9a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.prov.artifact.repository">
+<schema targetNamespace="org.eclipse.equinox.p2.artifact.repository">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.equinox.prov.artifact.repository" id="artifactRepositories" name="Artifact Repositories"/>
+ <meta.schema plugin="org.eclipse.equinox.p2.artifact.repository" id="artifactRepositories" name="Artifact Repositories"/>
</appInfo>
<documentation>
This extension point is used to provide artifact repository implementations
@@ -49,10 +49,10 @@
<annotation>
<documentation>
the fully-qualified name of a class which implements
-&lt;samp&gt;org.eclipse.equinox.prov.artifact.repository.IArtifactRepository&lt;/samp&gt;.
+&lt;samp&gt;org.eclipse.equinox.p2.artifact.repository.IArtifactRepository&lt;/samp&gt;.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.equinox.prov.artifact.repository.IArtifactRepository"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.equinox.p2.artifact.repository.IArtifactRepository"/>
</appInfo>
</annotation>
</attribute>
@@ -76,7 +76,7 @@
<meta.section type="since"/>
</appInfo>
<documentation>
- org.eclipse.equinox.prov.artifact.repository 0.1.0
+ org.eclipse.equinox.p2.artifact.repository 0.1.0
</documentation>
</annotation>
@@ -95,7 +95,7 @@
</appInfo>
<documentation>
The value of the class attribute must represent an
-implementor of &lt;tt&gt;org.eclipse.equinox.prov.artifact.repository.IArtifactRepository&lt;/tt&gt;
+implementor of &lt;tt&gt;org.eclipse.equinox.p2.artifact.repository.IArtifactRepository&lt;/tt&gt;
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd
index 2d3eaa7ab..10aa9d36d 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.prov.artifact.repository">
+<schema targetNamespace="org.eclipse.equinox.p2.artifact.repository">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.equinox.prov.artifact.repository" id="processingSteps" name="Processing Steps"/>
+ <meta.schema plugin="org.eclipse.equinox.p2.artifact.repository" id="processingSteps" name="Processing Steps"/>
</appInfo>
<documentation>
This extension point is used to provide processing step implementations
@@ -50,7 +50,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.equinox.prov.artifact.repository.processing.IProcessingStep"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.equinox.p2.artifact.repository.processing.IProcessingStep"/>
</appInfo>
</annotation>
</attribute>
@@ -62,7 +62,7 @@
<meta.section type="since"/>
</appInfo>
<documentation>
- org.eclipse.equinox.prov.artifact.repository ?.?.?
+ org.eclipse.equinox.p2.artifact.repository ?.?.?
</documentation>
</annotation>
@@ -81,7 +81,7 @@
</appInfo>
<documentation>
The value of the class attribute must represent an
-implementor of &lt;tt&gt;org.eclipse.equinox.prov.artifact.processing.IProcessingStep&lt;/tt&gt;
+implementor of &lt;tt&gt;org.eclipse.equinox.p2.artifact.processing.IProcessingStep&lt;/tt&gt;
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/Activator.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java
index e21be5826..505f094c5 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Activator.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager;
import org.osgi.framework.*;
public class Activator implements BundleActivator {
private static BundleContext context;
- public static final String ID = "org.eclipse.equinox.prov.artifact.repository";
+ public static final String ID = "org.eclipse.equinox.p2.artifact.repository";
public static final String REPO_PROVIDER_XPT = ID + '.' + "artifactRepositories";
public IArtifactRepositoryManager repoManager;
public ServiceRegistration repoManagerRegistration;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRepositoryIO.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryIO.java
index 3457ae896..0c2208f40 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRepositoryIO.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryIO.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import com.thoughtworks.xstream.XStream;
import java.io.*;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
/**
* This class reads and writes artifact repository
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java
index cd7c8854f..dcf06b4a4 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRepositoryManager.java
@@ -7,17 +7,17 @@
* Contributors:
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -265,10 +265,10 @@ public class ArtifactRepositoryManager implements IArtifactRepositoryManager {
if (location == null)
// TODO should do something here since we are failing to restore.
return;
- SimpleArtifactRepository cache = (SimpleArtifactRepository) createRepository(location.getArtifactRepositoryURL(), "download cache", "org.eclipse.equinox.prov.artifact.repository.simpleRepository"); //$NON-NLS-1$ //$NON-NLS-2$
+ SimpleArtifactRepository cache = (SimpleArtifactRepository) createRepository(location.getArtifactRepositoryURL(), "download cache", "org.eclipse.equinox.p2.artifact.repository.simpleRepository"); //$NON-NLS-1$ //$NON-NLS-2$
cache.tagAsImplementation();
- String locationString = Activator.getContext().getProperty("eclipse.prov.artifactRepository"); //$NON-NLS-1$
+ String locationString = Activator.getContext().getProperty("eclipse.p2.artifactRepository"); //$NON-NLS-1$
if (locationString != null) {
StringTokenizer tokenizer = new StringTokenizer(locationString, ","); //$NON-NLS-1$
while (tokenizer.hasMoreTokens()) {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java
index e13519131..05b4b80c6 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ArtifactRequest.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ArtifactRequest.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
/**
* Base class for all requests on an {@link IArtifactRepository}.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ECFTransport.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java
index f5c9f7674..5f9263f63 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/ECFTransport.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/ECFTransport.java
@@ -7,7 +7,7 @@
* Contributors: IBM Corporation - initial API and implementation Stefan Liebig -
* random tweaks
******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.IOException;
import java.io.OutputStream;
@@ -17,9 +17,9 @@ import org.eclipse.ecf.filetransfer.events.*;
import org.eclipse.ecf.filetransfer.identity.FileCreateException;
import org.eclipse.ecf.filetransfer.identity.FileIDFactory;
import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory;
-import org.eclipse.equinox.prov.artifact.repository.Transport;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.artifact.repository.Transport;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
import org.osgi.util.tracker.ServiceTracker;
/**
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/FileDownloadRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java
index 104d95879..248f3ef67 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/FileDownloadRequest.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/FileDownloadRequest.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
public class FileDownloadRequest extends ArtifactRequest {
public static FileDownloadRequest[] NO_REQUEST = new FileDownloadRequest[0];
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/MirrorRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
index af383462b..6b0965250 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/MirrorRequest.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.IOException;
import java.io.OutputStream;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.IWritableArtifactRepository;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.IWritableArtifactRepository;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
public class MirrorRequest extends ArtifactRequest {
private IWritableArtifactRepository target;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SignatureVerifier.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java
index 113f388fa..169f6a39f 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SignatureVerifier.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SignatureVerifier.java
@@ -9,14 +9,14 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
import org.eclipse.osgi.internal.provisional.verifier.CertificateVerifier;
import org.eclipse.osgi.internal.provisional.verifier.CertificateVerifierFactory;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SimpleArtifactRepository.java
index 556d8d969..98d7b456e 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SimpleArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SimpleArtifactRepository.java
@@ -6,19 +6,19 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.*;
import java.net.*;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepHandler;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.core.repository.AbstractRepository;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.repository.AbstractRepository;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
public class SimpleArtifactRepository extends AbstractRepository implements IWritableArtifactRepository {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SimpleArtifactRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SimpleArtifactRepositoryFactory.java
index d7295b329..6dbfcd6d2 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/SimpleArtifactRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/SimpleArtifactRepositoryFactory.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.*;
import java.net.URL;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepositoryFactory;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryFactory;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
public class SimpleArtifactRepositoryFactory implements IArtifactRepositoryFactory {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/Unpack200Step.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Unpack200Step.java
index 0750ef994..65bef53dc 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/prov/artifact/repository/Unpack200Step.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Unpack200Step.java
@@ -9,16 +9,16 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.artifact.repository;
+package org.eclipse.equinox.internal.p2.artifact.repository;
import java.io.*;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep;
import org.eclipse.equinox.internal.p2.jarprocessor.Utils;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor;
import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor.Options;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
/**
* The Pack200Unpacker expects an input containing ".jar.pack.gz" data.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/ArtifactDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/ArtifactDescriptor.java
index e33e07269..198105240 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/ArtifactDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/ArtifactDescriptor.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.util.*;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
/**
* This represents information about a given artifact stored on a particular byte server.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactDescriptor.java
index 0cc89ef71..bbc8ee521 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactDescriptor.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
public interface IArtifactDescriptor {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepository.java
index daf900aa1..67a3e7fe1 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepository.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.io.OutputStream;
import java.net.URI;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
/**
* TODO: Convert to abstract class
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryFactory.java
index b3d9dca07..6794552f4 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.net.URL;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepositoryManager.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryManager.java
index ace98461d..ee355ba5f 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRepositoryManager.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.net.URL;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
public interface IArtifactRepositoryManager {
public static final IArtifactRequest[] NO_ARTIFACT_REQUEST = new IArtifactRequest[0];
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRequest.java
index 2a86946b4..50d863a47 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IArtifactRequest.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IArtifactRequest.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.internal.prov.artifact.repository.ArtifactRequest;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
/**
* This interface is not intended to be implemented by clients
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IWritableArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IWritableArtifactRepository.java
index 227c68ec5..ce4f0ffad 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/IWritableArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/IWritableArtifactRepository.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.io.OutputStream;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
// TODO consider having the add and remove methods take several keys/descriptors
// to operate on at one time.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/Mapper.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/Mapper.java
index b84bff2ed..afc7d7152 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/Mapper.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/Mapper.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.util.Dictionary;
import java.util.Hashtable;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/RepositoryDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/RepositoryDescriptor.java
index cb8a0378a..86ad7f091 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/RepositoryDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/RepositoryDescriptor.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.net.URI;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.osgi.framework.Version;
public abstract class RepositoryDescriptor {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/Transport.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/Transport.java
index c8ff18afe..3b9e6d3a9 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/Transport.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/Transport.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository;
+package org.eclipse.equinox.p2.artifact.repository;
import java.io.OutputStream;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStep.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStep.java
index f6338eeaf..6667bf388 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStep.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStep.java
@@ -9,14 +9,14 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM Corporation - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository.processing;
+package org.eclipse.equinox.p2.artifact.repository.processing;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
/**
* ProcessingSteps process the data written to them and pass the resultant data on
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStepDescriptor.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepDescriptor.java
index e79910ef0..a2f91f048 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStepDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepDescriptor.java
@@ -8,7 +8,7 @@
* Contributors:
* compeople AG (Stefan Liebig) - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository.processing;
+package org.eclipse.equinox.p2.artifact.repository.processing;
/**
* The description of a processor step.
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStepHandler.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepHandler.java
index e1777da14..f488fc47d 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/prov/artifact/repository/processing/ProcessingStepHandler.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/p2/artifact/repository/processing/ProcessingStepHandler.java
@@ -9,12 +9,12 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.artifact.repository.processing;
+package org.eclipse.equinox.p2.artifact.repository.processing;
import java.io.OutputStream;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
/**
* Creates processing step instances from extensions and executes them.
@@ -30,7 +30,7 @@ public class ProcessingStepHandler {
public ProcessingStep create(ProcessingStepDescriptor descriptor, IArtifactDescriptor context) {
IExtensionRegistry registry = RegistryFactory.getRegistry();
- IExtension extension = registry.getExtension("org.eclipse.equinox.prov.artifact.repository.processingSteps", descriptor.getProcessorId()); //$NON-NLS-1$
+ IExtension extension = registry.getExtension("org.eclipse.equinox.p2.artifact.repository.processingSteps", descriptor.getProcessorId()); //$NON-NLS-1$
IConfigurationElement[] config = extension.getConfigurationElements();
Exception error = null;
try {
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) {
diff --git a/bundles/org.eclipse.equinox.p2.core/.project b/bundles/org.eclipse.equinox.p2.core/.project
index 6a29114b4..b7cc168a0 100644
--- a/bundles/org.eclipse.equinox.p2.core/.project
+++ b/bundles/org.eclipse.equinox.p2.core/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.core</name>
+ <name>org.eclipse.equinox.p2.core</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index 7b94ce6da..eaf59f21a 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Core Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.core;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true
Bundle-Version: 0.1.0.qualifier
Import-Package: com.thoughtworks.xstream,
org.eclipse.core.runtime.adaptor,
@@ -13,15 +13,15 @@ Import-Package: com.thoughtworks.xstream,
org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="1.3.3"
-Export-Package: org.eclipse.equinox.internal.prov.core;x-internal:=true,
- org.eclipse.equinox.prov.core,
- org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository
+Export-Package: org.eclipse.equinox.internal.p2.core;x-internal:=true,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository
Eclipse-LazyStart: true
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
-Bundle-Activator: org.eclipse.equinox.internal.prov.core.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
Require-Bundle: org.eclipse.equinox.common
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Activator.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java
index 521779118..7f462cac7 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Activator.java
@@ -6,14 +6,14 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.core;
+package org.eclipse.equinox.internal.p2.core;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.service.datalocation.Location;
import org.osgi.framework.*;
@@ -21,7 +21,7 @@ import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator {
- public static final String AGENT_DATA_AREA = "eclipse.prov.data.area"; //$NON-NLS-1$
+ public static final String AGENT_DATA_AREA = "eclipse.p2.data.area"; //$NON-NLS-1$
public static Location agentDataLocation = null;
public static BundleContext context;
@@ -154,7 +154,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext context) throws Exception {
instance = this;
Activator.context = context;
- URL defaultLocation = new URL(context.getProperty("osgi.configuration.area") + "org.eclipse.equinox.prov.core/agentdata/");
+ URL defaultLocation = new URL(context.getProperty("osgi.configuration.area") + "org.eclipse.equinox.p2.core/agentdata/");
agentDataLocation = buildLocation(AGENT_DATA_AREA, defaultLocation, false, true);
Dictionary locationProperties = new Hashtable();
if (defaultLocation != null) {
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/BasicLocation.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java
index 304327928..55e70b39d 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/BasicLocation.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/BasicLocation.java
@@ -6,13 +6,13 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.core;
+package org.eclipse.equinox.internal.p2.core;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
import org.eclipse.osgi.service.datalocation.Location;
/**
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker.java
index 521dc0501..89761664c 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.core;
+package org.eclipse.equinox.internal.p2.core;
import java.io.IOException;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker_JavaIo.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker_JavaIo.java
index 2ba6cf51d..0f3252344 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker_JavaIo.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker_JavaIo.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.core;
+package org.eclipse.equinox.internal.p2.core;
import java.io.*;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker_JavaNio.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker_JavaNio.java
index 917e26192..330db1cdf 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Locker_JavaNio.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Locker_JavaNio.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.core;
+package org.eclipse.equinox.internal.p2.core;
import java.io.*;
import java.nio.channels.FileLock;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Messages.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Messages.java
index 672ebd4f7..ba110d0ec 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/Messages.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.core;
+package org.eclipse.equinox.internal.p2.core;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.prov.core.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.core.messages"; //$NON-NLS-1$
public static final String ECLIPSE_CANNOT_CHANGE_LOCATION = null;
static {
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/messages.properties b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/messages.properties
index f6ae633b8..f6ae633b8 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/prov/core/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/ProvisionException.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/ProvisionException.java
index 86d9afabe..8f2a19e39 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/ProvisionException.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/ProvisionException.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core;
+package org.eclipse.equinox.p2.core;
public class ProvisionException extends Exception {
private static final long serialVersionUID = 1L;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/ProvisioningEventBus.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningEventBus.java
index e556b6f13..e754ea6b0 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/ProvisioningEventBus.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningEventBus.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.eventbus;
+package org.eclipse.equinox.p2.core.eventbus;
import java.util.EventObject;
import org.eclipse.osgi.framework.eventmgr.*;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/ProvisioningListener.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningListener.java
index 15a90f2a6..46e451208 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/ProvisioningListener.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/ProvisioningListener.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.eventbus;
+package org.eclipse.equinox.p2.core.eventbus;
import java.util.EventListener;
import java.util.EventObject;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/SynchronousProvisioningListener.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/SynchronousProvisioningListener.java
index b99afe766..db312a2a3 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/eventbus/SynchronousProvisioningListener.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/eventbus/SynchronousProvisioningListener.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.eventbus;
+package org.eclipse.equinox.p2.core.eventbus;
public interface SynchronousProvisioningListener extends ProvisioningListener {
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/ArrayUtils.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/ArrayUtils.java
index ee8d5f7ac..1f23c6d9b 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/ArrayUtils.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/ArrayUtils.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.util.Iterator;
import java.util.NoSuchElementException;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/FileUtils.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/FileUtils.java
index 47d82467d..a111ab513 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/FileUtils.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/FileUtils.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.io.*;
import java.net.URL;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Headers.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Headers.java
index 9fb93dc0f..1bd2020c3 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Headers.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Headers.java
@@ -1,4 +1,4 @@
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
/*******************************************************************************
* Copyright (c) 2003, 2007 IBM Corporation and others.
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/LogHelper.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/LogHelper.java
index 140a4fa1f..93b13c7f9 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/LogHelper.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/LogHelper.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.internal.prov.core.Activator;
+import org.eclipse.equinox.internal.p2.core.Activator;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Messages.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Messages.java
index 665375aab..2360b0e7a 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Messages.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.prov.core.helpers.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.core.helpers.messages"; //$NON-NLS-1$
static {
// load message values from bundle file and assign to fields below
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/MultiStatus.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/MultiStatus.java
index 0ae29073b..58b44901c 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/MultiStatus.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/MultiStatus.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.Status;
* is called more often than getChildren()
*/
public class MultiStatus extends Status {
- public final static String bundleId = "org.eclipse.equinox.prov";
+ public final static String bundleId = "org.eclipse.equinox.p2";
public static final int STATUS_CODE_SUCCESS = 0;
// Use ArrayList rather than List so ensureCapacity() is available.
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/MultiStatusUtil.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/MultiStatusUtil.java
index df63cd910..0e2bb3800 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/MultiStatusUtil.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/MultiStatusUtil.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.util.*;
import org.eclipse.core.runtime.*;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/OrderedProperties.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/OrderedProperties.java
index d1f489960..2c8e5b660 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/OrderedProperties.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/OrderedProperties.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.util.*;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/ServiceHelper.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/ServiceHelper.java
index da2e44b65..e9057c75c 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/ServiceHelper.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/ServiceHelper.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/TwoTierMap.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/TwoTierMap.java
index 0ab331da4..923ad20c9 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/TwoTierMap.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/TwoTierMap.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.io.PrintStream;
import java.io.Serializable;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/UnmodifiableProperties.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/UnmodifiableProperties.java
index 7b220d45d..22751185c 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/UnmodifiableProperties.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/UnmodifiableProperties.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.util.Iterator;
import java.util.Map;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Utils.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Utils.java
index 02c1c7ede..60a03d85b 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/Utils.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/Utils.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.helpers;
+package org.eclipse.equinox.p2.core.helpers;
import java.io.File;
import java.net.URL;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/messages.properties b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/messages.properties
index a5294426c..a5294426c 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/helpers/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/helpers/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/location/AgentLocation.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/location/AgentLocation.java
index 809826915..53d0c3c5b 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/location/AgentLocation.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/location/AgentLocation.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.location;
+package org.eclipse.equinox.p2.core.location;
import java.net.URL;
import org.eclipse.osgi.service.datalocation.Location;
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/AbstractRepository.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/AbstractRepository.java
index fed3e032e..be642ef60 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/AbstractRepository.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/AbstractRepository.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.repository;
+package org.eclipse.equinox.p2.core.repository;
import java.net.URL;
import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
/**
* AbstractRepository defines common properties that may be provided by various kinds
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/IRepositoryInfo.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IRepositoryInfo.java
index a63b3fc8b..cb37798a7 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/IRepositoryInfo.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IRepositoryInfo.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.repository;
+package org.eclipse.equinox.p2.core.repository;
import java.net.URL;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
/**
* IRepositoryInfo defines common properties that may be provided by various kinds
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/IWritableRepositoryInfo.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IWritableRepositoryInfo.java
index 895435165..06a6e7cfc 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/IWritableRepositoryInfo.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/IWritableRepositoryInfo.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.repository;
+package org.eclipse.equinox.p2.core.repository;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
/**
* IWritableRepositoryInfo provides setters for common properties of various kinds
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/RepositoryCreationException.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/RepositoryCreationException.java
index 87db53e90..b121a4747 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/prov/core/repository/RepositoryCreationException.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/p2/core/repository/RepositoryCreationException.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.core.repository;
+package org.eclipse.equinox.p2.core.repository;
public class RepositoryCreationException extends Exception {
diff --git a/bundles/org.eclipse.equinox.p2.director.app/.project b/bundles/org.eclipse.equinox.p2.director.app/.project
index a1bda4f8f..94d69c3bd 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/.project
+++ b/bundles/org.eclipse.equinox.p2.director.app/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.director.app</name>
+ <name>org.eclipse.equinox.p2.director.app</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF
index 332a4197a..d002dbd94 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Equinox Provisioning Director Application Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.director.app;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.director.app;singleton:=true
Bundle-Version: 0.1.0.qualifier
Import-Package: org.eclipse.equinox.app,
- org.eclipse.equinox.internal.prov.console,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.director,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.query,
+ org.eclipse.equinox.internal.p2.console,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.director,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
org.eclipse.osgi.service.environment,
org.eclipse.osgi.service.resolver;version="1.1.0",
org.osgi.framework
-Bundle-Activator: org.eclipse.equinox.prov.internal.director.app.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.director.app.Activator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.p2.director.app/config.ini b/bundles/org.eclipse.equinox.p2.director.app/config.ini
index c0024e787..5e6a504b5 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/config.ini
+++ b/bundles/org.eclipse.equinox.p2.director.app/config.ini
@@ -49,19 +49,19 @@ osgi.bundles=\
org.eclipse.equinox.common,\
org.eclipse.equinox.frameworkadmin,\
org.eclipse.equinox.frameworkadmin.equinox@start,\
- org.eclipse.equinox.prov.artifact.repository,\
- org.eclipse.equinox.prov.console,\
- org.eclipse.equinox.prov.core,\
- org.eclipse.equinox.prov.director,\
- org.eclipse.equinox.prov.director.app,\
- org.eclipse.equinox.prov.download,\
- org.eclipse.equinox.prov.engine,\
- org.eclipse.equinox.prov.examplarysetup@start,\
- org.eclipse.equinox.prov.metadata,\
- org.eclipse.equinox.prov.metadata.repository,\
- org.eclipse.equinox.prov.operations,\
- org.eclipse.equinox.prov.touchpoint.eclipse,\
- org.eclipse.equinox.prov.touchpoint.natives,\
+ org.eclipse.equinox.p2.artifact.repository,\
+ org.eclipse.equinox.p2.console,\
+ org.eclipse.equinox.p2.core,\
+ org.eclipse.equinox.p2.director,\
+ org.eclipse.equinox.p2.director.app,\
+ org.eclipse.equinox.p2.download,\
+ org.eclipse.equinox.p2.engine,\
+ org.eclipse.equinox.p2.examplarysetup@start,\
+ org.eclipse.equinox.p2.metadata,\
+ org.eclipse.equinox.p2.metadata.repository,\
+ org.eclipse.equinox.p2.operations,\
+ org.eclipse.equinox.p2.touchpoint.eclipse,\
+ org.eclipse.equinox.p2.touchpoint.natives,\
org.eclipse.equinox.registry,\
org.eclipse.equinox.simpleconfigurator,\
org.eclipse.equinox.simpleconfigurator.manipulator@start,\
diff --git a/bundles/org.eclipse.equinox.p2.director.app/director app.launch b/bundles/org.eclipse.equinox.p2.director.app/director app.launch
index 1e149412a..e11a5e1e3 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/director app.launch
+++ b/bundles/org.eclipse.equinox.p2.director.app/director app.launch
@@ -11,13 +11,13 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.prov.director.app.application&#13;&#10;-metadataRepository file:d:/tmp/equinox.prov/servers/metadataRepository/ &#13;&#10;-artifactRepository file:d:/tmp/equinox.prov/servers/artifactRepository/ &#13;&#10;-installIU sdk&#13;&#10;-destination d:/tmp/equinox.prov/eclipseApp&#13;&#10;-flavor tooling&#13;&#10;-profile foo"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.p2.director.app.application&#13;&#10;-metadataRepository file:d:/tmp/equinox.p2/servers/metadataRepository/ &#13;&#10;-artifactRepository file:d:/tmp/equinox.p2/servers/artifactRepository/ &#13;&#10;-installIU sdk&#13;&#10;-destination d:/tmp/equinox.p2/eclipseApp&#13;&#10;-flavor tooling&#13;&#10;-profile foo"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=d:/tmp/equinox.prov/agentData"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=d:/tmp/equinox.p2/agentData"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="target_bundles" value="org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.runtime.compatibility.registry@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.preferences@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="true"/>
<stringAttribute key="vminstall" value="ibm1.5sr1"/>
-<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:default,org.eclipse.equinox.prov.core@default:default,org.eclipse.equinox.prov.director@default:default,org.eclipse.equinox.prov.director.app@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@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:true,org.eclipse.osgi@:,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:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.director.app@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@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:true,org.eclipse.osgi@:,org.mozilla.rhino@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.director.app/director.product b/bundles/org.eclipse.equinox.p2.director.app/director.product
index da518df4c..0fa6e99ca 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/director.product
+++ b/bundles/org.eclipse.equinox.p2.director.app/director.product
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.1"?>
-<product name="Equinox Provisioning Director" id="org.eclipse.equinox.prov.director.app.product" application="org.eclipse.equinox.prov.director.app.application" useFeatures="true">
+<product name="Equinox Provisioning Director" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" useFeatures="true">
- <configIni use="custom" path="/org.eclipse.equinox.prov.director.app/config.ini"/>
+ <configIni use="custom" path="/org.eclipse.equinox.p2.director.app/config.ini"/>
<launcherArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
@@ -23,7 +23,7 @@
</plugins>
<features>
- <feature id="org.eclipse.equinox.prov.director.feature" version="0.0.0"/>
+ <feature id="org.eclipse.equinox.p2.director.feature" version="0.0.0"/>
<feature id="org.eclipse.rcp" version="0.0.0"/>
</features>
diff --git a/bundles/org.eclipse.equinox.p2.director.app/plugin.xml b/bundles/org.eclipse.equinox.p2.director.app/plugin.xml
index e1149a15c..9b8a9c1d2 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.director.app/plugin.xml
@@ -3,14 +3,14 @@
<plugin>
<extension id="application" point="org.eclipse.core.runtime.applications">
<application>
- <run class="org.eclipse.equinox.prov.internal.director.app.Application"/>
+ <run class="org.eclipse.equinox.internal.p2.director.app.Application"/>
</application>
</extension>
<extension
id="product"
point="org.eclipse.core.runtime.products">
<product
- application="org.eclipse.equinox.prov.director.app.application"
+ application="org.eclipse.equinox.p2.director.app.application"
name="Equinox Provisioning Director">
</product>
</extension>
diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/prov/internal/director/app/Activator.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Activator.java
index d87fe4da6..f9fb36f82 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/prov/internal/director/app/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Activator.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.internal.director.app;
+package org.eclipse.equinox.internal.p2.director.app;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/prov/internal/director/app/Application.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java
index cb13a593c..1236b361f 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/prov/internal/director/app/Application.java
+++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java
@@ -6,22 +6,22 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.internal.director.app;
+package org.eclipse.equinox.internal.p2.director.app;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.equinox.internal.prov.console.ProvisioningHelper;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-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.query.IQueryable;
-import org.eclipse.equinox.prov.query.Query;
+import org.eclipse.equinox.internal.p2.console.ProvisioningHelper;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+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.query.IQueryable;
+import org.eclipse.equinox.p2.query.Query;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
@@ -59,11 +59,11 @@ public class Application implements IApplication {
props.setProperty(Profile.PROP_FLAVOR, flavor);
if (bundlePool != null)
if (bundlePool.equals("<destination>"))
- props.setProperty("eclipse.prov.cache", destination);
+ props.setProperty("eclipse.p2.cache", destination);
else
- props.setProperty("eclipse.prov.cache", bundlePool);
+ props.setProperty("eclipse.p2.cache", bundlePool);
if (roamingProfile)
- props.setProperty("eclipse.prov.roaming", "true");
+ props.setProperty("eclipse.p2.roaming", "true");
String env = getEnvironmentProperty();
if (env != null)
@@ -87,7 +87,7 @@ public class Application implements IApplication {
operationStatus = director.uninstall(roots, profile, new NullProgressMonitor());
}
} else {
- operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.prov.director.test", "The installable unit '" + root + "' has not been found");
+ operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.p2.director.test", "The installable unit '" + root + "' has not been found");
}
if (operationStatus.isOK()) {
diff --git a/bundles/org.eclipse.equinox.p2.director/.project b/bundles/org.eclipse.equinox.p2.director/.project
index aae538be8..c5f37a6bc 100644
--- a/bundles/org.eclipse.equinox.p2.director/.project
+++ b/bundles/org.eclipse.equinox.p2.director/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.director</name>
+ <name>org.eclipse.equinox.p2.director</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
index bea852499..12703428f 100644
--- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Director Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.director
+Bundle-SymbolicName: org.eclipse.equinox.p2.director
Bundle-Version: 0.1.0.qualifier
-Import-Package: org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository,
- 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.prov.resolution,
+Import-Package: org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository,
+ 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.equinox.p2.resolution,
org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0"
-Export-Package: org.eclipse.equinox.internal.prov.director,
- org.eclipse.equinox.prov.director
-Bundle-Activator: org.eclipse.equinox.internal.prov.director.DirectorActivator
+Export-Package: org.eclipse.equinox.internal.p2.director,
+ org.eclipse.equinox.p2.director
+Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/BasicIUFilter.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java
index bbc212a06..18f0d71b0 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/BasicIUFilter.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/BasicIUFilter.java
@@ -6,9 +6,9 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
public class BasicIUFilter extends IUFilter {
private IInstallableUnit[] accepted;
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/DirectorActivator.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java
index 6fc46f6de..d3d20b640 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/DirectorActivator.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/DirectorActivator.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class DirectorActivator implements BundleActivator {
- public static final String PI_DIRECTOR = "org.eclipse.equinox.prov.director"; //$NON-NLS-1$
+ public static final String PI_DIRECTOR = "org.eclipse.equinox.p2.director"; //$NON-NLS-1$
public static BundleContext context;
public void start(BundleContext ctx) throws Exception {
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/IUFilter.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java
index 96d88da8c..d3e12b97e 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/IUFilter.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUFilter.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
public abstract class IUFilter {
public abstract boolean accept(IInstallableUnit iu);
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/IUTransformationHelper.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java
index 5b305bdd0..490e6b35c 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/IUTransformationHelper.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/IUTransformationHelper.java
@@ -6,12 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
import java.util.ArrayList;
import java.util.Iterator;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
import org.eclipse.osgi.service.resolver.VersionRange;
public class IUTransformationHelper {
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/Messages.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java
index dd4b9980a..d23b63a31 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Messages.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.prov.director.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.director.messages"; //$NON-NLS-1$
static {
// initialize resource bundles
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/OperationGenerator.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java
index 1944bb4b8..a26c4a7b5 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/OperationGenerator.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/OperationGenerator.java
@@ -6,12 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
import java.util.*;
-import org.eclipse.equinox.prov.engine.Operand;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.query.CompoundIterator;
+import org.eclipse.equinox.p2.engine.Operand;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.query.CompoundIterator;
import org.eclipse.osgi.service.resolver.VersionRange;
public class OperationGenerator {
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/Picker.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java
index 70249358e..e2bf4541f 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/Picker.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Picker.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
import java.util.*;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.resolver.VersionRange;
//The pickers goal is to find an installable unit that satisfies a search criteria
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/RequirementBasedFilter.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java
index 957eb6f31..01e0162d7 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/RequirementBasedFilter.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/RequirementBasedFilter.java
@@ -6,10 +6,10 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.director;
+package org.eclipse.equinox.internal.p2.director;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
public class RequirementBasedFilter extends IUFilter {
private RequiredCapability[] reqs;
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/messages.properties b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties
index 795fa00db..795fa00db 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/director/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/rollback/FormerState.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java
index f6fa26786..24531baa5 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/prov/rollback/FormerState.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/rollback/FormerState.java
@@ -6,16 +6,16 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.rollback;
+package org.eclipse.equinox.internal.p2.rollback;
import java.util.EventObject;
import java.util.Hashtable;
-import org.eclipse.equinox.internal.prov.director.IUTransformationHelper;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.eventbus.SynchronousProvisioningListener;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.metadata.repository.IWritableMetadataRepository;
+import org.eclipse.equinox.internal.p2.director.IUTransformationHelper;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.repository.IWritableMetadataRepository;
import org.osgi.framework.Version;
public class FormerState {
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/IDirector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IDirector.java
index 152832a56..4ad233379 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/IDirector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/IDirector.java
@@ -6,12 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.director;
+package org.eclipse.equinox.p2.director;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
/**
* Directors are responsible for determining what should be done to a given
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/NewDependencyExpander.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/NewDependencyExpander.java
index 164aeeea3..7d3941ec4 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/NewDependencyExpander.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/NewDependencyExpander.java
@@ -6,16 +6,16 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.director;
+package org.eclipse.equinox.p2.director;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.director.*;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.query.CompoundIterator;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
-import org.eclipse.equinox.prov.resolution.UnsatisfiedCapability;
+import org.eclipse.equinox.internal.p2.director.*;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.query.CompoundIterator;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.resolution.UnsatisfiedCapability;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.InvalidSyntaxException;
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/NewSimpleDirector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/NewSimpleDirector.java
index 665cca2ee..c1ffdd9b5 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/NewSimpleDirector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/NewSimpleDirector.java
@@ -6,22 +6,22 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.director;
+package org.eclipse.equinox.p2.director;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.director.*;
-import org.eclipse.equinox.internal.prov.rollback.FormerState;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.core.repository.IWritableRepositoryInfo;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.metadata.repository.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.internal.p2.director.*;
+import org.eclipse.equinox.internal.p2.rollback.FormerState;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.IWritableRepositoryInfo;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.repository.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Version;
@@ -47,7 +47,7 @@ public class NewSimpleDirector implements IDirector {
IMetadataRepositoryManager manager = (IMetadataRepositoryManager) ServiceHelper.getService(DirectorActivator.context, IMetadataRepositoryManager.class.getName());
IWritableMetadataRepository rollbackRepo = (IWritableMetadataRepository) manager.loadRepository(rollbackLocation, null);
if (rollbackRepo == null)
- rollbackRepo = (IWritableMetadataRepository) manager.createRepository(rollbackLocation, "Agent rollback repo", "org.eclipse.equinox.prov.metadata.repository.simpleRepository"); //$NON-NLS-1$//$NON-NLS-2$
+ rollbackRepo = (IWritableMetadataRepository) manager.createRepository(rollbackLocation, "Agent rollback repo", "org.eclipse.equinox.p2.metadata.repository.simpleRepository"); //$NON-NLS-1$//$NON-NLS-2$
if (rollbackRepo == null)
throw new IllegalStateException("Unable to open or create Agent's rollback repository");
tagAsImplementation(rollbackRepo);
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/Oracle.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/Oracle.java
index fa7e6a105..2954c855e 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/Oracle.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/Oracle.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.director;
+package org.eclipse.equinox.p2.director;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.director.DirectorActivator;
-import org.eclipse.equinox.internal.prov.director.Messages;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.internal.p2.director.DirectorActivator;
+import org.eclipse.equinox.internal.p2.director.Messages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
import org.eclipse.osgi.service.resolver.VersionRange;
//TODO The "extends" relationship with the director is a hack to get stuffs working
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/TrackedHashSet.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/TrackedHashSet.java
index 5d48690ca..9c58973f4 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/TrackedHashSet.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/TrackedHashSet.java
@@ -6,10 +6,10 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.director;
+package org.eclipse.equinox.p2.director;
import java.util.*;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.p2.metadata.*;
public class TrackedHashSet extends LinkedHashSet {
RecommendationDescriptor recommendations;
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/director.txt b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/director.txt
index 5fd09d5d5..5fd09d5d5 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/prov/director/director.txt
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/p2/director/director.txt
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
index 6ed9c1313..8b1a73066 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-Name: Directorywatcher Bundle
Bundle-SymbolicName: org.eclipse.equinox.p2.directorywatcher
Bundle-Version: 0.1.0.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.directorywatcher.Activator
-Import-Package: org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.metadata.generator,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.query,
+Import-Package: org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.metadata.generator,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
org.osgi.framework;version="1.4.0",
org.osgi.service.cm;version="1.2.0";resolution:=optional,
org.osgi.service.packageadmin;version="1.2.0",
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java
index d9eda277e..3688768b9 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/src/org/eclipse/equinox/internal/p2/directorywatcher/ProvisioningListener.java
@@ -13,12 +13,12 @@ import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
import org.eclipse.equinox.p2.directorywatcher.DirectoryWatcher;
import org.eclipse.equinox.p2.directorywatcher.IDirectoryChangeListener;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.metadata.generator.*;
-import org.eclipse.equinox.prov.metadata.repository.*;
+import org.eclipse.equinox.p2.metadata.generator.*;
+import org.eclipse.equinox.p2.metadata.repository.*;
public class ProvisioningListener implements IDirectoryChangeListener {
@@ -154,7 +154,7 @@ public class ProvisioningListener implements IDirectoryChangeListener {
// 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 = location + " - 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);
}
@@ -176,7 +176,7 @@ public class ProvisioningListener implements IDirectoryChangeListener {
// 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 = location + " - 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.engine/.project b/bundles/org.eclipse.equinox.p2.engine/.project
index 4ca5cad36..527b9165a 100644
--- a/bundles/org.eclipse.equinox.p2.engine/.project
+++ b/bundles/org.eclipse.equinox.p2.engine/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.engine</name>
+ <name>org.eclipse.equinox.p2.engine</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
index 7f3d1c98d..8cb05b315 100644
--- a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Engine Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.engine;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Export-Package: org.eclipse.equinox.internal.prov.engine;x-internal:=true,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.engine.phases,
- org.eclipse.equinox.prov.installregistry
+Export-Package: org.eclipse.equinox.internal.p2.engine;x-internal:=true,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.engine.phases,
+ org.eclipse.equinox.p2.installregistry
Import-Package: com.thoughtworks.xstream,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.download,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.query,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.download,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.query,
org.eclipse.osgi.service.datalocation;version="1.0.0",
org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="1.3.3"
-Bundle-Activator: org.eclipse.equinox.internal.prov.engine.EngineActivator
+Bundle-Activator: org.eclipse.equinox.internal.p2.engine.EngineActivator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.p2.engine/plugin.xml b/bundles/org.eclipse.equinox.p2.engine/plugin.xml
index 990388563..d2069061f 100644
--- a/bundles/org.eclipse.equinox.p2.engine/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.engine/plugin.xml
@@ -4,10 +4,10 @@
name="Touchpoints"
schema="schema/touchpoints.exsd"/>
- <extension point="org.eclipse.equinox.prov.engine.touchpoints" id="null" name="Null Touchpoint">
+ <extension point="org.eclipse.equinox.p2.engine.touchpoints" id="null" name="Null Touchpoint">
<touchpoint
type="null"
- class="org.eclipse.equinox.internal.prov.engine.NullTouchpoint"
+ class="org.eclipse.equinox.internal.p2.engine.NullTouchpoint"
version="1.0.0"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd b/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd
index e085a524a..1748a815e 100644
--- a/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd
+++ b/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.prov.engine">
+<schema targetNamespace="org.eclipse.equinox.p2.engine">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.equinox.prov.engine" id="touchpoints" name="Touchpoints"/>
+ <meta.schema plugin="org.eclipse.equinox.p2.engine" id="touchpoints" name="Touchpoints"/>
</appInfo>
<documentation>
[Enter description of this extension point.]
@@ -58,7 +58,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.equinox.prov.engine.ITouchpoint"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.equinox.p2.engine.ITouchpoint"/>
</appInfo>
</annotation>
</attribute>
@@ -117,10 +117,10 @@
<documentation>
&lt;p&gt;
&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.equinox.prov.engine.installAdaptors&quot; id=&quot;eclipse&quot; name=&quot;Eclipse Install Adaptor&quot;&gt;
+ &lt;extension point=&quot;org.eclipse.equinox.p2.engine.installAdaptors&quot; id=&quot;eclipse&quot; name=&quot;Eclipse Install Adaptor&quot;&gt;
&lt;installAdaptor
type=&quot;eclipse&quot;
- class=&quot;org.eclipse.equinox.internal.prov.eclipseAdaptor.EclipseInstallAdaptor&quot;
+ class=&quot;org.eclipse.equinox.internal.p2.eclipseAdaptor.EclipseInstallAdaptor&quot;
version=&quot;1.0.0&quot;/&gt;
&lt;/extension&gt;
&lt;/pre&gt;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/CommonDef.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/CommonDef.java
index e24937a7f..9816a1932 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/CommonDef.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/CommonDef.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.engine;
+package org.eclipse.equinox.internal.p2.engine;
/*
* This interface contains global constant definitions.
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/EngineActivator.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
index ee0b3eeac..dfc1de231 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/EngineActivator.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
@@ -8,17 +8,17 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.engine;
+package org.eclipse.equinox.internal.p2.engine;
import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.engine.Engine;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.engine.Engine;
public class EngineActivator implements BundleActivator, ServiceTrackerCustomizer {
private static BundleContext context;
- public static final String ID = "org.eclipse.equinox.prov.engine";
+ public static final String ID = "org.eclipse.equinox.p2.engine";
public static BundleContext getContext() {
return context;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/Messages.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Messages.java
index c1dcd38fe..feb301d2e 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/Messages.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.engine;
+package org.eclipse.equinox.internal.p2.engine;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.prov.engine.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.engine.messages"; //$NON-NLS-1$
static {
// initialize resource bundles
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/NullTouchpoint.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java
index 2b8795770..aa2e11c08 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/NullTouchpoint.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/NullTouchpoint.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.engine;
+package org.eclipse.equinox.internal.p2.engine;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.TouchpointType;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.TouchpointType;
/**
* A touchpoint that performs no processing.
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/TouchpointManager.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java
index ec2cf09a5..dc6c188c0 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/TouchpointManager.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/TouchpointManager.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.engine;
+package org.eclipse.equinox.internal.p2.engine;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.engine.ITouchpoint;
-import org.eclipse.equinox.prov.metadata.TouchpointType;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.engine.ITouchpoint;
+import org.eclipse.equinox.p2.metadata.TouchpointType;
import org.eclipse.osgi.util.NLS;
//TODO This needs to support multiple version of each touchpoint and have a lookup that supports version semantics
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/messages.properties b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/messages.properties
index 9b10bd1cb..9b10bd1cb 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/prov/engine/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/AbstractProvisioningTransaction.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/AbstractProvisioningTransaction.java
index 2f48238a2..8de7ea909 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/AbstractProvisioningTransaction.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/AbstractProvisioningTransaction.java
@@ -6,13 +6,13 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.ArrayList;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.engine.EngineActivator;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.core.helpers.MultiStatusUtil;
+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.helpers.MultiStatusUtil;
import org.eclipse.osgi.util.NLS;
/**
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/BeginOperationEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/BeginOperationEvent.java
index 9acffd2cf..d19ba5b9a 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/BeginOperationEvent.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/BeginOperationEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
public class BeginOperationEvent extends TransactionEvent {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/CommitOperationEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/CommitOperationEvent.java
index e3bdd998a..72303ca99 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/CommitOperationEvent.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/CommitOperationEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
public class CommitOperationEvent extends TransactionEvent {
private static final long serialVersionUID = -523967775426133720L;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/DefaultPhaseSet.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/DefaultPhaseSet.java
index ec52bb252..6569b478f 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/DefaultPhaseSet.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/DefaultPhaseSet.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
-import org.eclipse.equinox.prov.engine.phases.*;
+import org.eclipse.equinox.p2.engine.phases.*;
public class DefaultPhaseSet extends PhaseSet {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Engine.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Engine.java
index 4a81eb640..b943ad647 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Engine.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Engine.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
public class Engine {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/EngineSession.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/EngineSession.java
index 893e40ec0..c8a775ac5 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/EngineSession.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/EngineSession.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.*;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java
index 504ae8651..fa360f8fb 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IProfileRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
/**
* This encapsulates the access to the profile registry.
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IProvisioningAction.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProvisioningAction.java
index 7b976aa69..a76a8a74b 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IProvisioningAction.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProvisioningAction.java
@@ -7,7 +7,7 @@
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ITouchpoint.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ITouchpoint.java
index 838d2a3de..9ea12bb17 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ITouchpoint.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ITouchpoint.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
-import org.eclipse.equinox.prov.metadata.TouchpointType;
+import org.eclipse.equinox.p2.metadata.TouchpointType;
/**
* A touchpoint is responsible for executing a given phase for a given
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ITouchpointAction.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ITouchpointAction.java
index c7a9a78e7..a1587ef07 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ITouchpointAction.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ITouchpointAction.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
public interface ITouchpointAction {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IUPhase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IUPhase.java
index 4ac09ee3c..8479f2a4b 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/IUPhase.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IUPhase.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
// An operation that is applied to a set of IUs.
public abstract class IUPhase extends Phase {
@@ -61,7 +61,7 @@ public abstract class IUPhase extends Phase {
// ITouchpoint touchpoint = TouchpointManager.getInstance().getTouchpoint(currentOperand.getTouchpointType());
// if (touchpoint == null) { //TODO Should we throw an exception instead?
- // status.add(new Status(IStatus.ERROR, "org.eclipse.equinox.prov.engine", "The touchpoint " + currentOperand.getTouchpointType() + " is not available."));
+ // status.add(new Status(IStatus.ERROR, "org.eclipse.equinox.p2.engine", "The touchpoint " + currentOperand.getTouchpointType() + " is not available."));
// return;
// }
// if (touchpoint.supports(phaseId)) {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/InstallableUnitEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitEvent.java
index 6ba45dc09..697b77ab3 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/InstallableUnitEvent.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/InstallableUnitEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.EventObject;
import org.eclipse.core.runtime.IStatus;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Operand.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Operand.java
index 5a4ac821e..1ea576802 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Operand.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Operand.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
-import org.eclipse.equinox.prov.metadata.IResolvedInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IResolvedInstallableUnit;
public class Operand {
private final IResolvedInstallableUnit first;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Phase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Phase.java
index 19729096f..c565637bd 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Phase.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Phase.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.internal.prov.engine.Messages;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
+import org.eclipse.equinox.internal.p2.engine.Messages;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
import org.eclipse.osgi.util.NLS;
public abstract class Phase {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/PhaseSet.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PhaseSet.java
index f5d85a2b4..3c350fe32 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/PhaseSet.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/PhaseSet.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
public abstract class PhaseSet {
private final Phase[] phases;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Profile.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Profile.java
index 1894f375d..d0325db93 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Profile.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Profile.java
@@ -6,18 +6,18 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.*;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.internal.prov.engine.EngineActivator;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.installregistry.IInstallRegistry;
-import org.eclipse.equinox.prov.installregistry.IProfileInstallRegistry;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.query.IQueryable;
-import org.eclipse.equinox.prov.query.QueryableArray;
+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.installregistry.IInstallRegistry;
+import org.eclipse.equinox.p2.installregistry.IProfileInstallRegistry;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.query.IQueryable;
+import org.eclipse.equinox.p2.query.QueryableArray;
import org.eclipse.osgi.service.resolver.VersionRange;
public class Profile implements IQueryable {
@@ -25,50 +25,50 @@ public class Profile implements IQueryable {
/**
* Profile property constant indicating the flavor for the profile.
*/
- public static String PROP_FLAVOR = "eclipse.prov.flavor"; //$NON-NLS-1$
+ public static String PROP_FLAVOR = "eclipse.p2.flavor"; //$NON-NLS-1$
/**
* Profile property constant indicating the install folder for the profile.
*/
- public static final String PROP_INSTALL_FOLDER = "eclipse.prov.installFolder"; //$NON-NLS-1$
+ public static final String PROP_INSTALL_FOLDER = "eclipse.p2.installFolder"; //$NON-NLS-1$
/**
* Profile property constant indicating the installed language(s) for the profile.
*/
- public static final String PROP_NL = "eclipse.prov.nl"; //$NON-NLS-1$
+ public static final String PROP_NL = "eclipse.p2.nl"; //$NON-NLS-1$
/**
* Profile property constant for a string property indicating a user visible short
* textual description of this profile. May be empty or <code>null</code>, and
* generally will be for non-top level install contexts.
*/
- public static final String PROP_DESCRIPTION = "eclipse.prov.description"; //$NON-NLS-1$
+ public static final String PROP_DESCRIPTION = "eclipse.p2.description"; //$NON-NLS-1$
/**
* Profile property constant for a string property indicating a user visible name of this profile.
* May be empty or <code>null</code>, and generally will be for non-top level
* install contexts.
*/
- public static final String PROP_NAME = "eclipse.prov.name"; //$NON-NLS-1$
+ public static final String PROP_NAME = "eclipse.p2.name"; //$NON-NLS-1$
/**
* Profile property constant indicating the list of environments
* (e.g., OS, WS, ...) in which a profile can operate. The value of the property
* is a comma-delimited string of key/value pairs.
*/
- public static final String PROP_ENVIRONMENTS = "eclipse.prov.environments"; //$NON-NLS-1$
+ public static final String PROP_ENVIRONMENTS = "eclipse.p2.environments"; //$NON-NLS-1$
/**
* Profile property constant for a boolean property indicating if the profiling
* is roaming. A roaming profile is one whose physical install location varies
* and is updated whenever it runs.
*/
- public static final String PROP_ROAMING = "eclipse.prov.roaming"; //$NON-NLS-1$
+ public static final String PROP_ROAMING = "eclipse.p2.roaming"; //$NON-NLS-1$
/**
* Profile property constant indicating the bundle pool cache location.
*/
- public static final String PROP_CACHE = "eclipse.prov.cache"; //$NON-NLS-1$
+ public static final String PROP_CACHE = "eclipse.p2.cache"; //$NON-NLS-1$
//Internal id of the profile
private String profileId;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ProfileEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProfileEvent.java
index cbb120e67..8d9d00291 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ProfileEvent.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProfileEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.EventObject;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ProvisioningConfigurationException.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningConfigurationException.java
index 4c2496080..6ccf042f2 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/ProvisioningConfigurationException.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningConfigurationException.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
public class ProvisioningConfigurationException extends RuntimeException {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/RollbackOperationEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/RollbackOperationEvent.java
index 9de0d51c1..7d994e6e3 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/RollbackOperationEvent.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/RollbackOperationEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import org.eclipse.core.runtime.IStatus;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/SimpleProfileRegistry.java
index ae4c4c622..7f04ffc1c 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/SimpleProfileRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/SimpleProfileRegistry.java
@@ -6,18 +6,18 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import com.thoughtworks.xstream.XStream;
import java.io.*;
import java.net.URL;
import java.util.LinkedHashMap;
import java.util.Properties;
-import org.eclipse.equinox.internal.prov.engine.EngineActivator;
-import org.eclipse.equinox.internal.prov.engine.Messages;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
+import org.eclipse.equinox.internal.p2.engine.Messages;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS;
@@ -34,7 +34,7 @@ public class SimpleProfileRegistry implements IProfileRegistry {
private String self;
public SimpleProfileRegistry() {
- self = EngineActivator.getContext().getProperty("eclipse.prov.profile"); //$NON-NLS-1$
+ self = EngineActivator.getContext().getProperty("eclipse.p2.profile"); //$NON-NLS-1$
restore();
updateRoamingProfile();
}
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/TransactionEvent.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/TransactionEvent.java
index 9249735a1..4f1fd2521 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/TransactionEvent.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/TransactionEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import java.util.EventObject;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Utils.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Utils.java
index 949119d6b..7f30d8cfe 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/Utils.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/Utils.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine;
+package org.eclipse.equinox.p2.engine;
import org.eclipse.core.runtime.IAdaptable;
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Collect.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Collect.java
index e0cff6d83..c4633471b 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Collect.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Collect.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.engine.phases;
+package org.eclipse.equinox.p2.engine.phases;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.engine.TouchpointManager;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRequest;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.download.DownloadManager;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.p2.engine.TouchpointManager;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRequest;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.download.DownloadManager;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.osgi.util.NLS;
/**
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Install.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Install.java
index 660d2f74e..912ea38af 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Install.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Install.java
@@ -8,17 +8,17 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine.phases;
+package org.eclipse.equinox.p2.engine.phases;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.internal.prov.engine.EngineActivator;
-import org.eclipse.equinox.internal.prov.engine.TouchpointManager;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
+import org.eclipse.equinox.internal.p2.engine.TouchpointManager;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.osgi.util.NLS;
public class Install extends IUPhase {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Messages.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Messages.java
index f35b810e0..b0f7854ca 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Messages.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine.phases;
+package org.eclipse.equinox.p2.engine.phases;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.prov.engine.phases.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.engine.phases.messages"; //$NON-NLS-1$
static {
// initialize resource bundles
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Uninstall.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Uninstall.java
index 0732680e1..06d41d566 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/Uninstall.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/Uninstall.java
@@ -8,17 +8,17 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.engine.phases;
+package org.eclipse.equinox.p2.engine.phases;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.internal.prov.engine.EngineActivator;
-import org.eclipse.equinox.internal.prov.engine.TouchpointManager;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
+import org.eclipse.equinox.internal.p2.engine.TouchpointManager;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.osgi.util.NLS;
public class Uninstall extends IUPhase {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/messages.properties b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/messages.properties
index 9e644e32f..9e644e32f 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/engine/phases/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/phases/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/IInstallRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/IInstallRegistry.java
index 3cbc8b8f5..bf5b6b4de 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/IInstallRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/IInstallRegistry.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.installregistry;
+package org.eclipse.equinox.p2.installregistry;
import java.util.Collection;
-import org.eclipse.equinox.prov.engine.Profile;
+import org.eclipse.equinox.p2.engine.Profile;
public interface IInstallRegistry {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/IProfileInstallRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/IProfileInstallRegistry.java
index 54f7b01fa..f740cc842 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/IProfileInstallRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/IProfileInstallRegistry.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.installregistry;
+package org.eclipse.equinox.p2.installregistry;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
public interface IProfileInstallRegistry {
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/InstallRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/InstallRegistry.java
index 2ca377a86..d62f5e670 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/prov/installregistry/InstallRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/installregistry/InstallRegistry.java
@@ -8,19 +8,19 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.installregistry;
+package org.eclipse.equinox.p2.installregistry;
import com.thoughtworks.xstream.XStream;
import java.io.*;
import java.net.URL;
import java.util.*;
-import org.eclipse.equinox.internal.prov.engine.EngineActivator;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.eventbus.SynchronousProvisioningListener;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.osgi.service.datalocation.Location;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.exemplarysetup/.project b/bundles/org.eclipse.equinox.p2.exemplarysetup/.project
index 3fdc4d960..04de2a161 100644
--- a/bundles/org.eclipse.equinox.p2.exemplarysetup/.project
+++ b/bundles/org.eclipse.equinox.p2.exemplarysetup/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.examplarysetup</name>
+ <name>org.eclipse.equinox.p2.exemplarysetup</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF
index af30e1381..5906af5a7 100644
--- a/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.exemplarysetup/META-INF/MANIFEST.MF
@@ -1,20 +1,20 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Examplary Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.prov.examplarysetup
+Bundle-Name: Exemplary Plug-in
+Bundle-SymbolicName: org.eclipse.equinox.p2.exemplarysetup
Bundle-Version: 0.1.0.qualifier
-Import-Package: org.eclipse.equinox.internal.prov.artifact.repository,
- org.eclipse.equinox.internal.prov.metadata.repository,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.eventbus,
- 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,
+Import-Package: org.eclipse.equinox.internal.p2.artifact.repository,
+ org.eclipse.equinox.internal.p2.metadata.repository,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.eventbus,
+ 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.osgi.framework;version="1.3.0"
Eclipse-LazyStart: true
-Bundle-Activator: org.eclipse.equinox.internal.prov.examplarysetup.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.exemplarysetup.Activator
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Require-Bundle: org.eclipse.equinox.common
diff --git a/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/prov/examplarysetup/Activator.java b/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java
index 13d22889e..e346d2268 100644
--- a/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/prov/examplarysetup/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.exemplarysetup/src/org/eclipse/equinox/internal/p2/exemplarysetup/Activator.java
@@ -8,23 +8,23 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.examplarysetup;
-
-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.IArtifactRepositoryManager;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.NewSimpleDirector;
-import org.eclipse.equinox.prov.engine.IProfileRegistry;
-import org.eclipse.equinox.prov.engine.SimpleProfileRegistry;
-import org.eclipse.equinox.prov.installregistry.IInstallRegistry;
-import org.eclipse.equinox.prov.installregistry.InstallRegistry;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
+package org.eclipse.equinox.internal.p2.exemplarysetup;
+
+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.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.NewSimpleDirector;
+import org.eclipse.equinox.p2.engine.IProfileRegistry;
+import org.eclipse.equinox.p2.engine.SimpleProfileRegistry;
+import org.eclipse.equinox.p2.installregistry.IInstallRegistry;
+import org.eclipse.equinox.p2.installregistry.InstallRegistry;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
import org.osgi.framework.*;
public class Activator implements BundleActivator {
- public static final String ID = "org.eclipse.equinox.prov.core";
+ public static final String ID = "org.eclipse.equinox.p2.core";
public static BundleContext context;
private ProvisioningEventBus bus;
diff --git a/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF
index f1c750af0..07b9da4eb 100644
--- a/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.installer/META-INF/MANIFEST.MF
@@ -9,12 +9,12 @@ Require-Bundle: org.eclipse.osgi,
org.eclipse.jface,
org.eclipse.equinox.app,
org.eclipse.equinox.common,
- org.eclipse.equinox.prov.director,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.core,
- org.eclipse.equinox.prov.artifact.repository
+ org.eclipse.equinox.p2.director,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.artifact.repository
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Export-Package: org.eclipse.equinox.internal.p2.installer;x-internal:=true,
diff --git a/bundles/org.eclipse.equinox.p2.installer/config.ini b/bundles/org.eclipse.equinox.p2.installer/config.ini
index 3793ac24c..340ed4716 100644
--- a/bundles/org.eclipse.equinox.p2.installer/config.ini
+++ b/bundles/org.eclipse.equinox.p2.installer/config.ini
@@ -54,16 +54,16 @@ osgi.bundles=\
org.eclipse.equinox.frameworkadmin.equinox@start,\
org.eclipse.equinox.p2.installer,\
org.eclipse.equinox.preferences,\
- org.eclipse.equinox.prov.artifact.repository,\
- org.eclipse.equinox.prov.core,\
- org.eclipse.equinox.prov.director,\
- org.eclipse.equinox.prov.download,\
- org.eclipse.equinox.prov.engine,\
- org.eclipse.equinox.prov.examplarysetup@start,\
- org.eclipse.equinox.prov.metadata,\
- org.eclipse.equinox.prov.metadata.repository,\
- org.eclipse.equinox.prov.touchpoint.eclipse,\
- org.eclipse.equinox.prov.touchpoint.natives,\
+ org.eclipse.equinox.p2.artifact.repository,\
+ org.eclipse.equinox.p2.core,\
+ org.eclipse.equinox.p2.director,\
+ org.eclipse.equinox.p2.download,\
+ org.eclipse.equinox.p2.engine,\
+ org.eclipse.equinox.p2.examplarysetup@start,\
+ org.eclipse.equinox.p2.metadata,\
+ org.eclipse.equinox.p2.metadata.repository,\
+ org.eclipse.equinox.p2.touchpoint.eclipse,\
+ org.eclipse.equinox.p2.touchpoint.natives,\
org.eclipse.equinox.registry,\
org.eclipse.equinox.simpleconfigurator,\
org.eclipse.equinox.simpleconfigurator.manipulator@start,\
@@ -78,7 +78,7 @@ org.eclipse.update.reconcile=false
# The product to run. A given Eclipse configuration may contain many products.
# The product identified will supply the branding (window icons, title bar text) etc
# as well as define the default application to run.
-eclipse.product=com.ibm.team.prov.client.installer.product
+eclipse.product=com.ibm.team.p2.client.installer.product
# The application to run. The value specified here is the id of the application extension
# the runtime will find, instantiate and execute once the system is up. Note that typically
diff --git a/bundles/org.eclipse.equinox.p2.installer/installer.product b/bundles/org.eclipse.equinox.p2.installer/installer.product
index 4df0dba3b..9565424aa 100644
--- a/bundles/org.eclipse.equinox.p2.installer/installer.product
+++ b/bundles/org.eclipse.equinox.p2.installer/installer.product
@@ -13,8 +13,8 @@
<configIni use="custom" path="/org.eclipse.equinox.p2.installer/config.ini"/>
<launcherArgs>
- <vmArgs>-Dorg.eclipse.equinox.p2.installDescription=file:/c:/tmp/equinox.prov/install.properties
--Declipse.prov.data.area=file:/c:/tmp/equinox.prov/p2</vmArgs>
+ <vmArgs>-Dorg.eclipse.equinox.p2.installDescription=file:/c:/tmp/equinox.p2/install.properties
+-Declipse.p2.data.area=file:/c:/tmp/equinox.p2/p2</vmArgs>
</launcherArgs>
<windowImages/>
@@ -50,16 +50,16 @@
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.p2.installer"/>
<plugin id="org.eclipse.equinox.preferences"/>
- <plugin id="org.eclipse.equinox.prov.artifact.repository"/>
- <plugin id="org.eclipse.equinox.prov.core"/>
- <plugin id="org.eclipse.equinox.prov.director"/>
- <plugin id="org.eclipse.equinox.prov.download"/>
- <plugin id="org.eclipse.equinox.prov.engine"/>
- <plugin id="org.eclipse.equinox.prov.examplarysetup"/>
- <plugin id="org.eclipse.equinox.prov.metadata"/>
- <plugin id="org.eclipse.equinox.prov.metadata.repository"/>
- <plugin id="org.eclipse.equinox.prov.touchpoint.eclipse"/>
- <plugin id="org.eclipse.equinox.prov.touchpoint.natives"/>
+ <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
+ <plugin id="org.eclipse.equinox.p2.core"/>
+ <plugin id="org.eclipse.equinox.p2.director"/>
+ <plugin id="org.eclipse.equinox.p2.download"/>
+ <plugin id="org.eclipse.equinox.p2.engine"/>
+ <plugin id="org.eclipse.equinox.p2.examplarysetup"/>
+ <plugin id="org.eclipse.equinox.p2.metadata"/>
+ <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+ <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
+ <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
index f41df923c..396e68933 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/HeadlessInstallAdvisor.java
@@ -14,9 +14,9 @@ import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
import org.eclipse.equinox.p2.installer.IInstallAdvisor;
import org.eclipse.equinox.p2.installer.IInstallDescription;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescription.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescription.java
index a27db361b..f7fbb2b41 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescription.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescription.java
@@ -13,7 +13,7 @@ package org.eclipse.equinox.internal.p2.installer;
import java.net.URL;
import org.eclipse.core.runtime.IPath;
import org.eclipse.equinox.p2.installer.IInstallDescription;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
/**
* An editable implementation of {@link IInstallDescription}.
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
index 1dcb0980f..dacf8777b 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
@@ -18,7 +18,7 @@ import java.util.Properties;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.equinox.p2.installer.IInstallDescription;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
import org.osgi.framework.Version;
/**
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallDescription.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallDescription.java
index 5644403a7..b60147a78 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallDescription.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/IInstallDescription.java
@@ -12,7 +12,7 @@ package org.eclipse.equinox.p2.installer;
import java.net.URL;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
/**
* An install information captures all the data needed to perform a product install.
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java
index 0ddffd14e..66d3fcfee 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallApplication.java
@@ -26,7 +26,7 @@ import org.eclipse.equinox.internal.p2.installer.GraphicalInstallAdvisor;
import org.eclipse.equinox.internal.p2.installer.InstallDescription;
import org.eclipse.equinox.internal.p2.installer.InstallDescriptionParser;
import org.eclipse.equinox.internal.p2.installer.InstallerActivator;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
/**
* This is a simple installer application built using P2. The application must be given
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java
index 652e1446a..a8e83d661 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/p2/installer/InstallUpdateProductOperation.java
@@ -27,14 +27,14 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.equinox.internal.p2.installer.InstallerActivator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepositoryManager;
-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.p2.artifact.repository.IArtifactRepositoryManager;
+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.jface.operation.IRunnableWithProgress;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.eclipse.osgi.service.resolver.VersionRange;
diff --git a/bundles/org.eclipse.equinox.p2.installer/testInstall.properties b/bundles/org.eclipse.equinox.p2.installer/testInstall.properties
index faa0c3d5f..896867246 100644
--- a/bundles/org.eclipse.equinox.p2.installer/testInstall.properties
+++ b/bundles/org.eclipse.equinox.p2.installer/testInstall.properties
@@ -9,8 +9,8 @@
# IBM Corporation - initial API and implementation
###############################################################################
#Sample InstallDescription property file
-metadataRepository=file:/c:/tmp/equinox.prov/servers/metadata/
-artifactRepository=file:/c:/tmp/equinox.prov/servers/artifacts/
+metadataRepository=file:/c:/tmp/equinox.p2/servers/metadata/
+artifactRepository=file:/c:/tmp/equinox.p2/servers/artifacts/
flavor=tooling
profileName=TestInstall
rootId=sdk
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/.project b/bundles/org.eclipse.equinox.p2.metadata.generator/.project
index 6fc39c431..e6dfdd066 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/.project
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.metadata.generator</name>
+ <name>org.eclipse.equinox.p2.metadata.generator</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF
index 448c7c16f..969db3dff 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/META-INF/MANIFEST.MF
@@ -1,26 +1,26 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Generator Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.metadata.generator;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.metadata.generator;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Require-Bundle: org.eclipse.equinox.prov.core,
+Require-Bundle: org.eclipse.equinox.p2.core,
org.eclipse.osgi,
org.eclipse.equinox.common
Import-Package: com.thoughtworks.xstream,
javax.xml.parsers,
org.eclipse.equinox.app;version="1.0.0",
org.eclipse.equinox.frameworkadmin,
- org.eclipse.equinox.internal.prov.artifact.repository,
- org.eclipse.equinox.internal.prov.metadata,
- org.eclipse.equinox.internal.prov.metadata.repository,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
+ org.eclipse.equinox.internal.p2.artifact.repository,
+ org.eclipse.equinox.internal.p2.metadata,
+ org.eclipse.equinox.internal.p2.metadata.repository,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
org.xml.sax
-Bundle-Activator: org.eclipse.equinox.internal.prov.metadata.generator.Activator
-Export-Package: org.eclipse.equinox.internal.prov.metadata.generator,
- org.eclipse.equinox.internal.prov.metadata.generator.features;x-internal:=true,
- org.eclipse.equinox.prov.metadata.generator
+Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.generator.Activator
+Export-Package: org.eclipse.equinox.internal.p2.metadata.generator,
+ org.eclipse.equinox.internal.p2.metadata.generator.features;x-internal:=true,
+ org.eclipse.equinox.p2.metadata.generator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator CDT.launch b/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator CDT.launch
index c44aa41ce..903a0f163 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator CDT.launch
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator CDT.launch
@@ -10,12 +10,12 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console&#13;&#10;-consolelog &#13;&#10;-application org.eclipse.equinox.prov.metadata.generator.EclipseGenerator&#13;&#10;-metadataRepository file:c:/temp/equinox.prov/servers/CDTmetadataRepository/ &#13;&#10;-artifactRepository file:c:/temp/equinox.prov/servers/CDTartifactRepository/ &#13;&#10;-source c:/eclipse/CDT4.0 &#13;&#10;-root cdt&#13;&#10;-flavor tooling&#13;&#10;-publishArtifacts"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console&#13;&#10;-consolelog &#13;&#10;-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator&#13;&#10;-metadataRepository file:c:/temp/equinox.p2/servers/CDTmetadataRepository/ &#13;&#10;-artifactRepository file:c:/temp/equinox.p2/servers/CDTartifactRepository/ &#13;&#10;-source c:/eclipse/CDT4.0 &#13;&#10;-root cdt&#13;&#10;-flavor tooling&#13;&#10;-publishArtifacts"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=c:/temp/equinox.prov/agent/ &#13;&#10;-Declipse.prov.metadataRepository=file:c:/temp/equinox.prov/servers/CDTmetadataRepository/ &#13;&#10;-Declipse.prov.artifactRepository=file:c:/temp/equinox.prov/servers/artifactRepository/&#13;&#10;-Declipse.ignoreApp=false&#13;&#10;-Declipse.application.registerDescriptors=true &#13;&#10;-Declipse.application=org.eclipse.equinox.prov.metadata.generator.EclipseGenerator&#13;&#10;-Declipse.prov.metadataGenerator.eclipseBase=c:/eclipse/CDT4.0/&#13;&#10;-Declipse.prov.rootIUId=cdt &#13;&#10;-Declipse.prov.configurationFlavor=tooling&#13;&#10;-Declipse.prov.appendToRepo=true &#13;&#10;-Declipse.prov.generateArtifacts=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=c:/temp/equinox.p2/agent/ &#13;&#10;-Declipse.p2.metadataRepository=file:c:/temp/equinox.p2/servers/CDTmetadataRepository/ &#13;&#10;-Declipse.p2.artifactRepository=file:c:/temp/equinox.p2/servers/artifactRepository/&#13;&#10;-Declipse.ignoreApp=false&#13;&#10;-Declipse.application.registerDescriptors=true &#13;&#10;-Declipse.application=org.eclipse.equinox.p2.metadata.generator.EclipseGenerator&#13;&#10;-Declipse.p2.metadataGenerator.eclipseBase=c:/eclipse/CDT4.0/&#13;&#10;-Declipse.p2.rootIUId=cdt &#13;&#10;-Declipse.p2.configurationFlavor=tooling&#13;&#10;-Declipse.p2.appendToRepo=true &#13;&#10;-Declipse.p2.generateArtifacts=true"/>
<stringAttribute key="target_bundles" value="org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.launcher@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="true"/>
<stringAttribute key="vminstall" value="jdk"/>
-<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.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.prov.artifact.repository@default:default,org.eclipse.equinox.prov.core@default:default,org.eclipse.equinox.prov.download@default:default,org.eclipse.equinox.prov.engine@default:default,org.eclipse.equinox.prov.metadata@default:default,org.eclipse.equinox.prov.metadata.generator@default:default,org.eclipse.equinox.prov.metadata.repository@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.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.download@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator SDK.launch b/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator SDK.launch
index 23d6ab8c9..0a6ef35fc 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator SDK.launch
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/Metadata Generator SDK.launch
@@ -11,12 +11,12 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console &#13;&#10;-consolelog &#13;&#10;-application org.eclipse.equinox.prov.metadata.generator.EclipseGenerator&#13;&#10;-metadataRepository file:d:/tmp/equinox.prov/servers/metadataRepository/ &#13;&#10;-artifactRepository file:d:/tmp/equinox.prov/servers/artifactRepository/ &#13;&#10;-source d:/3.3/eclipse&#13;&#10;-root sdk&#13;&#10;-rootVersion 3.3.0&#13;&#10;-flavor tooling&#13;&#10;-publishArtifacts&#13;&#10;-append"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console &#13;&#10;-consolelog &#13;&#10;-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator&#13;&#10;-metadataRepository file:d:/tmp/equinox.p2/servers/metadataRepository/ &#13;&#10;-artifactRepository file:d:/tmp/equinox.p2/servers/artifactRepository/ &#13;&#10;-source d:/3.3/eclipse&#13;&#10;-root sdk&#13;&#10;-rootVersion 3.3.0&#13;&#10;-flavor tooling&#13;&#10;-publishArtifacts&#13;&#10;-append"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="target_bundles" value="org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.runtime.compatibility.registry@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.eclipse.update.configurator@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="vminstall" value="jre1.6.0"/>
-<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.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.prov.artifact.repository@default:default,org.eclipse.equinox.prov.core@default:default,org.eclipse.equinox.prov.download@default:default,org.eclipse.equinox.prov.engine@default:default,org.eclipse.equinox.prov.metadata@default:default,org.eclipse.equinox.prov.metadata.generator@default:default,org.eclipse.equinox.prov.metadata.repository@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.equinox.frameworkadmin@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:true,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.download@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/generator.product b/bundles/org.eclipse.equinox.p2.metadata.generator/generator.product
index 714a2b139..1e313cd49 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/generator.product
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/generator.product
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.1"?>
-<product name="Equinox Provisioning Metadata Generator" id="org.eclipse.equinox.prov.metadata.generator.product" application="org.eclipse.equinox.prov.metadata.generator.EclipseGenerator" useFeatures="true">
+<product name="Equinox Provisioning Metadata Generator" id="org.eclipse.equinox.p2.metadata.generator.product" application="org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" useFeatures="true">
- <configIni use="custom" path="/org.eclipse.equinox.prov.metadata.generator/config.ini"/>
+ <configIni use="custom" path="/org.eclipse.equinox.p2.metadata.generator/config.ini"/>
<launcherArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
@@ -23,7 +23,7 @@
</plugins>
<features>
- <feature id="org.eclipse.equinox.prov.generator.feature" version="0.0.0"/>
+ <feature id="org.eclipse.equinox.p2.generator.feature" version="0.0.0"/>
<feature id="org.eclipse.rcp" version="0.0.0"/>
</features>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml b/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml
index f8ff83d03..1f7928fc2 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/plugin.xml
@@ -7,7 +7,7 @@
thread="main"
visible="true">
<run
- class="org.eclipse.equinox.internal.prov.metadata.generator.EclipseGeneratorApplication">
+ class="org.eclipse.equinox.internal.p2.metadata.generator.EclipseGeneratorApplication">
</run>
</application>
</extension>
@@ -15,7 +15,7 @@
id="product"
point="org.eclipse.core.runtime.products">
<product
- application="org.eclipse.equinox.prov.metadata.generator.EclipseGenerator"
+ application="org.eclipse.equinox.p2.metadata.generator.EclipseGenerator"
name="Equinox Provisioning Metadata Generator">
</product>
</extension>
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;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/.project b/bundles/org.eclipse.equinox.p2.metadata.repository/.project
index 4920152f0..397efa927 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/.project
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.metadata.repository</name>
+ <name>org.eclipse.equinox.p2.metadata.repository</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
index 2bf58ea42..8589b512d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/META-INF/MANIFEST.MF
@@ -1,25 +1,25 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Metadata Repository Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.metadata.repository;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.metadata.repository;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Export-Package: org.eclipse.equinox.internal.prov.metadata.repository;x-friends:="org.eclipse.equinox.prov.metadata.generator",
- org.eclipse.equinox.prov.metadata.repository
+Export-Package: org.eclipse.equinox.internal.p2.metadata.repository;x-friends:="org.eclipse.equinox.p2.metadata.generator",
+ org.eclipse.equinox.p2.metadata.repository
Import-Package: com.thoughtworks.xstream,
org.eclipse.core.runtime.preferences,
- org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.query,
+ org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.query,
org.eclipse.osgi.service.datalocation;version="1.0.0",
org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.prefs;version="1.1.0"
-Bundle-Activator: org.eclipse.equinox.internal.prov.metadata.repository.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.repository.Activator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml b/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml
index 1f0220749..ecfab6731 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/plugin.xml
@@ -2,8 +2,8 @@
<?eclipse version="3.2"?>
<plugin>
<extension-point id="metadataRepositories" name="Metadata Repositories" schema="schema/metadataRepositories.exsd"/>
- <extension id="simpleRepository" point="org.eclipse.equinox.prov.metadata.repository.metadataRepositories">
+ <extension id="simpleRepository" point="org.eclipse.equinox.p2.metadata.repository.metadataRepositories">
<filter suffix="content.xml"/>
- <factory class="org.eclipse.equinox.internal.prov.metadata.repository.SimpleMetadataRepositoryFactory"/>
+ <factory class="org.eclipse.equinox.internal.p2.metadata.repository.SimpleMetadataRepositoryFactory"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd b/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd
index e010ff809..0612390b4 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.equinox.prov.metadata.repository">
+<schema targetNamespace="org.eclipse.equinox.p2.metadata.repository">
<annotation>
<appInfo>
- <meta.schema plugin="org.eclipse.equinox.prov.metadata.repository" id="metadataRepositories" name="Metadata Repositories"/>
+ <meta.schema plugin="org.eclipse.equinox.p2.metadata.repository" id="metadataRepositories" name="Metadata Repositories"/>
</appInfo>
<documentation>
This extension point is used to provide artifact repository implementations
@@ -49,10 +49,10 @@
<annotation>
<documentation>
the fully-qualified name of a class which implements
-&lt;samp&gt;org.eclipse.equinox.prov.artifact.repository.IArtifactRepository&lt;/samp&gt;.
+&lt;samp&gt;org.eclipse.equinox.p2.artifact.repository.IArtifactRepository&lt;/samp&gt;.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.equinox.prov.artifact.repository.IArtifactRepository"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.equinox.p2.artifact.repository.IArtifactRepository"/>
</appInfo>
</annotation>
</attribute>
@@ -76,7 +76,7 @@
<meta.section type="since"/>
</appInfo>
<documentation>
- org.eclipse.equinox.prov.artifact.repository 0.1.0
+ org.eclipse.equinox.p2.artifact.repository 0.1.0
</documentation>
</annotation>
@@ -95,7 +95,7 @@
</appInfo>
<documentation>
The value of the class attribute must represent an
-implementor of &lt;tt&gt;org.eclipse.equinox.prov.artifact.repository.IArtifactRepository&lt;/tt&gt;
+implementor of &lt;tt&gt;org.eclipse.equinox.p2.artifact.repository.IArtifactRepository&lt;/tt&gt;
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/AbstractMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/AbstractMetadataRepository.java
index 11600a73c..e57b9c66e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/AbstractMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/AbstractMetadataRepository.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import java.util.HashSet;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
public abstract class AbstractMetadataRepository implements IMetadataRepository, IRepositoryInfo {
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/Activator.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java
index 7aebe0eb0..bdaba99a2 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Activator.java
@@ -8,16 +8,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class Activator implements BundleActivator {
- public static final String ID = "org.eclipse.equinox.prov.metadata.repository";
+ public static final String ID = "org.eclipse.equinox.p2.metadata.repository";
public static final String REPO_PROVIDER_XPT = ID + '.' + "metadataRepositories";
- public static final String PI_METADATA_REPOSITORY = "org.eclipse.equinox.prov.metadata.repository"; //$NON-NLS-1$
+ public static final String PI_METADATA_REPOSITORY = "org.eclipse.equinox.p2.metadata.repository"; //$NON-NLS-1$
private static BundleContext context;
public static BundleContext getContext() {
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/LocalMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
index 68b8729cd..f895de59a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/LocalMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/LocalMetadataRepository.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
* Prashant Deva - Bug 194674 [prov] Provide write access to metadata repository
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import java.io.*;
import java.net.URL;
@@ -17,13 +17,13 @@ import java.util.Arrays;
import java.util.Iterator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
-import org.eclipse.equinox.prov.core.repository.IWritableRepositoryInfo;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.metadata.repository.IWritableMetadataRepository;
-import org.eclipse.equinox.prov.query.CompoundIterator;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.repository.IWritableRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.repository.IWritableMetadataRepository;
+import org.eclipse.equinox.p2.query.CompoundIterator;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/Messages.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Messages.java
index 4a95ec0ce..7d2647a9b 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/Messages.java
@@ -6,12 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.prov.metadata.repository.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.metadata.repository.messages"; //$NON-NLS-1$
static {
// initialize resource bundles
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataCache.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataCache.java
index f1916b8c8..11c762ac5 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataCache.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataCache.java
@@ -8,16 +8,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import java.io.*;
import java.net.URL;
import java.util.EventObject;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningListener;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.IResolvedInstallableUnit;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningListener;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.IResolvedInstallableUnit;
import org.osgi.framework.ServiceReference;
public class MetadataCache extends URLMetadataRepository {
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataRepositoryIO.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java
index b76f1f401..1b8f47daf 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataRepositoryIO.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryIO.java
@@ -9,12 +9,12 @@
* IBM Corporation - initial API and implementation
* Prashant Deva - Bug 194674 [prov] Provide write access to metadata repository
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import com.thoughtworks.xstream.XStream;
import java.io.*;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
/**
* This class reads and writes provisioning metadata.
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
index 8c9651e5f..01ede6a10 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/MetadataRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/MetadataRepositoryManager.java
@@ -6,17 +6,17 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.repository.*;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.repository.*;
import org.eclipse.osgi.util.NLS;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -224,7 +224,7 @@ public class MetadataRepositoryManager implements IMetadataRepositoryManager {
log("Error while restoring repository " + path, e);
}
try {
- String locationString = Activator.getContext().getProperty("eclipse.prov.metadataRepository");
+ String locationString = Activator.getContext().getProperty("eclipse.p2.metadataRepository");
if (locationString != null) {
StringTokenizer tokenizer = new StringTokenizer(locationString, ",");
while (tokenizer.hasMoreTokens()) {
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/SimpleMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java
index 99a009631..57419613a 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/SimpleMetadataRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/SimpleMetadataRepositoryFactory.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import java.io.*;
import java.net.URL;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryFactory;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryFactory;
public class SimpleMetadataRepositoryFactory implements IMetadataRepositoryFactory {
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/URLMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java
index 61f5bc9a8..b605d1908 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/URLMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/URLMetadataRepository.java
@@ -9,17 +9,17 @@
* IBM Corporation - initial API and implementation
* Prashant Deva - Bug 194674 [prov] Provide write access to metadata repository
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata.repository;
+package org.eclipse.equinox.internal.p2.metadata.repository;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Iterator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.query.CompoundIterator;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.query.CompoundIterator;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/messages.properties b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/messages.properties
index fc369d7ab..fc369d7ab 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/prov/metadata/repository/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepository.java
index eb55c22fa..920d56fd2 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepository.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata.repository;
+package org.eclipse.equinox.p2.metadata.repository;
import java.net.URL;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.query.IQueryable;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.query.IQueryable;
/**
* A metadata repository stores information about a set of installable units
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepositoryFactory.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryFactory.java
index e5533326e..aeef83e62 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepositoryFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata.repository;
+package org.eclipse.equinox.p2.metadata.repository;
import java.net.URL;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepositoryManager.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryManager.java
index 98173d6f6..3f9873d6b 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IMetadataRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IMetadataRepositoryManager.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata.repository;
+package org.eclipse.equinox.p2.metadata.repository;
import java.net.URL;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IWritableMetadataRepository.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IWritableMetadataRepository.java
index a22a6e804..00ae845f7 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/prov/metadata/repository/IWritableMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/p2/metadata/repository/IWritableMetadataRepository.java
@@ -9,10 +9,10 @@
* Prashant Deva - Bug 194674 [prov] Provide write access to metadata repository
* IBM Corporation - ongoing development
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata.repository;
+package org.eclipse.equinox.p2.metadata.repository;
-import org.eclipse.equinox.prov.core.repository.IWritableRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.core.repository.IWritableRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
public interface IWritableMetadataRepository extends IMetadataRepository, IWritableRepositoryInfo {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/.project b/bundles/org.eclipse.equinox.p2.metadata/.project
index bd63dce6d..86f07f8b4 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/.project
+++ b/bundles/org.eclipse.equinox.p2.metadata/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.metadata</name>
+ <name>org.eclipse.equinox.p2.metadata</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
index be3a5230d..9305ac49c 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Metadata Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.metadata
+Bundle-SymbolicName: org.eclipse.equinox.p2.metadata
Bundle-Version: 0.1.0.qualifier
-Export-Package: org.eclipse.equinox.internal.prov.metadata;x-friends:="org.eclipse.equinox.prov.metadata.generator",
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.query,
- org.eclipse.equinox.prov.resolution
+Export-Package: org.eclipse.equinox.internal.p2.metadata;x-friends:="org.eclipse.equinox.p2.metadata.generator",
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.query,
+ org.eclipse.equinox.p2.resolution
Import-Package: org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0"
-Bundle-Activator: org.eclipse.equinox.internal.prov.metadata.MetadataActivator
+Bundle-Activator: org.eclipse.equinox.internal.p2.metadata.MetadataActivator
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Require-Bundle: org.eclipse.equinox.common,
com.thoughtworks.xstream,
- org.eclipse.equinox.prov.core
+ org.eclipse.equinox.p2.core
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/ArtifactKey.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java
index 71546915b..fe7886561 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/ArtifactKey.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ArtifactKey.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata;
+package org.eclipse.equinox.internal.p2.metadata;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.osgi.framework.Version;
/**
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/InternalInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InternalInstallableUnit.java
index 6ab875e14..84acdb95e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/InternalInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InternalInstallableUnit.java
@@ -6,10 +6,10 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata;
+package org.eclipse.equinox.internal.p2.metadata;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IResolvedInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IResolvedInstallableUnit;
public interface InternalInstallableUnit extends IInstallableUnit {
public IResolvedInstallableUnit getResolved();
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/Messages.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Messages.java
index 00c7aef16..8cfcdbc6d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/Messages.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata;
+package org.eclipse.equinox.internal.p2.metadata;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.prov.metadata.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.metadata.messages"; //$NON-NLS-1$
static {
// load message values from bundle file and assign to fields below
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/MetadataActivator.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/MetadataActivator.java
index 9e717f490..714dd0890 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/MetadataActivator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/MetadataActivator.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.metadata;
+package org.eclipse.equinox.internal.p2.metadata;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class MetadataActivator implements BundleActivator {
- public static final String PI_METADATA = "org.eclipse.equinox.prov.metadata"; //$NON-NLS-1$
+ public static final String PI_METADATA = "org.eclipse.equinox.p2.metadata"; //$NON-NLS-1$
public static BundleContext context;
public static BundleContext getContext() {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/messages.properties b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/messages.properties
index 138d56215..138d56215 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/prov/metadata/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ConstrainableElement.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ConstrainableElement.java
index a45c91031..15c1e542e 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ConstrainableElement.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ConstrainableElement.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
public class ConstrainableElement {
}
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IArtifactKey.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IArtifactKey.java
index 3f45b9f9c..cd0b248ce 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IArtifactKey.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IArtifactKey.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
index 399747f34..eeb5e5f2f 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.osgi.framework.Version;
@@ -17,20 +17,20 @@ public interface IInstallableUnit extends Comparable {
* For example, an InstallableUnit may specify that it provides the "group" kind
* capability to express that it represents a group of instalable units.
*/
- public static final String IU_KIND_NAMESPACE = "org.eclipse.equinox.prov.type"; //$NON-NLS-1$
+ public static final String IU_KIND_NAMESPACE = "org.eclipse.equinox.p2.type"; //$NON-NLS-1$
/**
* A capability namespace representing a particular InstallableUnit by name.
* Each InstallableUnit automatically provides an instance of this namespace representing
* itself, and other InstallableUnits can require such a capability to state that they
* require a particular InstallableUnit to be present.
*/
- public static final String IU_NAMESPACE = "org.eclipse.equinox.prov.iunamespace"; //$NON-NLS-1$
+ public static final String IU_NAMESPACE = "org.eclipse.equinox.p2.iunamespace"; //$NON-NLS-1$
/**
* A capability namespace representing a particular profile flavor.
*/
public static final String FLAVOR_NAMESPACE = "flavor"; //$NON-NLS-1$
//These two constants needs to be moved somewhere more appropriate...
- public static final String CAPABILITY_ECLIPSE_TYPES = "org.eclipse.equinox.prov.eclipsetouchpoint.types"; //$NON-NLS-1$
+ public static final String CAPABILITY_ECLIPSE_TYPES = "org.eclipse.equinox.p2.eclipsetouchpoint.types"; //$NON-NLS-1$
public static final String CAPABILITY_ECLIPSE_BUNDLE = "bundle"; //$NON-NLS-1$
public abstract TouchpointType getTouchpointType();
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnitConstants.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitConstants.java
index 36c73a0b8..56cc9c871 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnitConstants.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitConstants.java
@@ -7,7 +7,7 @@
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
/**
* Definitions for constants associated with InstallableUnits.
@@ -18,16 +18,16 @@ public interface IInstallableUnitConstants {
* Keys for common properties that optionally
* be defined in InstallableUnits.
*/
- public String NAME = "equinox.prov.name"; //$NON-NLS-1$
- public String DESCRIPTION = "equinox.prov.description"; //$NON-NLS-1$
- public String DOC_URL = "equinox.prov.doc.url"; //$NON-NLS-1$
- public String PROVIDER = "equinox.prov.provider"; //$NON-NLS-1$
- public String CONTACT = "equinox.prov.contact"; //$NON-NLS-1$
- public String LICENSE = "equinox.prov.license"; //$NON-NLS-1$
- public String COPYRIGHT = "equinox.prov.copyright"; //$NON-NLS-1$
- public String UPDATE_SITE = "equinox.prov.update.site"; //$NON-NLS-1$
- public String UPDATE_FROM = "equinox.prov.update.from"; //$NON-NLS-1$
- public String UPDATE_RANGE = "equinox.prov.update.range"; //$NON-NLS-1$
+ public String NAME = "equinox.p2.name"; //$NON-NLS-1$
+ public String DESCRIPTION = "equinox.p2.description"; //$NON-NLS-1$
+ public String DOC_URL = "equinox.p2.doc.url"; //$NON-NLS-1$
+ public String PROVIDER = "equinox.p2.provider"; //$NON-NLS-1$
+ public String CONTACT = "equinox.p2.contact"; //$NON-NLS-1$
+ public String LICENSE = "equinox.p2.license"; //$NON-NLS-1$
+ public String COPYRIGHT = "equinox.p2.copyright"; //$NON-NLS-1$
+ public String UPDATE_SITE = "equinox.p2.update.site"; //$NON-NLS-1$
+ public String UPDATE_FROM = "equinox.p2.update.from"; //$NON-NLS-1$
+ public String UPDATE_RANGE = "equinox.p2.update.range"; //$NON-NLS-1$
//TODO This is not the ideal location for these constants
public String ENTRYPOINT_IU_KEY = "entryPoint"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitFragment.java
index 5f11ed83b..0ec3aa2ff 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IInstallableUnitFragment.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnitFragment.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.eclipse.osgi.service.resolver.VersionRange;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IMetadataVisitor.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IMetadataVisitor.java
index 737afd742..f7dc9119d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IMetadataVisitor.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IMetadataVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
public interface IMetadataVisitor {
public void visitInstallableUnit(IInstallableUnit iu);
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IResolvedInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IResolvedInstallableUnit.java
index e73ad5565..0e7eba229 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IResolvedInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IResolvedInstallableUnit.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
public interface IResolvedInstallableUnit extends IInstallableUnit {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IResolvedInstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IResolvedInstallableUnitFragment.java
index eb1b34e6a..4ea5c4b55 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/IResolvedInstallableUnitFragment.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IResolvedInstallableUnitFragment.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
public interface IResolvedInstallableUnitFragment extends IInstallableUnitFragment, IResolvedInstallableUnit {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Inclusion.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Inclusion.java
index 7ba050b2d..14c539ffc 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Inclusion.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Inclusion.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
public abstract class Inclusion {
String selectorId;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/InstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/InstallableUnit.java
index 000911032..f63ee56f5 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/InstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/InstallableUnit.java
@@ -6,11 +6,11 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
-import org.eclipse.equinox.internal.prov.metadata.InternalInstallableUnit;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.internal.p2.metadata.InternalInstallableUnit;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
import org.osgi.framework.Version;
public class InstallableUnit implements IInstallableUnitConstants, IInstallableUnit, InternalInstallableUnit {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/InstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/InstallableUnitFragment.java
index 74180a9c8..49383ab34 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/InstallableUnitFragment.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/InstallableUnitFragment.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ProvidedCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ProvidedCapability.java
index ffe074ded..759f9c44c 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ProvidedCapability.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ProvidedCapability.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Recommendation.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Recommendation.java
index e3ff45ca4..cecea697f 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Recommendation.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Recommendation.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/RecommendationDescriptor.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RecommendationDescriptor.java
index 4a6722074..806127f01 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/RecommendationDescriptor.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RecommendationDescriptor.java
@@ -6,11 +6,11 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.metadata.MetadataActivator;
+import org.eclipse.equinox.internal.p2.metadata.MetadataActivator;
import org.eclipse.osgi.service.resolver.VersionRange;
public class RecommendationDescriptor {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/RequiredCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RequiredCapability.java
index 3ad8a8ee8..7eae09c6f 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/RequiredCapability.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/RequiredCapability.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.eclipse.core.runtime.Assert;
import org.eclipse.osgi.service.resolver.VersionRange;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ResolvedInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ResolvedInstallableUnit.java
index f6f5bc034..6205b90af 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ResolvedInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ResolvedInstallableUnit.java
@@ -6,11 +6,11 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import java.util.ArrayList;
import java.util.Arrays;
-import org.eclipse.equinox.internal.prov.metadata.InternalInstallableUnit;
+import org.eclipse.equinox.internal.p2.metadata.InternalInstallableUnit;
import org.osgi.framework.Version;
public class ResolvedInstallableUnit implements IResolvedInstallableUnit, InternalInstallableUnit {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ResolvedInstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ResolvedInstallableUnitFragment.java
index f7532d2a9..e730aad11 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/ResolvedInstallableUnitFragment.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/ResolvedInstallableUnitFragment.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.eclipse.osgi.service.resolver.VersionRange;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Selector.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Selector.java
index a63f39bc3..47933e400 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/Selector.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/Selector.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import java.util.Dictionary;
-import org.eclipse.equinox.internal.prov.metadata.MetadataActivator;
+import org.eclipse.equinox.internal.p2.metadata.MetadataActivator;
import org.osgi.framework.InvalidSyntaxException;
public class Selector {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/TouchpointData.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointData.java
index 67b56c6de..7bfcae9e3 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/TouchpointData.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointData.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import java.util.Map;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/TouchpointType.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointType.java
index 1a99d8a2a..567df1d9d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/metadata/TouchpointType.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/TouchpointType.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.metadata;
+package org.eclipse.equinox.p2.metadata;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/CompoundIterator.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundIterator.java
index 73dfaa3dd..b8cadf60d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/CompoundIterator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/CompoundIterator.java
@@ -6,14 +6,14 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.query;
+package org.eclipse.equinox.p2.query;
import java.util.*;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.metadata.Messages;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.internal.p2.metadata.Messages;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
import org.eclipse.osgi.service.resolver.VersionRange;
public class CompoundIterator implements Iterator {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/IQueryable.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryable.java
index 7811a750a..325612760 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/IQueryable.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IQueryable.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.query;
+package org.eclipse.equinox.p2.query;
import java.util.Iterator;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
import org.eclipse.osgi.service.resolver.VersionRange;
public interface IQueryable {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/Query.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/Query.java
index ac91489ed..848021d73 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/Query.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/Query.java
@@ -6,14 +6,14 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.query;
+package org.eclipse.equinox.p2.query;
import java.util.ArrayList;
import java.util.Iterator;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.metadata.Messages;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.metadata.Messages;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.resolver.VersionRange;
public class Query {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/QueryableArray.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryableArray.java
index 01177285e..6fb74eb23 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/query/QueryableArray.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryableArray.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.query;
+package org.eclipse.equinox.p2.query;
import java.util.*;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.metadata.Messages;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.internal.p2.metadata.Messages;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
import org.eclipse.osgi.service.resolver.VersionRange;
public class QueryableArray implements IQueryable {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/ResolutionHelper.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/ResolutionHelper.java
index 5eceae0d1..a2404c512 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/ResolutionHelper.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/ResolutionHelper.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.resolution;
+package org.eclipse.equinox.p2.resolution;
import java.util.*;
-import org.eclipse.equinox.internal.prov.metadata.InternalInstallableUnit;
-import org.eclipse.equinox.internal.prov.metadata.MetadataActivator;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.metadata.InternalInstallableUnit;
+import org.eclipse.equinox.internal.p2.metadata.MetadataActivator;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.resolver.*;
import org.osgi.framework.ServiceReference;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/StateMetadataMap.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/StateMetadataMap.java
index 1fc262c5e..9d29bc5d5 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/StateMetadataMap.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/StateMetadataMap.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.resolution;
+package org.eclipse.equinox.p2.resolution;
import java.util.Map;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
//Instances of this class are stored in the user object slot of bundlescriptions to ease navigation between the two models.
public class StateMetadataMap {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/Transformer.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/Transformer.java
index d9afe1cfa..9dfd86601 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/Transformer.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/Transformer.java
@@ -6,14 +6,14 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.resolution;
+package org.eclipse.equinox.p2.resolution;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.metadata.MetadataActivator;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.metadata.MetadataActivator;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.resolver.*;
import org.osgi.framework.InvalidSyntaxException;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/UnsatisfiedCapability.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/UnsatisfiedCapability.java
index 29d6c244d..024b776b2 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/prov/resolution/UnsatisfiedCapability.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/resolution/UnsatisfiedCapability.java
@@ -6,10 +6,10 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.resolution;
+package org.eclipse.equinox.p2.resolution;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
/**
* Represents a provisioning dependency that was not satisfied during
diff --git a/bundles/org.eclipse.equinox.p2.tests/.project b/bundles/org.eclipse.equinox.p2.tests/.project
index 6b99e9a8c..a77ce5d0c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/.project
+++ b/bundles/org.eclipse.equinox.p2.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.test</name>
+ <name>org.eclipse.equinox.p2.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
index 3ffad4219..75025e0dd 100644
--- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF
@@ -1,41 +1,41 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Test Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.test;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.tests;singleton:=true
Bundle-Version: 0.1.0.qualifier
Import-Package: com.thoughtworks.xstream,
junit.framework;version="3.8.2",
org.eclipse.core.runtime;common=split,
+ org.eclipse.equinox.internal.p2.artifact.repository,
+ org.eclipse.equinox.internal.p2.director,
org.eclipse.equinox.internal.p2.jarprocessor,
- org.eclipse.equinox.internal.prov.artifact.repository,
- org.eclipse.equinox.internal.prov.director,
- org.eclipse.equinox.internal.prov.metadata,
+ org.eclipse.equinox.internal.p2.metadata,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.artifact.repository.processing,
+ 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.jarprocessor,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.artifact.repository.processing,
- 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.prov.resolution,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
+ org.eclipse.equinox.p2.resolution,
org.eclipse.osgi.service.environment;version="1.0.0",
org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.packageadmin;version="1.2.0"
-Bundle-Activator: org.eclipse.equinox.prov.tests.TestActivator
+Bundle-Activator: org.eclipse.equinox.p2.tests.TestActivator
Bundle-ClassPath: .
Bundle-RequiredExecutionEnviron: J2SE-1.4
-Require-Bundle: org.eclipse.equinox.prov.metadata.generator,
+Require-Bundle: org.eclipse.equinox.p2.metadata.generator,
org.eclipse.equinox.frameworkadmin,
org.eclipse.equinox.common,
- org.eclipse.equinox.prov.download
+ org.eclipse.equinox.p2.download
Eclipse-LazyStart: true
-Eclipse-RegisterBuddy: org.eclipse.equinox.prov.artifact.repository
+Eclipse-RegisterBuddy: org.eclipse.equinox.p2.artifact.repository
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.p2.tests/Test Director CDT.launch b/bundles/org.eclipse.equinox.p2.tests/Test Director CDT.launch
index 1581c875f..57b49f1f4 100644
--- a/bundles/org.eclipse.equinox.p2.tests/Test Director CDT.launch
+++ b/bundles/org.eclipse.equinox.p2.tests/Test Director CDT.launch
@@ -15,7 +15,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.equinox.prov.test/src/org/eclipse/equinox/prov/test/DirectorTest.java"/>
+<listEntry value="/org.eclipse.equinox.p2.test/src/org/eclipse/equinox/prov/test/DirectorTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -25,11 +25,11 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.prov.tests.director.DirectorTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.director.DirectorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.prov.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=c:/temp/equinox.prov/agent/&#13;&#10;-Declipse.prov.metadataRepository=file:c:/temp/equinox.prov/servers/CDTmetadataRepository/ &#13;&#10;-Declipse.prov.artifactRepository=file:c:/temp/equinox.prov/servers/artifactRepository/&#13;&#10;-Declipse.prov.installFolder=c:/temp/equinox.prov/eclipseInstall/ &#13;&#10;-Declipse.prov.configurationFlavor=tooling&#13;&#10;-Declipse.prov.autoInstall=cdt"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=c:/temp/equinox.p2/agent/&#13;&#10;-Declipse.p2.metadataRepository=file:c:/temp/equinox.p2/servers/CDTmetadataRepository/ &#13;&#10;-Declipse.p2.artifactRepository=file:c:/temp/equinox.p2/servers/artifactRepository/&#13;&#10;-Declipse.p2.installFolder=c:/temp/equinox.p2/eclipseInstall/ &#13;&#10;-Declipse.p2.configurationFlavor=tooling&#13;&#10;-Declipse.p2.autoInstall=cdt"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/bundles/org.eclipse.equinox.p2.tests/Test Director SDK.launch b/bundles/org.eclipse.equinox.p2.tests/Test Director SDK.launch
index cdd1a0001..e21327fa3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/Test Director SDK.launch
+++ b/bundles/org.eclipse.equinox.p2.tests/Test Director SDK.launch
@@ -16,7 +16,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.equinox.prov.test/src/org/eclipse/equinox/prov/tests/director/DirectorTest.java"/>
+<listEntry value="/org.eclipse.equinox.p2.test/src/org/eclipse/equinox/prov/tests/director/DirectorTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -26,15 +26,15 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.prov.tests.director.DirectorTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.director.DirectorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -noExit -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.prov.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=d:/tmp/equinox.prov/agent/ &#13;&#10;-Declipse.prov.metadataRepository=file:d:/tmp/equinox.prov/servers/metadataRepository/ &#13;&#10;-Declipse.prov.artifactRepository=file:d:/tmp/equinox.prov/servers/artifactRepository/&#13;&#10;-Declipse.prov.installFolder=d:/tmp/equinox.prov/eclipseInstall/ &#13;&#10;-Declipse.prov.configurationFlavor=tooling&#13;&#10;-Declipse.prov.autoInstall=sdk"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=d:/tmp/equinox.p2/agent/ &#13;&#10;-Declipse.p2.metadataRepository=file:d:/tmp/equinox.p2/servers/metadataRepository/ &#13;&#10;-Declipse.p2.artifactRepository=file:d:/tmp/equinox.p2/servers/artifactRepository/&#13;&#10;-Declipse.p2.installFolder=d:/tmp/equinox.p2/eclipseInstall/ &#13;&#10;-Declipse.p2.configurationFlavor=tooling&#13;&#10;-Declipse.p2.autoInstall=sdk"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,javax.servlet.jsp.source,javax.servlet.source,org.apache.ant,org.apache.ant.source,org.apache.commons.el,org.apache.commons.el.source,org.apache.commons.logging,org.apache.commons.logging.source,org.apache.jasper,org.apache.jasper.source,org.apache.lucene,org.apache.lucene.analysis,org.apache.lucene.analysis.source,org.apache.lucene.source,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.registry,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.jsch.ui,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.net,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.junit,org.junit.source,org.junit4,org.mortbay.jetty,org.mortbay.jetty.source"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ecf,org.eclipse.equinox.prov.touchpoint.eclipse,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.prov.touchpoint.natives,org.eclipse.equinox.prov.test,org.apache.xml.resolver,org.apache.xerces,org.eclipse.ecf.identity,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.prov.metadata.generator,org.eclipse.equinox.prov.artifact.repository,org.eclipse.equinox.p2.jarprocessor,org.mozilla.rhino,org.eclipse.equinox.prov.metadata.repository,com.thoughtworks.xstream,org.eclipse.equinox.prov.director,org.eclipse.equinox.prov.engine,org.eclipse.equinox.prov.console,org.eclipse.ecf.filetransfer,org.eclipse.equinox.prov.metadata,org.eclipse.equinox.prov.core,org.eclipse.equinox.prov.examplarysetup,org.eclipse.equinox.simpleconfigurator.manipulator,org.eclipse.equinox.prov.download,org.eclipse.ecf.provider.filetransfer,org.eclipse.equinox.prov.selfhosting,org.eclipse.equinox.simpleconfigurator"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ecf,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.test,org.apache.xml.resolver,org.apache.xerces,org.eclipse.ecf.identity,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.jarprocessor,org.mozilla.rhino,org.eclipse.equinox.p2.metadata.repository,com.thoughtworks.xstream,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.console,org.eclipse.ecf.filetransfer,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.examplarysetup,org.eclipse.equinox.simpleconfigurator.manipulator,org.eclipse.equinox.p2.download,org.eclipse.ecf.provider.filetransfer,org.eclipse.equinox.p2.selfhosting,org.eclipse.equinox.simpleconfigurator"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
diff --git a/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall CDT.launch b/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall CDT.launch
index 87e9cbd99..b39f45d4c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall CDT.launch
+++ b/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall CDT.launch
@@ -15,7 +15,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.equinox.prov.test/src/org/eclipse/equinox/prov/tests/director/DirectorTest.java"/>
+<listEntry value="/org.eclipse.equinox.p2.test/src/org/eclipse/equinox/prov/tests/director/DirectorTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -25,11 +25,11 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.prov.tests.director.DirectorTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.director.DirectorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.prov.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=c:/temp/equinox.prov/agent/&#13;&#10;-Declipse.prov.metadataRepository=file:c:/temp/equinox.prov/servers/CDTmetadataRepository/ &#13;&#10;-Declipse.prov.artifactRepository=file:c:/temp/equinox.prov/servers/artifactRepository/&#13;&#10;-Declipse.prov.installFolder=c:/temp/equinox.prov/eclipseInstall/ &#13;&#10;-Declipse.prov.configurationFlavor=tooling&#13;&#10;-Declipse.prov.autoInstall=cdt&#13;&#10;-Declipse.prov.doUninstall=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=c:/temp/equinox.p2/agent/&#13;&#10;-Declipse.p2.metadataRepository=file:c:/temp/equinox.p2/servers/CDTmetadataRepository/ &#13;&#10;-Declipse.p2.artifactRepository=file:c:/temp/equinox.p2/servers/artifactRepository/&#13;&#10;-Declipse.p2.installFolder=c:/temp/equinox.p2/eclipseInstall/ &#13;&#10;-Declipse.p2.configurationFlavor=tooling&#13;&#10;-Declipse.p2.autoInstall=cdt&#13;&#10;-Declipse.p2.doUninstall=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall SDK.launch b/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall SDK.launch
index ab7674355..bd0fa24db 100644
--- a/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall SDK.launch
+++ b/bundles/org.eclipse.equinox.p2.tests/Test Director Uninstall SDK.launch
@@ -12,10 +12,10 @@
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx768m&#13;&#10;-Declipse.prov.data.area=c:/temp/equinox.prov/agent/&#13;&#10;-Declipse.prov.metadataRepository=file:c:/temp/equinox.prov/servers/metadataRepository/ &#13;&#10;-Declipse.prov.artifactRepository=file:c:/temp/equinox.prov/servers/artifactRepository/&#13;&#10;-Declipse.prov.installFolder=c:/temp/equinox.prov/eclipseInstall/ &#13;&#10;-Declipse.prov.configurationFlavor=tooling&#13;&#10;-Declipse.prov.autoInstall=sdk&#13;&#10;-Declipse.prov.doUninstall=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx768m&#13;&#10;-Declipse.p2.data.area=c:/temp/equinox.p2/agent/&#13;&#10;-Declipse.p2.metadataRepository=file:c:/temp/equinox.p2/servers/metadataRepository/ &#13;&#10;-Declipse.p2.artifactRepository=file:c:/temp/equinox.p2/servers/artifactRepository/&#13;&#10;-Declipse.p2.installFolder=c:/temp/equinox.p2/eclipseInstall/ &#13;&#10;-Declipse.p2.configurationFlavor=tooling&#13;&#10;-Declipse.p2.autoInstall=sdk&#13;&#10;-Declipse.p2.doUninstall=true"/>
<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.launcher@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.junit@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="vminstall" value="j2re1.4.2_13"/>
-<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.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:default,org.eclipse.equinox.prov.metadata@default:default,org.eclipse.equinox.prov.metadata.repository@default:default,org.eclipse.equinox.prov.test@default:true,org.eclipse.equinox.prov.touchpoint.eclipse@default:default,org.eclipse.equinox.prov.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@1:true,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.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:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.test@default:true,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@1:true,org.mozilla.rhino@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.tests/plugin.xml b/bundles/org.eclipse.equinox.p2.tests/plugin.xml
index 16e069030..efe4aac76 100644
--- a/bundles/org.eclipse.equinox.p2.tests/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/plugin.xml
@@ -2,33 +2,33 @@
<?eclipse version="3.2"?>
<plugin>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
- id="org.eclipse.equinox.prov.processing.ByteShifter">
- <step class="org.eclipse.equinox.prov.tests.artifact.repository.processing.ByteShifter"/>
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
+ id="org.eclipse.equinox.p2.processing.ByteShifter">
+ <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.ByteShifter"/>
</extension>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
- id="org.eclipse.equinox.prov.processing.MD5Verifier">
- <step class="org.eclipse.equinox.prov.tests.artifact.repository.processing.MD5Verifier"/>
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
+ id="org.eclipse.equinox.p2.processing.MD5Verifier">
+ <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.MD5Verifier"/>
</extension>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
- id="org.eclipse.equinox.prov.processing.Adder">
- <step class="org.eclipse.equinox.prov.tests.artifact.repository.processing.Adder"/>
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
+ id="org.eclipse.equinox.p2.processing.Adder">
+ <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Adder"/>
</extension>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
- id="org.eclipse.equinox.prov.processing.Multiplier">
- <step class="org.eclipse.equinox.prov.tests.artifact.repository.processing.Multiplier"/>
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
+ id="org.eclipse.equinox.p2.processing.Multiplier">
+ <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Multiplier"/>
</extension>
<extension
- point="org.eclipse.equinox.prov.artifact.repository.processingSteps"
- id="org.eclipse.equinox.prov.processing.Pack200Unpacker">
- <step class="org.eclipse.equinox.prov.tests.artifact.repository.processing.Pack200Unpacker"/>
+ point="org.eclipse.equinox.p2.artifact.repository.processingSteps"
+ id="org.eclipse.equinox.p2.processing.Pack200Unpacker">
+ <step class="org.eclipse.equinox.p2.tests.artifact.repository.processing.Pack200Unpacker"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AbstractProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java
index 7b5386984..6a84a8965 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AbstractProvisioningTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java
@@ -6,19 +6,19 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
import java.util.*;
import junit.framework.TestCase;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
index bf2dc9d51..1c91a8326 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/AutomatedTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
import junit.framework.*;
@@ -20,10 +20,10 @@ import junit.framework.*;
public class AutomatedTests extends TestCase {
public static Test suite() {
TestSuite suite = new TestSuite(AutomatedTests.class.getName());
- suite.addTest(org.eclipse.equinox.prov.tests.director.AllTests.suite());
- suite.addTest(org.eclipse.equinox.prov.tests.download.AllTests.suite());
- suite.addTest(org.eclipse.equinox.prov.tests.engine.AllTests.suite());
- suite.addTest(org.eclipse.equinox.prov.tests.metadata.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.director.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.download.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.engine.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.metadata.AllTests.suite());
return suite;
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestActivator.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestActivator.java
index 9cef88a04..aa1cb27e9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestActivator.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestActivator.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
import org.osgi.framework.*;
import org.osgi.service.packageadmin.PackageAdmin;
public class TestActivator implements BundleActivator {
- public static final String PI_PROV_TESTS = "org.eclipse.equinox.prov.test";
+ public static final String PI_PROV_TESTS = "org.eclipse.equinox.p2.test";
public static BundleContext context;
private static PackageAdmin packageAdmin = null;
private static ServiceReference packageAdminRef = null;
@@ -29,7 +29,7 @@ public class TestActivator implements BundleActivator {
packageAdmin = (PackageAdmin) context.getService(packageAdminRef);
//This is a hack because the junit plugin launch config do not allow to start bundles
- getBundle("org.eclipse.equinox.prov.examplarysetup").start();
+ getBundle("org.eclipse.equinox.p2.examplarysetup").start();
getBundle("org.eclipse.equinox.frameworkadmin.equinox").start();
getBundle("org.eclipse.equinox.simpleconfigurator.manipulator").start();
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestArtifactRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
index ada291281..a884c659b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestArtifactRepository.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
import java.io.*;
import java.net.*;
@@ -14,14 +14,14 @@ import java.util.HashMap;
import java.util.Map;
import junit.framework.Assert;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.prov.artifact.repository.ArtifactRequest;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepHandler;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.core.repository.RepositoryCreationException;
-import org.eclipse.equinox.prov.metadata.IArtifactKey;
+import org.eclipse.equinox.internal.p2.artifact.repository.ArtifactRequest;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepHandler;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.RepositoryCreationException;
+import org.eclipse.equinox.p2.metadata.IArtifactKey;
/**
* A simple artifact repository implementation used for testing purposes.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestMetadataRepository.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
index 99cf56c03..8b4524097 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/TestMetadataRepository.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestMetadataRepository.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests;
+package org.eclipse.equinox.p2.tests;
import java.io.File;
import java.io.IOException;
@@ -15,13 +15,13 @@ import java.net.URL;
import java.util.*;
import junit.framework.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.OrderedProperties;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.query.CompoundIterator;
+import org.eclipse.equinox.p2.core.helpers.OrderedProperties;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.query.CompoundIterator;
import org.eclipse.osgi.service.resolver.VersionRange;
/**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/AllTests.java
index 496438193..d2e806771 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository;
+package org.eclipse.equinox.p2.tests.artifact.repository;
import junit.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java
index 8b8d60772..861221393 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/JarURLRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/JarURLRepositoryTest.java
@@ -1,12 +1,12 @@
-package org.eclipse.equinox.prov.tests.artifact.repository;
+package org.eclipse.equinox.p2.tests.artifact.repository;
import java.net.MalformedURLException;
import java.net.URL;
import junit.framework.TestCase;
-import org.eclipse.equinox.internal.prov.metadata.ArtifactKey;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepositoryManager;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepositoryManager;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
@@ -42,6 +42,6 @@ public class JarURLRepositoryTest extends TestCase {
fail(e.getMessage());
}
IArtifactRepository repo = manager.loadRepository(jarRepoURL, null);
- assertTrue(repo.contains(new ArtifactKey("eclipse", "plugin", "org.eclipse.equinox.prov.engine", new Version("0.1.0.200709241631"))));
+ assertTrue(repo.contains(new ArtifactKey("eclipse", "plugin", "org.eclipse.equinox.p2.engine", new Version("0.1.0.200709241631"))));
}
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Adder.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java
index 8d23231b7..6854545eb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Adder.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Adder.java
@@ -9,15 +9,15 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class Adder extends ProcessingStep {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ByteShifter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java
index 6ed97709d..bcf307119 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ByteShifter.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ByteShifter.java
@@ -9,15 +9,15 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class ByteShifter extends ProcessingStep {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Counter.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
index f21e0265e..c13e22b13 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Counter.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Counter.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class Counter extends ProcessingStep {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/MD5Verifier.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/MD5Verifier.java
index 5609874a2..56758cc6b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/MD5Verifier.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/MD5Verifier.java
@@ -9,17 +9,17 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class MD5Verifier extends ProcessingStep {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Multiplier.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java
index 611fd8b7a..05f0550b8 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Multiplier.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Multiplier.java
@@ -9,15 +9,15 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.IOException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
public class Multiplier extends ProcessingStep {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Pack200Unpacker.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Pack200Unpacker.java
index ac0e57689..a05988dd7 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/Pack200Unpacker.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/Pack200Unpacker.java
@@ -9,20 +9,20 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.equinox.internal.p2.artifact.repository.Activator;
import org.eclipse.equinox.internal.p2.jarprocessor.UnpackStep;
import org.eclipse.equinox.internal.p2.jarprocessor.Utils;
-import org.eclipse.equinox.internal.prov.artifact.repository.Activator;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactDescriptor;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStep;
+import org.eclipse.equinox.p2.artifact.repository.processing.ProcessingStepDescriptor;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor;
import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor.Options;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStep;
-import org.eclipse.equinox.prov.artifact.repository.processing.ProcessingStepDescriptor;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
/**
* The Pack200Unpacker expects an input containing ".jar.pack.gz" data.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ProcessingStepHandlerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
index d7006c219..4f7e2eea4 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/processing/ProcessingStepHandlerTest.java
@@ -9,15 +9,15 @@
* compeople AG (Stefan Liebig) - initial API and implementation
* IBM - continuing development
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.artifact.repository.processing;
+package org.eclipse.equinox.p2.tests.artifact.repository.processing;
import java.io.*;
import java.util.Arrays;
import junit.framework.TestCase;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.artifact.repository.processing.*;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.artifact.repository.processing.*;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
+import org.eclipse.equinox.p2.tests.TestActivator;
public class ProcessingStepHandlerTest extends TestCase {
@@ -129,45 +129,45 @@ public class ProcessingStepHandlerTest extends TestCase {
}
public void testCreateByteShifterPS() {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.ByteShifter", "1", true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.ByteShifter", "1", true);
ProcessingStep step = handler.create(descriptor, null);
assertNotNull(step);
assertEquals(ByteShifter.class, step.getClass());
}
public void testCreateMD5VerifierPS() {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.MD5Verifier", "1", true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.MD5Verifier", "1", true);
ProcessingStep step = handler.create(descriptor, null);
assertNotNull(step);
assertEquals(MD5Verifier.class, step.getClass());
}
public void testCreateAdderPS() {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
ProcessingStep step = handler.create(descriptor, null);
assertNotNull(step);
assertEquals(Adder.class, step.getClass());
}
public void testCreateMultiplierPS() {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
ProcessingStep step = handler.create(descriptor, null);
assertNotNull(step);
assertEquals(Multiplier.class, step.getClass());
}
public void testCreatePack200UnpackerPS() {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Pack200Unpacker", null, true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Pack200Unpacker", null, true);
ProcessingStep step = handler.create(descriptor, null);
assertNotNull(step);
assertEquals(Pack200Unpacker.class, step.getClass());
}
public void testCreatePSsAndAssureOrderingOfPSs1() throws IOException {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
ProcessingStep adder = handler.create(descriptor, null);
- descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+ descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
ProcessingStep multiplier = handler.create(descriptor, null);
ProcessingStep[] steps = new ProcessingStep[] {adder, multiplier};
@@ -179,10 +179,10 @@ public class ProcessingStepHandlerTest extends TestCase {
}
public void testCreatePSsAndAssureOrderingOfPSs2() throws IOException {
- ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
+ ProcessingStepDescriptor descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
ProcessingStep adder = handler.create(descriptor, null);
- descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+ descriptor = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
ProcessingStep multiplier = handler.create(descriptor, null);
ProcessingStep[] steps = new ProcessingStep[] {multiplier, adder};
@@ -194,8 +194,8 @@ public class ProcessingStepHandlerTest extends TestCase {
}
public void testLinkPSs() throws IOException {
- ProcessingStepDescriptor descriptor1 = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Adder", "1", true);
- ProcessingStepDescriptor descriptor2 = new ProcessingStepDescriptor("org.eclipse.equinox.prov.processing.Multiplier", "2", true);
+ ProcessingStepDescriptor descriptor1 = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Adder", "1", true);
+ ProcessingStepDescriptor descriptor2 = new ProcessingStepDescriptor("org.eclipse.equinox.p2.processing.Multiplier", "2", true);
ProcessingStepDescriptor[] descriptors = new ProcessingStepDescriptor[] {descriptor1, descriptor2};
ByteArrayOutputStream result = new ByteArrayOutputStream(10);
OutputStream testStream = handler.createAndLink(descriptors, null, result, monitor);
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AllTests.java
index 1d1645b90..feced95bd 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import junit.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AutomatedDirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java
index 29be504c9..593b504dc 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/AutomatedDirectorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/AutomatedDirectorTest.java
@@ -6,16 +6,16 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.core.helpers.LogHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.core.helpers.LogHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.Version;
/**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/Bug203637.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java
index eea4af549..2a0aae30a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/Bug203637.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/Bug203637.java
@@ -6,13 +6,13 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.Version;
public class Bug203637 extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OperationGenerationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
index 560c60688..158658b04 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OperationGenerationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OperationGenerationTest.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import java.util.ArrayList;
import java.util.Collection;
import junit.framework.TestCase;
-import org.eclipse.equinox.internal.prov.director.OperationGenerator;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.internal.p2.director.OperationGenerator;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
import org.osgi.framework.Version;
public class OperationGenerationTest extends TestCase {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java
index 74e8e7ad9..a658f6728 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest.java
@@ -6,14 +6,14 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest2.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java
index 896e5ebd6..05ea7b9fa 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/OracleTest2.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/OracleTest2.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import java.util.Collection;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/PickerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java
index 22452040c..6f3ef7402 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/PickerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/PickerTest.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import junit.framework.TestCase;
-import org.eclipse.equinox.internal.prov.director.Picker;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.director.Picker;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/RollbackTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java
index cb0400878..91cdd46eb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/RollbackTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/RollbackTest.java
@@ -6,21 +6,21 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import java.net.URL;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.director.DirectorActivator;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.internal.p2.director.DirectorActivator;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.osgi.framework.Version;
public class RollbackTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/SingletonTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java
index 016ce7882..1522e9baa 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/SingletonTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/SingletonTest.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.Version;
public class SingletonTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UninstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java
index 43a70fc70..65efb55b7 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UninstallTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UninstallTest.java
@@ -6,13 +6,13 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.Version;
public class UninstallTest extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithEntryPoint.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithEntryPoint.java
index b5a535bc8..64f20370e 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithEntryPoint.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithEntryPoint.java
@@ -6,17 +6,17 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import java.util.Collection;
import java.util.Iterator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.osgi.framework.Version;
public class UpdateTestWithEntryPoint extends AbstractProvisioningTest {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithoutEntryPoint.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithoutEntryPoint.java
index a67c5daeb..2bef12e17 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/director/UpdateTestWithoutEntryPoint.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/director/UpdateTestWithoutEntryPoint.java
@@ -6,16 +6,16 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.director;
+package org.eclipse.equinox.p2.tests.director;
import java.util.Iterator;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/AllTests.java
index 77c6b26c4..2c5e05221 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.download;
+package org.eclipse.equinox.p2.tests.download;
import junit.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/DownloadManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java
index f6e579e84..a615da4dc 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/download/DownloadManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/download/DownloadManagerTest.java
@@ -6,11 +6,11 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.download;
+package org.eclipse.equinox.p2.tests.download;
import junit.framework.*;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.download.DownloadManager;
+import org.eclipse.equinox.p2.download.DownloadManager;
/**
* Simple tests of {@link DownloadManager} API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
index ffdbf9eb7..b53229e5b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
import junit.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/EngineTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java
index 4318a8064..0e15a4504 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/EngineTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/EngineTest.java
@@ -8,16 +8,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
import java.util.*;
import junit.framework.TestCase;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.prov.metadata.ArtifactKey;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseSetTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
index c9ee4556b..ff793c316 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseSetTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseSetTest.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
import junit.framework.TestCase;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.metadata.ResolvedInstallableUnit;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.metadata.ResolvedInstallableUnit;
/**
* Simple test of the engine API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java
index 3c76faf39..d9bb6ee1c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/PhaseTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/PhaseTest.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
import junit.framework.TestCase;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.MultiStatus;
-import org.eclipse.equinox.prov.engine.*;
+import org.eclipse.equinox.p2.core.helpers.MultiStatus;
+import org.eclipse.equinox.p2.engine.*;
/**
* Simple test of the engine API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/ProfileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
index 77be6d95c..b4884dfec 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/engine/ProfileTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProfileTest.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.engine;
+package org.eclipse.equinox.p2.tests.engine;
import junit.framework.TestCase;
-import org.eclipse.equinox.prov.engine.Profile;
+import org.eclipse.equinox.p2.engine.Profile;
/**
* Simple test of the engine API.
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/DirectorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java
index c6441182e..00ac1a06c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/DirectorTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/DirectorTest.java
@@ -8,27 +8,27 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.full;
+package org.eclipse.equinox.p2.tests.full;
import java.util.Collection;
import java.util.Iterator;
import junit.framework.TestCase;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-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.IResolvedInstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+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.IResolvedInstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.osgi.framework.ServiceReference;
/**
- * This test installs or uninstalls the IU defined by the property "eclipse.prov.autoInstall".
+ * This test installs or uninstalls the IU defined by the property "eclipse.p2.autoInstall".
* Metadata for the IUs to install must be generated separately before running this test.
*/
public class DirectorTest extends TestCase {
@@ -66,8 +66,8 @@ public class DirectorTest extends TestCase {
}
String profileId = installFolder;
- String newFlavor = System.getProperty("eclipse.prov.configurationFlavor");
- boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.prov.doUninstall"))));
+ String newFlavor = System.getProperty("eclipse.p2.configurationFlavor");
+ boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.p2.doUninstall"))));
Profile p = profileRegistry.getProfile(profileId);
if (p == null) {
@@ -92,7 +92,7 @@ public class DirectorTest extends TestCase {
p.setValue(Profile.PROP_ENVIRONMENTS, "osgi.os=" + info.getOS() + ",osgi.ws=" + info.getWS() + ",osgi.arch=" + info.getOSArch());
IInstallableUnit[] allRoots = new IInstallableUnit[1];
- Collection allJobs = allIUs.getAll(System.getProperty("eclipse.prov.autoInstall"));
+ Collection allJobs = allIUs.getAll(System.getProperty("eclipse.p2.autoInstall"));
IStatus operationStatus = null;
if (allJobs.size() != 0) {
allRoots[0] = (IInstallableUnit) allJobs.iterator().next();
@@ -102,7 +102,7 @@ public class DirectorTest extends TestCase {
operationStatus = director.uninstall(allRoots, p, new NullProgressMonitor());
}
} else {
- operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.prov.director.test", "The installable unit '" + System.getProperty("eclipse.prov.autoInstall") + "' has not been found");
+ operationStatus = new Status(IStatus.INFO, "org.eclipse.equinox.p2.director.test", "The installable unit '" + System.getProperty("eclipse.p2.autoInstall") + "' has not been found");
}
if (operationStatus.isOK()) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/End2EndTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java
index d3e23507d..639d26c9a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/full/End2EndTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/End2EndTest.java
@@ -6,22 +6,22 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.full;
+package org.eclipse.equinox.p2.tests.full;
import java.util.*;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-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.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+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.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.ServiceReference;
@@ -54,8 +54,8 @@ public class End2EndTest extends AbstractProvisioningTest {
throw new RuntimeException("Profile registry service not available");
}
- String newFlavor = System.getProperty("eclipse.prov.configurationFlavor");
- boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.prov.doUninstall"))));
+ String newFlavor = System.getProperty("eclipse.p2.configurationFlavor");
+ boolean doUninstall = (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("eclipse.p2.doUninstall"))));
Profile profile1 = profileRegistry.getProfile(profileId);
if (profile1 == null) {
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/AllTests.java
index 4a6c0b4b1..7c37d1269 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import junit.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentMethodTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java
index 4e8613c1a..3de97a802 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentMethodTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentMethodTest.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import java.util.*;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
index 81696d911..db9a72c70 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/FragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import java.util.*;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/MultipleIUAndFragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
index 760758942..bce261ed5 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/MultipleIUAndFragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import java.util.*;
import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/OldTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/OldTest.java
index db71c19ae..bd4c2e0e9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/OldTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/OldTest.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import com.thoughtworks.xstream.XStream;
import java.io.*;
import java.util.ArrayList;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.Transformer;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.Transformer;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.eclipse.osgi.service.resolver.*;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/RecommendationTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/RecommendationTest.java
index 6cd05bae8..eb5d2ec33 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/RecommendationTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/RecommendationTest.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.prov.director.Picker;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.internal.p2.director.Picker;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/ResolutionHelperTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ResolutionHelperTest.java
index 21dd45b3c..c5926ba45 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/ResolutionHelperTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/ResolutionHelperTest.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata;
+package org.eclipse.equinox.p2.tests.metadata;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.resolution.ResolutionHelper;
-import org.eclipse.equinox.prov.resolution.UnsatisfiedCapability;
-import org.eclipse.equinox.prov.tests.AbstractProvisioningTest;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.resolution.ResolutionHelper;
+import org.eclipse.equinox.p2.resolution.UnsatisfiedCapability;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.Version;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllTests.java
index 532adb148..1cc3e3085 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.tests.metadata.repository;
+package org.eclipse.equinox.p2.tests.metadata.repository;
import junit.framework.*;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/JarURLRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
index 5277f277d..a717829d1 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/prov/tests/metadata/repository/JarURLRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/JarURLRepositoryTest.java
@@ -1,11 +1,11 @@
-package org.eclipse.equinox.prov.tests.metadata.repository;
+package org.eclipse.equinox.p2.tests.metadata.repository;
import java.net.MalformedURLException;
import java.net.URL;
import junit.framework.TestCase;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.equinox.prov.tests.TestActivator;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepositoryManager;
+import org.eclipse.equinox.p2.tests.TestActivator;
import org.osgi.framework.ServiceReference;
public class JarURLRepositoryTest extends TestCase {
diff --git a/bundles/org.eclipse.equinox.p2.tools/.project b/bundles/org.eclipse.equinox.p2.tools/.project
index 24d2ab448..abbf60907 100644
--- a/bundles/org.eclipse.equinox.p2.tools/.project
+++ b/bundles/org.eclipse.equinox.p2.tools/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.tools</name>
+ <name>org.eclipse.equinox.p2.tools</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tools/META-INF/MANIFEST.MF
index dcc9904c3..8a95e206b 100644
--- a/bundles/org.eclipse.equinox.p2.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tools/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tools Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.tools;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.tools;singleton:=true
Bundle-Version: 0.1.0.qualifier
Import-Package: org.eclipse.equinox.app;version="1.0.0",
- org.eclipse.equinox.internal.prov.console,
- org.eclipse.equinox.prov.core,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.query,
+ org.eclipse.equinox.internal.p2.console,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
org.eclipse.osgi.service.resolver;version="1.1.0",
org.osgi.framework;version="1.4.0"
Require-Bundle: org.eclipse.equinox.common
diff --git a/bundles/org.eclipse.equinox.p2.tools/ProvTools - compare repos.launch b/bundles/org.eclipse.equinox.p2.tools/ProvTools - compare repos.launch
index 8d39a674c..53dfdc111 100644
--- a/bundles/org.eclipse.equinox.p2.tools/ProvTools - compare repos.launch
+++ b/bundles/org.eclipse.equinox.p2.tools/ProvTools - compare repos.launch
@@ -11,11 +11,11 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.prov.tools.queryableApp&#13;&#10;-source file:d:/tmp/equinox.prov/servers/metadataRepository/content.xml&#13;&#10;-target file:d:/tmp/equinox.prov/servers.old/metadataRepository/content.xml&#13;&#10;-compare"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.p2.tools.queryableApp&#13;&#10;-source file:d:/tmp/equinox.p2/servers/metadataRepository/content.xml&#13;&#10;-target file:d:/tmp/equinox.p2/servers.old/metadataRepository/content.xml&#13;&#10;-compare"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="target_bundles" value="org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.launcher@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="true"/>
-<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.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:default,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.generator@default:default,org.eclipse.equinox.prov.metadata.repository@default:default,org.eclipse.equinox.prov.tools@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.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:default,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.generator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.tools@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.tools/ProvTools - list profile.launch b/bundles/org.eclipse.equinox.p2.tools/ProvTools - list profile.launch
index a76d8d806..68933129a 100644
--- a/bundles/org.eclipse.equinox.p2.tools/ProvTools - list profile.launch
+++ b/bundles/org.eclipse.equinox.p2.tools/ProvTools - list profile.launch
@@ -11,12 +11,12 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.prov.tools.queryableApp&#13;&#10;-source foo&#13;&#10;-list &#13;&#10;-profile"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog -application org.eclipse.equinox.p2.tools.queryableApp&#13;&#10;-source foo&#13;&#10;-list &#13;&#10;-profile"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=d:/tmp/equinox.prov/agentdata/"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=d:/tmp/equinox.p2/agentdata/"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="target_bundles" value="org.eclipse.core.jobs@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.launcher@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="true"/>
-<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.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:default,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.generator@default:default,org.eclipse.equinox.prov.metadata.repository@default:default,org.eclipse.equinox.prov.tools@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.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:default,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.generator@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.tools@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.tools/plugin.xml b/bundles/org.eclipse.equinox.p2.tools/plugin.xml
index 22c251a40..5f7b0e295 100644
--- a/bundles/org.eclipse.equinox.p2.tools/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.tools/plugin.xml
@@ -7,7 +7,7 @@
thread="main"
visible="true">
<run
- class="org.eclipse.equinox.prov.tools.MetadataCompareApplication">
+ class="org.eclipse.equinox.p2.tools.MetadataCompareApplication">
</run>
</application>
</extension>
diff --git a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/prov/tools/MetadataCompareApplication.java b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/p2/tools/MetadataCompareApplication.java
index 6210583b9..09fa5756a 100644
--- a/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/prov/tools/MetadataCompareApplication.java
+++ b/bundles/org.eclipse.equinox.p2.tools/src/org/eclipse/equinox/p2/tools/MetadataCompareApplication.java
@@ -6,19 +6,19 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.tools;
+package org.eclipse.equinox.p2.tools;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.equinox.internal.prov.console.ProvisioningHelper;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.query.IQueryable;
-import org.eclipse.equinox.prov.query.Query;
+import org.eclipse.equinox.internal.p2.console.ProvisioningHelper;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.query.IQueryable;
+import org.eclipse.equinox.p2.query.Query;
import org.eclipse.osgi.service.resolver.VersionRange;
public class MetadataCompareApplication implements IApplication {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.project b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.project
index 1a7f35972..36758f20e 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.project
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.touchpoint.eclipse</name>
+ <name>org.eclipse.equinox.p2.touchpoint.eclipse</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
index efc2d5e49..30fe8e508 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Adaptor Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.touchpoint.eclipse;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.eclipse;singleton:=true
Bundle-Version: 0.1.0.qualifier
Import-Package: org.eclipse.core.runtime;common=split,
org.eclipse.equinox.frameworkadmin,
org.eclipse.equinox.internal.frameworkadmin.utils,
- org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.download,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.download,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
org.eclipse.osgi.framework.util,
org.eclipse.osgi.service.datalocation;version="1.0.0",
org.eclipse.osgi.service.environment;version="1.0.0",
@@ -23,4 +23,4 @@ Import-Package: org.eclipse.core.runtime;common=split,
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Eclipse-LazyStart: true
-Bundle-Activator: org.eclipse.equinox.internal.prov.touchpoint.eclipse.Activator
+Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/plugin.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/plugin.xml
index 8fae48c47..37cda2779 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/plugin.xml
@@ -1,8 +1,8 @@
<plugin>
- <extension point="org.eclipse.equinox.prov.engine.touchpoints" id="eclipse" name="Eclipse Touchpoint">
+ <extension point="org.eclipse.equinox.p2.engine.touchpoints" id="eclipse" name="Eclipse Touchpoint">
<touchpoint
type="eclipse"
- class="org.eclipse.equinox.internal.prov.touchpoint.eclipse.EclipseTouchpoint"
+ class="org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint"
version="1.0.0"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/prov/touchpoint/eclipse/Activator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java
index 405dc205e..42df613bc 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/prov/touchpoint/eclipse/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Activator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.eclipse;
+package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/prov/touchpoint/eclipse/EclipseTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java
index de50b0ada..877e8c5fa 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/prov/touchpoint/eclipse/EclipseTouchpoint.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseTouchpoint.java
@@ -6,18 +6,18 @@
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.eclipse;
+package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
import java.io.*;
import java.net.*;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.frameworkadmin.*;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.core.helpers.*;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.core.helpers.*;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.eclipse.osgi.util.ManifestElement;
import org.mozilla.javascript.*;
@@ -25,9 +25,9 @@ import org.osgi.framework.*;
import org.osgi.util.tracker.ServiceTracker;
public class EclipseTouchpoint implements ITouchpoint {
- private final static String ID = "org.eclipse.equinox.prov.touchpoint.eclipse"; //$NON-NLS-1$
+ private final static String ID = "org.eclipse.equinox.p2.touchpoint.eclipse"; //$NON-NLS-1$
private final static String CONFIG_FOLDER = "eclipse.configurationFolder";
- private final static String CACHE_PATH = "eclipse.prov.cache";
+ private final static String CACHE_PATH = "eclipse.p2.cache";
private final static String CONFIGURATION_DATA = "configurationData";
private final static String UNCONFIGURATION_DATA = "unconfigurationData";
@@ -108,7 +108,7 @@ public class EclipseTouchpoint implements ITouchpoint {
AgentLocation location = getAgentLocation();
if (location == null)
return null;
- URL result = location.getTouchpointDataArea("org.eclipse.equinox.prov.touchpoint.eclipse/");
+ URL result = location.getTouchpointDataArea("org.eclipse.equinox.p2.touchpoint.eclipse/");
try {
return new URL(result, "bundlepool");
} catch (MalformedURLException e) {
@@ -224,8 +224,8 @@ public class EclipseTouchpoint implements ITouchpoint {
return ce.getStatus();
}
//TODO These values should be inserted by a configuration unit (bug 204124)
- manipulator.getConfigData().setFwDependentProp("eclipse.prov.profile", profile.getProfileId());
- manipulator.getConfigData().setFwDependentProp("eclipse.prov.data.area", computeRelativeAgentLocation(profile));
+ manipulator.getConfigData().setFwDependentProp("eclipse.p2.profile", profile.getProfileId());
+ manipulator.getConfigData().setFwDependentProp("eclipse.p2.data.area", computeRelativeAgentLocation(profile));
Object wrappedOut = Context.javaToJS(manipulator, scope);
ScriptableObject.putProperty(scope, "manipulator", wrappedOut);
@@ -433,7 +433,7 @@ public class EclipseTouchpoint implements ITouchpoint {
// 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 = location + " - bundle pool"; //$NON-NLS-1$
- IWritableArtifactRepository result = (IWritableArtifactRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.artifact.repository.simpleRepository");
+ IWritableArtifactRepository result = (IWritableArtifactRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.artifact.repository.simpleRepository");
return tagAsImplementation(result);
}
@@ -454,7 +454,7 @@ public class EclipseTouchpoint implements ITouchpoint {
// 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 = location + " - Agent download cache"; //$NON-NLS-1$
- IWritableArtifactRepository result = (IWritableArtifactRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.artifact.repository.simpleRepository");
+ IWritableArtifactRepository result = (IWritableArtifactRepository) manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.artifact.repository.simpleRepository");
return tagAsImplementation(result);
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/.project b/bundles/org.eclipse.equinox.p2.touchpoint.natives/.project
index 1d3f5d6a5..cafa8052a 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/.project
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.touchpoint.natives</name>
+ <name>org.eclipse.equinox.p2.touchpoint.natives</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
index 62a2bcc44..1cc32ac51 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Native Adatpor Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.equinox.prov.touchpoint.natives;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.natives;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.internal.prov.touchpoint.natives.Activator
-Import-Package: org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.location,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.download,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
+Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.natives.Activator
+Import-Package: org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.location,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.download,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
org.eclipse.osgi.service.datalocation;version="1.0.0",
org.eclipse.osgi.util;version="1.0.0",
org.mozilla.javascript,
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml b/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml
index 12d7e399e..64fb4744a 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/plugin.xml
@@ -1,8 +1,8 @@
<plugin>
- <extension point="org.eclipse.equinox.prov.engine.touchpoints" id="native" name="Native Touchpoint">
+ <extension point="org.eclipse.equinox.p2.engine.touchpoints" id="native" name="Native Touchpoint">
<touchpoint
type="native"
- class="org.eclipse.equinox.internal.prov.touchpoint.natives.NativeTouchpoint"
+ class="org.eclipse.equinox.internal.p2.touchpoint.natives.NativeTouchpoint"
version="1.0.0"/>
</extension>
</plugin>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Activator.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Activator.java
index 07ab96fb5..f45461808 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Activator.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class Activator implements BundleActivator {
- public static final String ID = "org.eclipse.equinox.prov.touchpoint.native"; //$NON-NLS-1$
+ public static final String ID = "org.eclipse.equinox.p2.touchpoint.native"; //$NON-NLS-1$
private static BundleContext context = null;
public static BundleContext getContext() {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/BackupFiles.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupFiles.java
index 7c47ebb7b..73e930425 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/BackupFiles.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupFiles.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import java.io.*;
import java.net.URL;
@@ -16,7 +16,7 @@ import java.util.*;
import java.util.zip.*;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
import org.eclipse.osgi.util.NLS;
public class BackupFiles {
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Messages.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java
index acc98cd94..7ec1e92a9 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.prov.touchpoint.natives.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.touchpoint.natives.messages"; //$NON-NLS-1$
static {
// load message values from bundle file and assign to fields below
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/NativeTouchpoint.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java
index 0db12daa0..32690e883 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/NativeTouchpoint.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/NativeTouchpoint.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import java.io.File;
import java.net.URL;
@@ -16,17 +16,17 @@ import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.prov.artifact.repository.*;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.core.location.AgentLocation;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.p2.artifact.repository.*;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.core.location.AgentLocation;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.metadata.*;
import org.mozilla.javascript.*;
import org.osgi.framework.Version;
public class NativeTouchpoint implements ITouchpoint {
private final static String CONFIGURATION_DATA = "configurationData";
- private static final String ID = "org.eclipse.equinox.prov.touchpoint.natives"; //$NON-NLS-1$
+ private static final String ID = "org.eclipse.equinox.p2.touchpoint.natives"; //$NON-NLS-1$
private final Set supportedPhases = new HashSet(); //TODO This should probably come from XML
{
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Permissions.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Permissions.java
index ab3f06e80..98bdcdfc9 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Permissions.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Permissions.java
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat Incorporated - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import java.io.IOException;
import org.eclipse.core.runtime.IPath;
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Util.java
index bb474964d..04ae8a0ea 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Util.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Util.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import org.eclipse.core.runtime.*;
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Zip.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Zip.java
index 979919647..06dcbd4ff 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/Zip.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Zip.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.prov.touchpoint.natives;
+package org.eclipse.equinox.internal.p2.touchpoint.natives;
import java.io.File;
import java.io.IOException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.prov.core.helpers.FileUtils;
+import org.eclipse.equinox.p2.core.helpers.FileUtils;
import org.eclipse.osgi.util.NLS;
//TODO Be careful here with the permissions.... We may need to have a proper unzip technology here that supports file permissions for linux
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/messages.properties b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties
index 15e212e95..15e212e95 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/prov/touchpoint/natives/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/.project b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/.project
index 064dd1a5c..c792f8985 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/.project
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.ui.admin.rcp</name>
+ <name>org.eclipse.equinox.p2.ui.admin.rcp</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF
index f14bd06ee..512631255 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.equinox.prov.ui.admin.rcp; singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.ui.admin.rcp; singleton:=true
Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.prov.ui.admin.rcp.Activator
+Bundle-Activator: org.eclipse.equinox.p2.ui.admin.rcp.Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Eclipse-LazyStart: true
-Import-Package: org.eclipse.equinox.prov.ui.admin
-Export-Package: org.eclipse.equinox.prov.ui.admin.rcp,
- org.eclipse.equinox.prov.ui.admin.rcp.internal;x-internal:=true
+Import-Package: org.eclipse.equinox.p2.ui.admin
+Export-Package: org.eclipse.equinox.internal.p2.ui.admin.rcp;x-internal:=true,
+ org.eclipse.equinox.p2.ui.admin.rcp
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch
index 0ac80976a..2caeb51ad 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/ProvAdminUI.launch
@@ -11,12 +11,12 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -product org.eclipse.equinox.prov.ui.admin.rcp.product"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog -product org.eclipse.equinox.p2.ui.admin.rcp.product"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.prov.data.area=d:/tmp/equinox.prov/agentData/"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.data.area=d:/tmp/equinox.p2/agentData/"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jface@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.osgi.services@default:default,org.eclipse.swt@default:default,org.eclipse.swt.win32.win32.x86@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<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.prov.ui@default:default,org.eclipse.equinox.prov.ui.admin@default:default,org.eclipse.equinox.prov.ui.admin.rcp@default:default,org.eclipse.equinox.prov.ui.sdk@default:default,org.eclipse.equinox.simpleconfigurator@default:true,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.osgi@:,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.p2.ui@default:default,org.eclipse.equinox.p2.ui.admin@default:default,org.eclipse.equinox.p2.ui.admin.rcp@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.simpleconfigurator@default:true,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.osgi@:,org.mozilla.rhino@default:default"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini
index c3e1629ad..251040c29 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/config.ini
@@ -18,20 +18,20 @@ osgi.bundles=\
org.eclipse.equinox.launcher,\
org.eclipse.equinox.launcher.win32.win32.x86,\
org.eclipse.equinox.preferences,\
- org.eclipse.equinox.prov.artifact.repository,\
- org.eclipse.equinox.prov.console,\
- org.eclipse.equinox.prov.core,\
- org.eclipse.equinox.prov.director,\
- org.eclipse.equinox.prov.download,\
- org.eclipse.equinox.prov.engine,\
- org.eclipse.equinox.prov.examplarysetup@start,\
- org.eclipse.equinox.prov.metadata,\
- org.eclipse.equinox.prov.metadata.repository,\
- org.eclipse.equinox.prov.touchpoint.eclipse,\
- org.eclipse.equinox.prov.touchpoint.natives,\
- org.eclipse.equinox.prov.ui,\
- org.eclipse.equinox.prov.ui.admin,\
- org.eclipse.equinox.prov.ui.admin.rcp,\
+ org.eclipse.equinox.p2.artifact.repository,\
+ org.eclipse.equinox.p2.console,\
+ org.eclipse.equinox.p2.core,\
+ org.eclipse.equinox.p2.director,\
+ org.eclipse.equinox.p2.download,\
+ org.eclipse.equinox.p2.engine,\
+ org.eclipse.equinox.p2.examplarysetup@start,\
+ org.eclipse.equinox.p2.metadata,\
+ org.eclipse.equinox.p2.metadata.repository,\
+ org.eclipse.equinox.p2.touchpoint.eclipse,\
+ org.eclipse.equinox.p2.touchpoint.natives,\
+ org.eclipse.equinox.p2.ui,\
+ org.eclipse.equinox.p2.ui.admin,\
+ org.eclipse.equinox.p2.ui.admin.rcp,\
org.eclipse.equinox.registry,\
org.eclipse.equinox.simpleconfigurator@1:start,\
org.eclipse.equinox.simpleconfigurator.manipulator@start,\
@@ -44,6 +44,6 @@ osgi.bundles=\
org.eclipse.ui,\
org.eclipse.ui.workbench,\
org.mozilla.rhino
-eclipse.product=org.eclipse.equinox.prov.ui.admin.rcp.product
+eclipse.product=org.eclipse.equinox.p2.ui.admin.rcp.product
org.eclipse.equinox.simpleconfigurator.useReference=true
org.eclipse.update.reconcile=false \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml
index c63da009f..f6d50c965 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml
@@ -3,11 +3,11 @@
<plugin>
<extension
- id="org.eclipse.equinox.prov.ui.admin.rcp.application"
+ id="org.eclipse.equinox.p2.ui.admin.rcp.application"
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.eclipse.equinox.prov.ui.admin.rcp.Application">
+ class="org.eclipse.equinox.p2.ui.admin.rcp.Application">
</run>
</application>
</extension>
@@ -16,7 +16,7 @@
id="product">
<product
name="%productName"
- application="org.eclipse.equinox.prov.ui.admin.rcp.application">
+ application="org.eclipse.equinox.p2.ui.admin.rcp.application">
<property
name="appName"
value="%productName"/>
@@ -25,7 +25,7 @@
value="%aboutText"/>
<property
name="windowImages"
- value="platform:/plugin/org.eclipse.equinox.prov.ui.admin/icons/provision.gif"/>
+ value="platform:/plugin/org.eclipse.equinox.p2.ui.admin/icons/provision.gif"/>
</product>
</extension>
@@ -34,8 +34,8 @@
point="org.eclipse.ui.perspectives">
<perspective
name="%perspectiveName"
- class="org.eclipse.equinox.prov.ui.admin.rcp.ProvisioningRCPPerspective"
- id="org.eclipse.equinox.prov.ui.admin.rcp.ProvisioningRCPPerspective">
+ class="org.eclipse.equinox.p2.ui.admin.rcp.ProvisioningRCPPerspective"
+ id="org.eclipse.equinox.p2.ui.admin.rcp.ProvisioningRCPPerspective">
</perspective>
</extension>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product
index f22b139ee..cf825570f 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.1"?>
-<product name="%productName" id="org.eclipse.equinox.prov.ui.admin.rcp.product" application="org.eclipse.equinox.prov.ui.admin.rcp.application" useFeatures="false">
+<product name="%productName" id="org.eclipse.equinox.p2.ui.admin.rcp.product" application="org.eclipse.equinox.p2.ui.admin.rcp.application" useFeatures="false">
<aboutInfo>
<text>
@@ -9,13 +9,13 @@
</text>
</aboutInfo>
- <configIni use="custom" path="/org.eclipse.equinox.prov.ui.admin.rcp/config.ini"/>
+ <configIni use="custom" path="/org.eclipse.equinox.p2.ui.admin.rcp/config.ini"/>
<launcherArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
- <windowImages i16="/org.eclipse.equinox.prov.ui.admin/icons/provision.gif"/>
+ <windowImages i16="/org.eclipse.equinox.p2.ui.admin/icons/provision.gif"/>
<launcher name="eclipse">
<solaris/>
@@ -47,20 +47,20 @@
<plugin id="org.eclipse.equinox.launcher"/>
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
<plugin id="org.eclipse.equinox.preferences"/>
- <plugin id="org.eclipse.equinox.prov.artifact.repository"/>
- <plugin id="org.eclipse.equinox.prov.console"/>
- <plugin id="org.eclipse.equinox.prov.core"/>
- <plugin id="org.eclipse.equinox.prov.director"/>
- <plugin id="org.eclipse.equinox.prov.download"/>
- <plugin id="org.eclipse.equinox.prov.engine"/>
- <plugin id="org.eclipse.equinox.prov.examplarysetup"/>
- <plugin id="org.eclipse.equinox.prov.metadata"/>
- <plugin id="org.eclipse.equinox.prov.metadata.repository"/>
- <plugin id="org.eclipse.equinox.prov.touchpoint.eclipse"/>
- <plugin id="org.eclipse.equinox.prov.touchpoint.natives"/>
- <plugin id="org.eclipse.equinox.prov.ui"/>
- <plugin id="org.eclipse.equinox.prov.ui.admin"/>
- <plugin id="org.eclipse.equinox.prov.ui.admin.rcp"/>
+ <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
+ <plugin id="org.eclipse.equinox.p2.console"/>
+ <plugin id="org.eclipse.equinox.p2.core"/>
+ <plugin id="org.eclipse.equinox.p2.director"/>
+ <plugin id="org.eclipse.equinox.p2.download"/>
+ <plugin id="org.eclipse.equinox.p2.engine"/>
+ <plugin id="org.eclipse.equinox.p2.examplarysetup"/>
+ <plugin id="org.eclipse.equinox.p2.metadata"/>
+ <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+ <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
+ <plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
+ <plugin id="org.eclipse.equinox.p2.ui"/>
+ <plugin id="org.eclipse.equinox.p2.ui.admin"/>
+ <plugin id="org.eclipse.equinox.p2.ui.admin.rcp"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.simpleconfigurator"/>
<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/internal/ProvAdminUIMessages.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ProvAdminUIMessages.java
index d24ca11c6..c64438c04 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/internal/ProvAdminUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/ProvAdminUIMessages.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp.internal;
+package org.eclipse.equinox.internal.p2.ui.admin.rcp;
import org.eclipse.osgi.util.NLS;
@@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS;
* @since 3.4
*/
public class ProvAdminUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.prov.ui.admin.rcp.internal.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.ui.admin.rcp.messages"; //$NON-NLS-1$
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, ProvAdminUIMessages.class);
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/internal/messages.properties b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/messages.properties
index e5decd174..e5decd174 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/internal/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/internal/p2/ui/admin/rcp/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/Activator.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Activator.java
index 832c8a5ba..339227418 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Activator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp;
+package org.eclipse.equinox.p2.ui.admin.rcp;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.equinox.prov.ui.admin.rcp"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.equinox.p2.ui.admin.rcp"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/Application.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Application.java
index 08892b0b0..3daa5adfe 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/Application.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/Application.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp;
+package org.eclipse.equinox.p2.ui.admin.rcp;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationActionBarAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java
index ed92eb3df..71ba9b66e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationActionBarAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationActionBarAdvisor.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp;
+package org.eclipse.equinox.p2.ui.admin.rcp;
-import org.eclipse.equinox.prov.ui.admin.rcp.internal.ProvAdminUIMessages;
+import org.eclipse.equinox.internal.p2.ui.admin.rcp.ProvAdminUIMessages;
import org.eclipse.jface.action.*;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ActionFactory;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationWorkbenchAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java
index 2d1e4ba9f..ba37a335e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationWorkbenchAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchAdvisor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp;
+package org.eclipse.equinox.p2.ui.admin.rcp;
import org.eclipse.ui.application.*;
@@ -19,6 +19,6 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
}
public String getInitialWindowPerspectiveId() {
- return "org.eclipse.equinox.prov.ui.admin.rcp.ProvisioningRCPPerspective"; //$NON-NLS-1$
+ return "org.eclipse.equinox.p2.ui.admin.rcp.ProvisioningRCPPerspective"; //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java
index 2b3fd8179..8035820c2 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ApplicationWorkbenchWindowAdvisor.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp;
+package org.eclipse.equinox.p2.ui.admin.rcp;
-import org.eclipse.equinox.prov.ui.admin.rcp.internal.ProvAdminUIMessages;
+import org.eclipse.equinox.internal.p2.ui.admin.rcp.ProvAdminUIMessages;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.application.*;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ProvisioningRCPPerspective.java b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ProvisioningRCPPerspective.java
index 80498e8b9..08f3d266d 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/prov/ui/admin/rcp/ProvisioningRCPPerspective.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/src/org/eclipse/equinox/p2/ui/admin/rcp/ProvisioningRCPPerspective.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.rcp;
+package org.eclipse.equinox.p2.ui.admin.rcp;
import org.eclipse.ui.*;
@@ -21,9 +21,9 @@ import org.eclipse.ui.*;
public class ProvisioningRCPPerspective implements IPerspectiveFactory {
private IPageLayout factory;
- private static final String METADATA_REPOSITORIES = "org.eclipse.prov.ui.admin.MetadataRepositoriesView"; //$NON-NLS-1$
- private static final String ARTIFACT_REPOSITORIES = "org.eclipse.prov.ui.admin.ArtifactRepositoriesView"; //$NON-NLS-1$
- private static final String PROFILES = "org.eclipse.prov.ui.admin.ProfilesView"; //$NON-NLS-1$
+ private static final String METADATA_REPOSITORIES = "org.eclipse.p2.ui.admin.MetadataRepositoriesView"; //$NON-NLS-1$
+ private static final String ARTIFACT_REPOSITORIES = "org.eclipse.p2.ui.admin.ArtifactRepositoriesView"; //$NON-NLS-1$
+ private static final String PROFILES = "org.eclipse.p2.ui.admin.ProfilesView"; //$NON-NLS-1$
public ProvisioningRCPPerspective() {
super();
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/.project b/bundles/org.eclipse.equinox.p2.ui.admin/.project
index d05dfc699..f304937f5 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/.project
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.ui.admin</name>
+ <name>org.eclipse.equinox.p2.ui.admin</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF
index 9d6aa5300..44fc2b95b 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/META-INF/MANIFEST.MF
@@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.equinox.prov.ui.admin;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.ui.admin;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator
+Bundle-Activator: org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
-Import-Package: org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.ui,
- org.eclipse.equinox.prov.ui.actions,
- org.eclipse.equinox.prov.ui.dialogs,
- org.eclipse.equinox.prov.ui.model,
- org.eclipse.equinox.prov.ui.operations,
- org.eclipse.equinox.prov.ui.viewers,
+Import-Package: org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.ui.actions,
+ org.eclipse.equinox.p2.ui.dialogs,
+ org.eclipse.equinox.p2.ui.model,
+ org.eclipse.equinox.p2.ui.operations,
+ org.eclipse.equinox.p2.ui.viewers,
org.eclipse.osgi.service.environment;version="1.0.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0"
-Export-Package: org.eclipse.equinox.prov.ui.admin,
- org.eclipse.equinox.prov.ui.admin.internal;x-internal:=true,
- org.eclipse.equinox.prov.ui.admin.internal.dialogs;x-internal:=true,
- org.eclipse.equinox.prov.ui.admin.internal.preferences;x-internal:=true
+Export-Package: org.eclipse.equinox.internal.p2.ui.admin;x-internal:=true,
+ org.eclipse.equinox.internal.p2.ui.admin.dialogs;x-internal:=true,
+ org.eclipse.equinox.internal.p2.ui.admin.preferences;x-internal:=true,
+ org.eclipse.equinox.p2.ui.admin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
index 2c435a539..579b97bf8 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
@@ -5,28 +5,28 @@
point="org.eclipse.ui.preferencePages">
<page
name="%Provisioning.title"
- class="org.eclipse.equinox.prov.ui.admin.internal.preferences.ProvisioningPrefPage"
- id="org.eclipse.prov.ui.preferences.ProvisioningPrefPage">
+ class="org.eclipse.equinox.internal.p2.ui.admin.preferences.ProvisioningPrefPage"
+ id="org.eclipse.p2.ui.preferences.ProvisioningPrefPage">
</page>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
- class="org.eclipse.equinox.prov.ui.admin.internal.preferences.ProvUIPreferenceInitializer">
+ class="org.eclipse.equinox.internal.p2.ui.admin.preferences.ProvUIPreferenceInitializer">
</initializer>
</extension>
<extension
point="org.eclipse.ui.views">
<category
name="%viewCategoryName"
- id="org.eclipse.prov.ui.admin">
+ id="org.eclipse.p2.ui.admin">
</category>
<view
name="%MetadataRepositories.name"
icon="$nl$/icons/obj/metadata_repo_obj.gif"
- category="org.eclipse.prov.ui.admin"
- class="org.eclipse.equinox.prov.ui.admin.internal.MetadataRepositoriesView"
- id="org.eclipse.prov.ui.admin.MetadataRepositoriesView">
+ category="org.eclipse.p2.ui.admin"
+ class="org.eclipse.equinox.internal.p2.ui.admin.MetadataRepositoriesView"
+ id="org.eclipse.p2.ui.admin.MetadataRepositoriesView">
</view>
</extension>
<extension
@@ -34,9 +34,9 @@
<view
name="%ArtifactRepositories.name"
icon="$nl$/icons/obj/artifact_repo_obj.gif"
- category="org.eclipse.prov.ui.admin"
- class="org.eclipse.equinox.prov.ui.admin.internal.ArtifactRepositoriesView"
- id="org.eclipse.prov.ui.admin.ArtifactRepositoriesView">
+ category="org.eclipse.p2.ui.admin"
+ class="org.eclipse.equinox.internal.p2.ui.admin.ArtifactRepositoriesView"
+ id="org.eclipse.p2.ui.admin.ArtifactRepositoriesView">
</view>
</extension>
<extension
@@ -44,9 +44,9 @@
<view
name="%Profiles.name"
icon="$nl$/icons/obj/profile_obj.gif"
- category="org.eclipse.prov.ui.admin"
- class="org.eclipse.equinox.prov.ui.admin.internal.ProfilesView"
- id="org.eclipse.prov.ui.admin.ProfilesView">
+ category="org.eclipse.p2.ui.admin"
+ class="org.eclipse.equinox.internal.p2.ui.admin.ProfilesView"
+ id="org.eclipse.p2.ui.admin.ProfilesView">
</view>
</extension>
@@ -55,33 +55,33 @@
<perspective
name="%perspectiveName"
icon="$nl$/icons/provision.gif"
- class="org.eclipse.equinox.prov.ui.admin.internal.ProvisioningPerspective"
- id="org.eclipse.equinox.prov.ui.admin.ProvisioningPerspective">
+ class="org.eclipse.equinox.internal.p2.ui.admin.ProvisioningPerspective"
+ id="org.eclipse.equinox.p2.ui.admin.ProvisioningPerspective">
</perspective>
</extension>
<extension
point="org.eclipse.ui.propertyPages">
<page
name="%Profile.name"
- class="org.eclipse.equinox.prov.ui.dialogs.ProfilePropertyPage"
- id="org.eclipse.equinox.prov.ui.admin.internal.dialogs.ProfilePropertyPage">
+ class="org.eclipse.equinox.p2.ui.dialogs.ProfilePropertyPage"
+ id="org.eclipse.equinox.p2.ui.admin.internal.dialogs.ProfilePropertyPage">
<enabledWhen>
<instanceof
- value="org.eclipse.equinox.prov.engine.Profile">
+ value="org.eclipse.equinox.p2.engine.Profile">
</instanceof>
</enabledWhen>
</page>
<page
name="%IU.name"
- class="org.eclipse.equinox.prov.ui.dialogs.IUImplementationPropertyPage"
- id="org.eclipse.equinox.prov.ui.admin.internal.dialogs.IUPropertyPage">
+ class="org.eclipse.equinox.p2.ui.dialogs.IUImplementationPropertyPage"
+ id="org.eclipse.equinox.p2.ui.admin.internal.dialogs.IUPropertyPage">
<enabledWhen>
<or>
<instanceof
- value="org.eclipse.equinox.prov.metadata.InstallableUnit">
+ value="org.eclipse.equinox.p2.metadata.InstallableUnit">
</instanceof>
<instanceof
- value="org.eclipse.equinox.prov.ui.model.InstalledIUElement">
+ value="org.eclipse.equinox.p2.ui.model.InstalledIUElement">
</instanceof>
</or>
@@ -90,15 +90,15 @@
<page
name="%Repository.name"
- class="org.eclipse.equinox.prov.ui.dialogs.RepositoryImplementationPropertyPage"
- id="org.eclipse.equinox.prov.ui.admin.internal.dialogs.RepositoryPropertyPage">
+ class="org.eclipse.equinox.p2.ui.dialogs.RepositoryImplementationPropertyPage"
+ id="org.eclipse.equinox.p2.ui.admin.internal.dialogs.RepositoryPropertyPage">
<enabledWhen>
<or>
<instanceof
- value="org.eclipse.equinox.prov.metadata.repository.IMetadataRepository">
+ value="org.eclipse.equinox.p2.metadata.repository.IMetadataRepository">
</instanceof>
<instanceof
- value="org.eclipse.equinox.prov.artifact.repository.IArtifactRepository">
+ value="org.eclipse.equinox.p2.artifact.repository.IArtifactRepository">
</instanceof>
</or>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ArtifactRepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java
index f5e8968e5..f389a933a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ArtifactRepositoriesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ArtifactRepositoriesView.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import java.util.ArrayList;
import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.ui.admin.internal.dialogs.AddArtifactRepositoryDialog;
-import org.eclipse.equinox.prov.ui.model.AllArtifactRepositories;
-import org.eclipse.equinox.prov.ui.model.ArtifactRepositoryContentProvider;
-import org.eclipse.equinox.prov.ui.operations.RemoveArtifactRepositoryOperation;
+import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddArtifactRepositoryDialog;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.ui.model.AllArtifactRepositories;
+import org.eclipse.equinox.p2.ui.model.ArtifactRepositoryContentProvider;
+import org.eclipse.equinox.p2.ui.operations.RemoveArtifactRepositoryOperation;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.swt.widgets.Shell;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/MetadataRepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java
index 3309fe1ad..abc9c10b7 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/MetadataRepositoriesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/MetadataRepositoriesView.java
@@ -8,23 +8,23 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import java.util.ArrayList;
import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.IProfileChooser;
-import org.eclipse.equinox.prov.ui.actions.BecomeAction;
-import org.eclipse.equinox.prov.ui.actions.InstallAction;
-import org.eclipse.equinox.prov.ui.admin.internal.dialogs.AddMetadataRepositoryDialog;
-import org.eclipse.equinox.prov.ui.admin.internal.dialogs.AddProfileDialog;
-import org.eclipse.equinox.prov.ui.model.*;
-import org.eclipse.equinox.prov.ui.operations.RemoveMetadataRepositoryOperation;
-import org.eclipse.equinox.prov.ui.viewers.IUDragAdapter;
-import org.eclipse.equinox.prov.ui.viewers.ProvElementLabelProvider;
+import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddMetadataRepositoryDialog;
+import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddProfileDialog;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.IProfileChooser;
+import org.eclipse.equinox.p2.ui.actions.BecomeAction;
+import org.eclipse.equinox.p2.ui.actions.InstallAction;
+import org.eclipse.equinox.p2.ui.model.*;
+import org.eclipse.equinox.p2.ui.operations.RemoveMetadataRepositoryOperation;
+import org.eclipse.equinox.p2.ui.viewers.IUDragAdapter;
+import org.eclipse.equinox.p2.ui.viewers.ProvElementLabelProvider;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.*;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProfilesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
index fd8db7c60..24d7edf49 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProfilesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProfilesView.java
@@ -8,24 +8,24 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.*;
-import org.eclipse.equinox.prov.ui.actions.*;
-import org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator;
-import org.eclipse.equinox.prov.ui.admin.internal.dialogs.AddProfileDialog;
-import org.eclipse.equinox.prov.ui.admin.internal.dialogs.UpdateAndInstallDialog;
-import org.eclipse.equinox.prov.ui.admin.internal.preferences.PreferenceConstants;
-import org.eclipse.equinox.prov.ui.model.*;
-import org.eclipse.equinox.prov.ui.operations.*;
-import org.eclipse.equinox.prov.ui.viewers.InstallIUDropAdapter;
-import org.eclipse.equinox.prov.ui.viewers.StructuredViewerProvisioningListener;
+import org.eclipse.equinox.internal.p2.ui.admin.dialogs.AddProfileDialog;
+import org.eclipse.equinox.internal.p2.ui.admin.dialogs.UpdateAndInstallDialog;
+import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.*;
+import org.eclipse.equinox.p2.ui.actions.*;
+import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
+import org.eclipse.equinox.p2.ui.model.*;
+import org.eclipse.equinox.p2.ui.operations.*;
+import org.eclipse.equinox.p2.ui.viewers.InstallIUDropAdapter;
+import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener;
import org.eclipse.jface.action.*;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvAdminUIMessages.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java
index daf98a5ca..07c515054 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvAdminUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIMessages.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import org.eclipse.osgi.util.NLS;
@@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS;
* @since 3.4
*/
public class ProvAdminUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.prov.ui.admin.internal.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.p2.ui.admin.internal.messages"; //$NON-NLS-1$
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, ProvAdminUIMessages.class);
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java
index ac99fd8e8..5203a5d9e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvView.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import java.util.ArrayList;
-import org.eclipse.equinox.prov.ui.ProvisioningUndoSupport;
-import org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator;
-import org.eclipse.equinox.prov.ui.admin.internal.preferences.PreferenceConstants;
-import org.eclipse.equinox.prov.ui.viewers.*;
+import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;
+import org.eclipse.equinox.p2.ui.ProvisioningUndoSupport;
+import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
+import org.eclipse.equinox.p2.ui.viewers.*;
import org.eclipse.jface.action.*;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvisioningPerspective.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvisioningPerspective.java
index 5b2cf5dd9..4a5e01d56 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/ProvisioningPerspective.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvisioningPerspective.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import org.eclipse.ui.*;
@@ -42,12 +42,12 @@ public class ProvisioningPerspective implements IPerspectiveFactory {
IFolderLayout bottom = factory.createFolder("bottomRight", //$NON-NLS-1$
IPageLayout.BOTTOM, 0.75f, factory.getEditorArea());
- bottom.addView("org.eclipse.prov.ui.admin.ProfilesView"); //$NON-NLS-1$
+ bottom.addView("org.eclipse.p2.ui.admin.ProfilesView"); //$NON-NLS-1$
IFolderLayout topLeft = factory.createFolder("topLeft", //$NON-NLS-1$
IPageLayout.LEFT, 0.4f, factory.getEditorArea());
- topLeft.addView("org.eclipse.prov.ui.admin.MetadataRepositoriesView"); //$NON-NLS-1$
- topLeft.addView("org.eclipse.prov.ui.admin.ArtifactRepositoriesView"); //$NON-NLS-1$
+ topLeft.addView("org.eclipse.p2.ui.admin.MetadataRepositoriesView"); //$NON-NLS-1$
+ topLeft.addView("org.eclipse.p2.ui.admin.ArtifactRepositoriesView"); //$NON-NLS-1$
}
private void addActionSets() {
@@ -63,9 +63,9 @@ public class ProvisioningPerspective implements IPerspectiveFactory {
}
private void addViewShortcuts() {
- factory.addShowViewShortcut("org.eclipse.prov.ui.admin.MetadataRepositoriesView"); //$NON-NLS-1$
- factory.addShowViewShortcut("org.eclipse.prov.ui.admin.ArtifactRepositoriesView"); //$NON-NLS-1$
- factory.addShowViewShortcut("org.eclipse.prov.ui.admin.ProfilesView"); //$NON-NLS-1$
+ factory.addShowViewShortcut("org.eclipse.p2.ui.admin.MetadataRepositoriesView"); //$NON-NLS-1$
+ factory.addShowViewShortcut("org.eclipse.p2.ui.admin.ArtifactRepositoriesView"); //$NON-NLS-1$
+ factory.addShowViewShortcut("org.eclipse.p2.ui.admin.ProfilesView"); //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/RepositoriesView.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
index 3c393d59f..040425452 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/RepositoriesView.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/RepositoriesView.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal;
+package org.eclipse.equinox.internal.p2.ui.admin;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.ui.*;
-import org.eclipse.equinox.prov.ui.viewers.StructuredViewerProvisioningListener;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.ui.*;
+import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener;
import org.eclipse.jface.action.*;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.widgets.Shell;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddArtifactRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java
index 4359dce73..7693692b4 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddArtifactRepositoryDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddArtifactRepositoryDialog.java
@@ -8,16 +8,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.dialogs;
+package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.ui.ProvUI;
-import org.eclipse.equinox.prov.ui.admin.internal.ProvAdminUIMessages;
-import org.eclipse.equinox.prov.ui.dialogs.AddRepositoryDialog;
-import org.eclipse.equinox.prov.ui.operations.AddArtifactRepositoryOperation;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.ui.ProvUI;
+import org.eclipse.equinox.p2.ui.dialogs.AddRepositoryDialog;
+import org.eclipse.equinox.p2.ui.operations.AddArtifactRepositoryOperation;
import org.eclipse.swt.widgets.Shell;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddMetadataRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java
index f226b99c5..82075517b 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddMetadataRepositoryDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddMetadataRepositoryDialog.java
@@ -8,16 +8,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.dialogs;
+package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ProvUI;
-import org.eclipse.equinox.prov.ui.admin.internal.ProvAdminUIMessages;
-import org.eclipse.equinox.prov.ui.dialogs.AddRepositoryDialog;
-import org.eclipse.equinox.prov.ui.operations.AddMetadataRepositoryOperation;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ProvUI;
+import org.eclipse.equinox.p2.ui.dialogs.AddRepositoryDialog;
+import org.eclipse.equinox.p2.ui.operations.AddMetadataRepositoryOperation;
import org.eclipse.swt.widgets.Shell;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddProfileDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
index 55affe105..45ea4a529 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/AddProfileDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/AddProfileDialog.java
@@ -8,18 +8,18 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.dialogs;
+package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.ProvUI;
-import org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator;
-import org.eclipse.equinox.prov.ui.admin.internal.ProvAdminUIMessages;
-import org.eclipse.equinox.prov.ui.dialogs.ProfileGroup;
-import org.eclipse.equinox.prov.ui.operations.AddProfileOperation;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.ProvUI;
+import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
+import org.eclipse.equinox.p2.ui.dialogs.ProfileGroup;
+import org.eclipse.equinox.p2.ui.operations.AddProfileOperation;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/UpdateAndInstallDialog.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java
index a09e789f7..d7e8bc2f5 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/dialogs/UpdateAndInstallDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/UpdateAndInstallDialog.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.dialogs;
+package org.eclipse.equinox.internal.p2.ui.admin.dialogs;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator;
-import org.eclipse.equinox.prov.ui.admin.internal.ProvAdminUIMessages;
-import org.eclipse.equinox.prov.ui.admin.internal.preferences.PreferenceConstants;
-import org.eclipse.equinox.prov.ui.dialogs.UpdateAndInstallGroup;
-import org.eclipse.equinox.prov.ui.viewers.IUGroupFilter;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
+import org.eclipse.equinox.internal.p2.ui.admin.preferences.PreferenceConstants;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
+import org.eclipse.equinox.p2.ui.dialogs.UpdateAndInstallGroup;
+import org.eclipse.equinox.p2.ui.viewers.IUGroupFilter;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/messages.properties b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
index cfa8be90e..cfa8be90e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/PreferenceConstants.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java
index 628c1fb77..605b994d1 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/PreferenceConstants.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/PreferenceConstants.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.preferences;
+package org.eclipse.equinox.internal.p2.ui.admin.preferences;
/**
* Constant definitions for plug-in preferences
*/
public class PreferenceConstants {
- public static final String PREF_CONFIRM_SELECTION_INSTALL = "org.eclipse.equinox.prov.ui.admin.confirmDragInstall"; //$NON-NLS-1$
- public static final String PREF_SHOW_GROUPS_ONLY = "org.eclipse.equinox.prov.ui.admin.showGroupsOnly"; //$NON-NLS-1$
- public static final String PREF_HIDE_IMPLEMENTATION_REPOS = "org.eclipse.equinox.prov.ui.admin.hideImplementationRepos"; //$NON-NLS-1$
+ public static final String PREF_CONFIRM_SELECTION_INSTALL = "org.eclipse.equinox.p2.ui.admin.confirmDragInstall"; //$NON-NLS-1$
+ public static final String PREF_SHOW_GROUPS_ONLY = "org.eclipse.equinox.p2.ui.admin.showGroupsOnly"; //$NON-NLS-1$
+ public static final String PREF_HIDE_IMPLEMENTATION_REPOS = "org.eclipse.equinox.p2.ui.admin.hideImplementationRepos"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/ProvUIPreferenceInitializer.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java
index ab9b5043d..2f2e35a52 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/ProvUIPreferenceInitializer.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvUIPreferenceInitializer.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.preferences;
+package org.eclipse.equinox.internal.p2.ui.admin.preferences;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator;
+import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
import org.eclipse.jface.preference.IPreferenceStore;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/ProvisioningPrefPage.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java
index 68dffc4b9..a19173222 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/internal/preferences/ProvisioningPrefPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/preferences/ProvisioningPrefPage.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin.internal.preferences;
+package org.eclipse.equinox.internal.p2.ui.admin.preferences;
-import org.eclipse.equinox.prov.ui.admin.ProvAdminUIActivator;
-import org.eclipse.equinox.prov.ui.admin.internal.ProvAdminUIMessages;
+import org.eclipse.equinox.internal.p2.ui.admin.ProvAdminUIMessages;
+import org.eclipse.equinox.p2.ui.admin.ProvAdminUIActivator;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.ui.IWorkbench;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/ProvAdminUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/p2/ui/admin/ProvAdminUIActivator.java
index a46fd9cfc..99ec032ce 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/prov/ui/admin/ProvAdminUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/p2/ui/admin/ProvAdminUIActivator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.admin;
+package org.eclipse.equinox.p2.ui.admin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -22,8 +22,8 @@ public class ProvAdminUIActivator extends AbstractUIPlugin {
private static ProvAdminUIActivator plugin;
private static BundleContext context;
- public static final String PLUGIN_ID = "org.eclipse.equinox.prov.ui.admin"; //$NON-NLS-1$
- public static final String PERSPECTIVE_ID = "org.eclipse.equinox.prov.ui.admin.ProvisioningPerspective"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.equinox.p2.ui.admin"; //$NON-NLS-1$
+ public static final String PERSPECTIVE_ID = "org.eclipse.equinox.p2.ui.admin.ProvisioningPerspective"; //$NON-NLS-1$
public static BundleContext getContext() {
return context;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/.project b/bundles/org.eclipse.equinox.p2.ui.sdk/.project
index a369fefa9..4b1e077a3 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/.project
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.ui.sdk</name>
+ <name>org.eclipse.equinox.p2.ui.sdk</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
index 156411c32..bb8c2814d 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
@@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.equinox.prov.ui.sdk;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.ui.sdk;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.prov.ui.internal.sdk.ProvSDKUIActivator
-Import-Package: org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core,
- org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.director,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.query,
- org.eclipse.equinox.prov.ui,
- org.eclipse.equinox.prov.ui.actions,
- org.eclipse.equinox.prov.ui.dialogs,
- org.eclipse.equinox.prov.ui.model,
- org.eclipse.equinox.prov.ui.operations,
- org.eclipse.equinox.prov.ui.viewers,
+Bundle-Activator: org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator
+Import-Package: org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.director,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.ui.actions,
+ org.eclipse.equinox.p2.ui.dialogs,
+ org.eclipse.equinox.p2.ui.model,
+ org.eclipse.equinox.p2.ui.operations,
+ org.eclipse.equinox.p2.ui.viewers,
org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.packageadmin;version="1.2.0"
-Export-Package: org.eclipse.equinox.prov.ui.internal.sdk;x-internal:=true
+Export-Package: org.eclipse.equinox.internal.p2.ui.sdk;x-internal:=true
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
index 1eef16c6f..69b23f390 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
@@ -5,25 +5,25 @@
point="org.eclipse.ui.propertyPages">
<page
name="%Profile.name"
- class="org.eclipse.equinox.prov.ui.dialogs.ProfilePropertyPage"
- id="org.eclipse.equinox.prov.ui.internal.sdk.ProfilePropertyPage">
+ class="org.eclipse.equinox.p2.ui.dialogs.ProfilePropertyPage"
+ id="org.eclipse.equinox.p2.ui.internal.sdk.ProfilePropertyPage">
<enabledWhen>
<instanceof
- value="org.eclipse.equinox.prov.engine.Profile">
+ value="org.eclipse.equinox.p2.engine.Profile">
</instanceof>
</enabledWhen>
</page>
<page
name="%IU.name"
- class="org.eclipse.equinox.prov.ui.dialogs.IUPropertyPage"
- id="org.eclipse.equinox.prov.ui.internal.sdk.IUPropertyPage">
+ class="org.eclipse.equinox.p2.ui.dialogs.IUPropertyPage"
+ id="org.eclipse.equinox.p2.ui.internal.sdk.IUPropertyPage">
<enabledWhen>
<or>
<instanceof
- value="org.eclipse.equinox.prov.metadata.InstallableUnit">
+ value="org.eclipse.equinox.p2.metadata.InstallableUnit">
</instanceof>
<instanceof
- value="org.eclipse.equinox.prov.ui.model.InstalledIUElement">
+ value="org.eclipse.equinox.p2.ui.model.InstalledIUElement">
</instanceof>
</or>
@@ -32,11 +32,11 @@
<page
name="%Repository.name"
- class="org.eclipse.equinox.prov.ui.dialogs.ColocatedRepositoryPropertyPage"
- id="org.eclipse.equinox.prov.ui.internal.sdk.ColocatedRepositoryPropertyPage">
+ class="org.eclipse.equinox.p2.ui.dialogs.ColocatedRepositoryPropertyPage"
+ id="org.eclipse.equinox.p2.ui.internal.sdk.ColocatedRepositoryPropertyPage">
<enabledWhen>
<instanceof
- value="org.eclipse.equinox.prov.metadata.repository.IMetadataRepository">
+ value="org.eclipse.equinox.p2.metadata.repository.IMetadataRepository">
</instanceof>
</enabledWhen>
</page>
@@ -48,14 +48,14 @@
point="org.eclipse.ui.commands">
<command
name="%Update.command"
- id="org.eclipse.equinox.prov.ui.sdk.update">
+ id="org.eclipse.equinox.p2.ui.sdk.update">
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
- commandId="org.eclipse.equinox.prov.ui.sdk.update"
- class="org.eclipse.equinox.prov.ui.internal.sdk.UpdateHandler">
+ commandId="org.eclipse.equinox.p2.ui.sdk.update"
+ class="org.eclipse.equinox.internal.p2.ui.sdk.UpdateHandler">
</handler>
</extension>
<extension
@@ -63,8 +63,8 @@
<menuContribution
locationURI="menu:help?after=additions">
<command
- commandId="org.eclipse.equinox.prov.ui.sdk.update"
- id="org.eclipse.equinox.prov.ui.sdk.update">
+ commandId="org.eclipse.equinox.p2.ui.sdk.update"
+ id="org.eclipse.equinox.p2.ui.sdk.update">
</command>
</menuContribution>
</extension>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/ProvSDKMessages.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKMessages.java
index c4c534a6b..ec6c45297 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/ProvSDKMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKMessages.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal.sdk;
+package org.eclipse.equinox.internal.p2.ui.sdk;
import org.eclipse.osgi.util.NLS;
@@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS;
* @since 3.4
*/
public class ProvSDKMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.prov.ui.internal.sdk.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.ui.sdk.messages"; //$NON-NLS-1$
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, ProvSDKMessages.class);
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/ProvSDKUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
index 13bd46d9d..e5a36a46c 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/ProvSDKUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal.sdk;
+package org.eclipse.equinox.internal.p2.ui.sdk;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -22,7 +22,7 @@ public class ProvSDKUIActivator extends AbstractUIPlugin {
private static ProvSDKUIActivator plugin;
private static BundleContext context;
- public static final String PLUGIN_ID = "org.eclipse.equinox.prov.ui.sdk"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.equinox.p2.ui.sdk"; //$NON-NLS-1$
public static BundleContext getContext() {
return context;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/RepositoryManipulationDialog.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java
index 43cbf9d23..803dd34ea 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/RepositoryManipulationDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/RepositoryManipulationDialog.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal.sdk;
+package org.eclipse.equinox.internal.p2.ui.sdk;
-import org.eclipse.equinox.prov.ui.dialogs.ColocatedRepositoryManipulatorGroup;
-import org.eclipse.equinox.prov.ui.viewers.InternalRepositoryFilter;
+import org.eclipse.equinox.p2.ui.dialogs.ColocatedRepositoryManipulatorGroup;
+import org.eclipse.equinox.p2.ui.viewers.InternalRepositoryFilter;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.resource.JFaceResources;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/UpdateAndInstallDialog.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java
index c07a2fdcd..79fdfd2e7 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/UpdateAndInstallDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateAndInstallDialog.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal.sdk;
+package org.eclipse.equinox.internal.p2.ui.sdk;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.ui.IRepositoryManipulator;
-import org.eclipse.equinox.prov.ui.dialogs.UpdateAndInstallGroup;
-import org.eclipse.equinox.prov.ui.viewers.IUPropertyFilter;
-import org.eclipse.equinox.prov.ui.viewers.IUGroupFilter;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.ui.IRepositoryManipulator;
+import org.eclipse.equinox.p2.ui.dialogs.UpdateAndInstallGroup;
+import org.eclipse.equinox.p2.ui.viewers.IUGroupFilter;
+import org.eclipse.equinox.p2.ui.viewers.IUPropertyFilter;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.resource.JFaceResources;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/UpdateHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
index 83452419b..4189c31b8 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/UpdateHandler.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal.sdk;
+package org.eclipse.equinox.internal.p2.ui.sdk;
import org.eclipse.core.commands.*;
-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.ui.ProvisioningUtil;
-import org.eclipse.equinox.prov.ui.model.AllProfiles;
-import org.eclipse.equinox.prov.ui.model.ProfileFactory;
+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.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.ui.model.AllProfiles;
+import org.eclipse.equinox.p2.ui.model.ProfileFactory;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/messages.properties b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties
index ee6f052ed..ee6f052ed 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/prov/ui/internal/sdk/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.ui/.project b/bundles/org.eclipse.equinox.p2.ui/.project
index 3ded96843..981de7141 100644
--- a/bundles/org.eclipse.equinox.p2.ui/.project
+++ b/bundles/org.eclipse.equinox.p2.ui/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.prov.ui</name>
+ <name>org.eclipse.equinox.p2.ui</name>
<comment></comment>
<projects>
</projects>
diff --git a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
index eaab7942f..1095a26af 100644
--- a/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui/META-INF/MANIFEST.MF
@@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-SymbolicName: org.eclipse.equinox.prov.ui;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.p2.ui;singleton:=true
Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.prov.ui.ProvUIActivator
-Import-Package: org.eclipse.equinox.prov.artifact.repository,
- org.eclipse.equinox.prov.core,
- org.eclipse.equinox.prov.core.eventbus,
- org.eclipse.equinox.prov.core.helpers,
- org.eclipse.equinox.prov.core.repository,
- org.eclipse.equinox.prov.director,
- org.eclipse.equinox.prov.engine,
- org.eclipse.equinox.prov.metadata,
- org.eclipse.equinox.prov.metadata.repository,
- org.eclipse.equinox.prov.query,
- org.eclipse.equinox.configurator,
+Bundle-Activator: org.eclipse.equinox.p2.ui.ProvUIActivator
+Import-Package: org.eclipse.equinox.configurator,
+ org.eclipse.equinox.p2.artifact.repository,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.core.eventbus,
+ org.eclipse.equinox.p2.core.helpers,
+ org.eclipse.equinox.p2.core.repository,
+ org.eclipse.equinox.p2.director,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.metadata,
+ org.eclipse.equinox.p2.metadata.repository,
+ org.eclipse.equinox.p2.query,
org.eclipse.osgi.service.resolver;version="1.1.0",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.packageadmin;version="1.2.0"
-Export-Package: org.eclipse.equinox.prov.ui,
- org.eclipse.equinox.prov.ui.actions,
- org.eclipse.equinox.prov.ui.dialogs,
- org.eclipse.equinox.prov.ui.internal;x-internal:=true,
- org.eclipse.equinox.prov.ui.model,
- org.eclipse.equinox.prov.ui.operations,
- org.eclipse.equinox.prov.ui.viewers
+Export-Package: org.eclipse.equinox.internal.p2.ui;x-internal:=true,
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.ui.actions,
+ org.eclipse.equinox.p2.ui.dialogs,
+ org.eclipse.equinox.p2.ui.model,
+ org.eclipse.equinox.p2.ui.operations,
+ org.eclipse.equinox.p2.ui.viewers
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.equinox.simpleconfigurator
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ApplyProfileChangesDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ApplyProfileChangesDialog.java
index 14f24df31..0b00b60b0 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ApplyProfileChangesDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ApplyProfileChangesDialog.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal;
+package org.eclipse.equinox.internal.p2.ui;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ProvUIMessages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
index d6de480cd..6e3c07d8d 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ProvUIMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIMessages.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal;
+package org.eclipse.equinox.internal.p2.ui;
import org.eclipse.osgi.util.NLS;
@@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS;
* @since 3.4
*/
public class ProvUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.equinox.prov.ui.internal.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.equinox.internal.p2.ui.messages"; //$NON-NLS-1$
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, ProvUIMessages.class);
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ProvisioningPropertyManager.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningPropertyManager.java
index e03700cd0..6f9bc1a26 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/ProvisioningPropertyManager.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningPropertyManager.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.internal;
+package org.eclipse.equinox.internal.p2.ui;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.util.IPropertyChangeListener;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/messages.properties b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
index 80932b4a2..80932b4a2 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/internal/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/messages.properties
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ColocatedRepositoryInfo.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ColocatedRepositoryInfo.java
index 0a59a8b78..6dd38972a 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ColocatedRepositoryInfo.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ColocatedRepositoryInfo.java
@@ -9,12 +9,12 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import java.net.URL;
-import org.eclipse.equinox.prov.core.helpers.UnmodifiableProperties;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.core.helpers.UnmodifiableProperties;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
/**
* Repository info for a colocated repository.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ColocatedRepositoryUtil.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ColocatedRepositoryUtil.java
index d4ec3eb96..cdd815bc8 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ColocatedRepositoryUtil.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ColocatedRepositoryUtil.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IProfileChooser.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java
index 5847a7e52..b8144392a 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IProfileChooser.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProfileChooser.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
-import org.eclipse.equinox.prov.engine.Profile;
+import org.eclipse.equinox.p2.engine.Profile;
/**
* Interface for a mechanism that chooses a profile from the profile registry.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IProvisioningProperties.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProvisioningProperties.java
index d7481f5c0..125f782d2 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IProvisioningProperties.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IProvisioningProperties.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
/**
* Temporary class
@@ -20,8 +20,8 @@ package org.eclipse.equinox.prov.ui;
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=197701
public interface IProvisioningProperties {
- public final static String REPO_ADDED = "org.eclipse.equinox.prov.ui.property.repoadded"; //$NON-NLS-1$
- public final static String REPO_NAME = "org.eclipse.equinox.prov.ui.property.reponame"; //$NON-NLS-1$
- public final static String REPO_REMOVED = "org.eclipse.equinox.prov.ui.property.reporemoved"; //$NON-NLS-1$
+ public final static String REPO_ADDED = "org.eclipse.equinox.p2.ui.property.repoadded"; //$NON-NLS-1$
+ public final static String REPO_NAME = "org.eclipse.equinox.p2.ui.property.reponame"; //$NON-NLS-1$
+ public final static String REPO_REMOVED = "org.eclipse.equinox.p2.ui.property.reporemoved"; //$NON-NLS-1$
} \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IRepositoryManipulator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java
index 3c8722e4e..9b2df4f01 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/IRepositoryManipulator.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/IRepositoryManipulator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import org.eclipse.swt.widgets.Shell;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java
index 258178e42..a09162da6 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUI.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUI.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import org.eclipse.core.runtime.*;
import org.eclipse.swt.widgets.Display;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUIActivator.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIActivator.java
index b80228ab3..1ae6a434f 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIActivator.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
-import org.eclipse.equinox.prov.core.eventbus.ProvisioningEventBus;
-import org.eclipse.equinox.prov.ui.internal.ProvisioningPropertyManager;
-import org.eclipse.equinox.prov.ui.viewers.StructuredViewerProvisioningListener;
+import org.eclipse.equinox.internal.p2.ui.ProvisioningPropertyManager;
+import org.eclipse.equinox.p2.core.eventbus.ProvisioningEventBus;
+import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -34,7 +34,7 @@ public class ProvUIActivator extends AbstractUIPlugin {
private static ProvUIActivator plugin;
private ProvisioningPropertyManager propertyManager = new ProvisioningPropertyManager();
- public static final String PLUGIN_ID = "org.eclipse.equinox.prov.ui"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.equinox.p2.ui"; //$NON-NLS-1$
public static BundleContext getContext() {
return context;
@@ -85,7 +85,7 @@ public class ProvUIActivator extends AbstractUIPlugin {
// infrastructure
// because the Eclipse Application launch config won't let me specify
// bundles to start.
- getBundle("org.eclipse.equinox.prov.examplarysetup").start(); //$NON-NLS-1$
+ getBundle("org.eclipse.equinox.p2.examplarysetup").start(); //$NON-NLS-1$
getBundle("org.eclipse.equinox.frameworkadmin.equinox").start(); //$NON-NLS-1$
getBundle("org.eclipse.equinox.simpleconfigurator.manipulator").start(); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java
index 42fdb2054..9b9b82a2b 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvUIImages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvUIImages.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
/**
* ProvUIImages provides convenience methods for accessing shared images
- * provided by the <i>org.eclipse.equinox.prov.ui</i> plug-in.
+ * provided by the <i>org.eclipse.equinox.p2.ui</i> plug-in.
* <p>
* This class provides <code>ImageDescriptor</code>s for each named image in
* {@link ProvUIImages}. All <code>Image</code> objects created from the
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvisioningUndoSupport.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUndoSupport.java
index fc583ac48..0cd0d58eb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvisioningUndoSupport.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUndoSupport.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.commands.ExecutionException;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvisioningUtil.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUtil.java
index c4a1af2bc..7b05d9882 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/ProvisioningUtil.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/ProvisioningUtil.java
@@ -9,30 +9,30 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui;
+package org.eclipse.equinox.p2.ui;
import java.io.IOException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
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.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.core.repository.IWritableRepositoryInfo;
-import org.eclipse.equinox.prov.director.IDirector;
-import org.eclipse.equinox.prov.director.Oracle;
-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.prov.ui.internal.ApplyProfileChangesDialog;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ApplyProfileChangesDialog;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+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.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.IWritableRepositoryInfo;
+import org.eclipse.equinox.p2.director.IDirector;
+import org.eclipse.equinox.p2.director.Oracle;
+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.jface.util.PropertyChangeEvent;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.osgi.util.NLS;
@@ -86,7 +86,7 @@ public class ProvisioningUtil {
}
// TODO need to get rid of this string constant. see bug #196862
String repositoryName = location + " - artifacts"; //$NON-NLS-1$
- IArtifactRepository repository = manager.createRepository(location, repositoryName, "org.eclipse.equinox.prov.artifact.repository.simpleRepository"); //$NON-NLS-1$
+ IArtifactRepository repository = manager.createRepository(location, repositoryName, "org.eclipse.equinox.p2.artifact.repository.simpleRepository"); //$NON-NLS-1$
if (repository == null) {
throw new ProvisionException(NLS.bind(ProvUIMessages.ProvisioningUtil_AddRepositoryFailure, location));
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/BecomeAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/BecomeAction.java
index 5b6ab1d70..dd15a5070 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/BecomeAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/BecomeAction.java
@@ -9,14 +9,14 @@
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.ui.actions;
+package org.eclipse.equinox.p2.ui.actions;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.IProfileChooser;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.operations.*;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.IProfileChooser;
+import org.eclipse.equinox.p2.ui.operations.*;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.widgets.Shell;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/InstallAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java
index c3e59c4bc..111ba8418 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/InstallAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/InstallAction.java
@@ -9,15 +9,15 @@
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.ui.actions;
+package org.eclipse.equinox.p2.ui.actions;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.*;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.operations.*;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.*;
+import org.eclipse.equinox.p2.ui.operations.*;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.window.Window;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/ProfileModificationAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/ProfileModificationAction.java
index 6b22afaa7..bd8e11cce 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/ProfileModificationAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/ProfileModificationAction.java
@@ -9,20 +9,20 @@
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.ui.actions;
+package org.eclipse.equinox.p2.ui.actions;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.*;
-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.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.*;
-import org.eclipse.equinox.prov.ui.operations.IOperationConfirmer;
-import org.eclipse.equinox.prov.ui.operations.ProfileModificationOperation;
+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.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.*;
+import org.eclipse.equinox.p2.ui.operations.IOperationConfirmer;
+import org.eclipse.equinox.p2.ui.operations.ProfileModificationOperation;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelectionProvider;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/ProvisioningAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/ProvisioningAction.java
index d84a5b41b..0933c3ff8 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/ProvisioningAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/ProvisioningAction.java
@@ -9,9 +9,9 @@
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.ui.actions;
+package org.eclipse.equinox.p2.ui.actions;
-import org.eclipse.equinox.prov.ui.operations.IOperationConfirmer;
+import org.eclipse.equinox.p2.ui.operations.IOperationConfirmer;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/UninstallAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java
index 1015c443c..751ffeece 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/UninstallAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UninstallAction.java
@@ -9,14 +9,14 @@
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.ui.actions;
+package org.eclipse.equinox.p2.ui.actions;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.IProfileChooser;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.operations.*;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.IProfileChooser;
+import org.eclipse.equinox.p2.ui.operations.*;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.widgets.Shell;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/UpdateAction.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java
index 7b6d64d47..fcbc2a6db 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/actions/UpdateAction.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/actions/UpdateAction.java
@@ -9,17 +9,17 @@
* IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.equinox.prov.ui.actions;
+package org.eclipse.equinox.p2.ui.actions;
import java.util.*;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.*;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.operations.*;
-import org.eclipse.equinox.prov.ui.viewers.IUDetailsLabelProvider;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.*;
+import org.eclipse.equinox.p2.ui.operations.*;
+import org.eclipse.equinox.p2.ui.viewers.IUDetailsLabelProvider;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.window.Window;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/AddColocatedRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddColocatedRepositoryDialog.java
index 4de8323b6..b952ae617 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/AddColocatedRepositoryDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddColocatedRepositoryDialog.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import java.net.MalformedURLException;
import java.net.URL;
import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.ui.ProvUI;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.operations.AddColocatedRepositoryOperation;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.ui.ProvUI;
+import org.eclipse.equinox.p2.ui.operations.AddColocatedRepositoryOperation;
import org.eclipse.swt.widgets.Shell;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/AddRepositoryDialog.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java
index a6502abcc..4da13bdeb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/AddRepositoryDialog.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/AddRepositoryDialog.java
@@ -8,17 +8,17 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.IUndoableOperation;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.ui.ProvUI;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.ui.ProvUI;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ColocatedRepositoryManipulatorGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ColocatedRepositoryManipulatorGroup.java
index 978d6706a..777afd72c 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ColocatedRepositoryManipulatorGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ColocatedRepositoryManipulatorGroup.java
@@ -8,20 +8,20 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import java.util.List;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ProvUI;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.model.AllMetadataRepositories;
-import org.eclipse.equinox.prov.ui.model.MetadataRepositoryContentProvider;
-import org.eclipse.equinox.prov.ui.operations.RemoveColocatedRepositoryOperation;
-import org.eclipse.equinox.prov.ui.viewers.ColocatedRepositoryLabelProvider;
-import org.eclipse.equinox.prov.ui.viewers.StructuredViewerProvisioningListener;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ProvUI;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.model.AllMetadataRepositories;
+import org.eclipse.equinox.p2.ui.model.MetadataRepositoryContentProvider;
+import org.eclipse.equinox.p2.ui.operations.RemoveColocatedRepositoryOperation;
+import org.eclipse.equinox.p2.ui.viewers.ColocatedRepositoryLabelProvider;
+import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.Dialog;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ColocatedRepositoryPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ColocatedRepositoryPropertyPage.java
index c8d062158..5340ae102 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ColocatedRepositoryPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ColocatedRepositoryPropertyPage.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ColocatedRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ColocatedRepositoryInfo;
/**
* PropertyPage that shows a repository's properties
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGroup.java
index 616400755..d82e12f67 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUGroup.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.widgets.Composite;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUImplementationGroup.java
index 797ad6a31..57aaa1351 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUImplementationGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUImplementationGroup.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.prov.metadata.*;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.metadata.*;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUImplementationPropertyPage.java
index 16416033d..19283aa7f 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUImplementationPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUImplementationPropertyPage.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUPropertiesGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUPropertiesGroup.java
index 57185b267..8b1f365bb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUPropertiesGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUPropertiesGroup.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUPropertyPage.java
index 2876ba03f..8a49fdec9 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/IUPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/IUPropertyPage.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ProfileGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfileGroup.java
index e975f763e..d784ff3d9 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ProfileGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfileGroup.java
@@ -10,14 +10,14 @@
* Andrew Overholt <overholt@redhat.com> - Fix for Bug 197970
* [prov] unset Profile name causes exception bringing up profile properties
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.model.ProfileFactory;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.model.ProfileFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ProfilePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfilePropertyPage.java
index 5d3ecad84..1ece4c65c 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/ProfilePropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/ProfilePropertyPage.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryGroup.java
index d6d1b1216..d831ec734 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryGroup.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.core.repository.IWritableRepositoryInfo;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.IWritableRepositoryInfo;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryImplementationGroup.java
index a8053d6c2..c7e0a5974 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryImplementationGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryImplementationGroup.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import java.util.Map;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryImplementationPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryImplementationPropertyPage.java
index 7498ac034..a949c3685 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryImplementationPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryImplementationPropertyPage.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryPropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java
index 79f91cdb8..3f91e8d34 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/RepositoryPropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/RepositoryPropertyPage.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/UpdateAndInstallGroup.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java
index f9345754f..94808b8eb 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/dialogs/UpdateAndInstallGroup.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/dialogs/UpdateAndInstallGroup.java
@@ -8,16 +8,16 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.dialogs;
+package org.eclipse.equinox.p2.ui.dialogs;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.*;
-import org.eclipse.equinox.prov.ui.actions.*;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.model.*;
-import org.eclipse.equinox.prov.ui.viewers.IUDetailsLabelProvider;
-import org.eclipse.equinox.prov.ui.viewers.StructuredViewerProvisioningListener;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.*;
+import org.eclipse.equinox.p2.ui.actions.*;
+import org.eclipse.equinox.p2.ui.model.*;
+import org.eclipse.equinox.p2.ui.viewers.IUDetailsLabelProvider;
+import org.eclipse.equinox.p2.ui.viewers.StructuredViewerProvisioningListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.Dialog;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllArtifactRepositories.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllArtifactRepositories.java
index 2d45e86e7..ea5666bd4 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllArtifactRepositories.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllArtifactRepositories.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Element class that represents the root of an artifact
@@ -28,7 +28,7 @@ public class AllArtifactRepositories extends ProvElement {
/*
* (non-Javadoc)
- * @see org.eclipse.equinox.prov.ui.model.ProvElement#fetchChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+ * @see org.eclipse.equinox.p2.ui.model.ProvElement#fetchChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
*/
protected Object[] fetchChildren(Object o, IProgressMonitor monitor, IAdaptable uiInfo) {
try {
@@ -49,7 +49,7 @@ public class AllArtifactRepositories extends ProvElement {
/*
* (non-Javadoc)
- * @see org.eclipse.equinox.prov.ui.model.RepositoryElement#getParent(java.lang.Object)
+ * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getParent(java.lang.Object)
*/
public Object getParent(Object o) {
return null;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllMetadataRepositories.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllMetadataRepositories.java
index 7b0b9ff0a..a9915c5d9 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllMetadataRepositories.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllMetadataRepositories.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Element class that represents the root of a metadata
@@ -28,7 +28,7 @@ public class AllMetadataRepositories extends ProvElement {
/*
* (non-Javadoc)
- * @see org.eclipse.equinox.prov.ui.model.ProvElement#fetchChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+ * @see org.eclipse.equinox.p2.ui.model.ProvElement#fetchChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
*/
protected Object[] fetchChildren(Object o, IProgressMonitor monitor, IAdaptable uiInfo) {
try {
@@ -51,7 +51,7 @@ public class AllMetadataRepositories extends ProvElement {
/*
* (non-Javadoc)
*
- * @see org.eclipse.equinox.prov.ui.model.RepositoryElement#getParent(java.lang.Object)
+ * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getParent(java.lang.Object)
*/
public Object getParent(Object o) {
return null;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllProfiles.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllProfiles.java
index 2c56152de..8fba8cb55 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AllProfiles.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AllProfiles.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Element class that represents the root of a profile
@@ -27,7 +27,7 @@ public class AllProfiles extends ProvElement {
/*
* (non-Javadoc)
*
- * @see org.eclipse.equinox.prov.ui.model.ProvElement#fetchChildren(java.lang.Object,
+ * @see org.eclipse.equinox.p2.ui.model.ProvElement#fetchChildren(java.lang.Object,
* org.eclipse.core.runtime.IProgressMonitor,
* org.eclipse.core.runtime.IAdaptable)
*/
@@ -52,7 +52,7 @@ public class AllProfiles extends ProvElement {
/*
* (non-Javadoc)
*
- * @see org.eclipse.equinox.prov.ui.model.RepositoryElement#getParent(java.lang.Object)
+ * @see org.eclipse.equinox.p2.ui.model.RepositoryElement#getParent(java.lang.Object)
*/
public Object getParent(Object o) {
return null;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ArtifactRepositoryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositoryContentProvider.java
index dba38814c..5a5a15634 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ArtifactRepositoryContentProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ArtifactRepositoryContentProvider.java
@@ -9,9 +9,9 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
import org.eclipse.jface.viewers.*;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AvailableIUContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AvailableIUContentProvider.java
index 8ae7b8c94..27f16e776 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/AvailableIUContentProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/AvailableIUContentProvider.java
@@ -9,13 +9,13 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import java.util.ArrayList;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/InstalledIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java
index 25224df6f..d098bed4a 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/InstalledIUElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/InstalledIUElement.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.InstallableUnit;
-import org.eclipse.equinox.prov.ui.ProvUIImages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.InstallableUnit;
+import org.eclipse.equinox.p2.ui.ProvUIImages;
/**
* Element wrapper class for installed IU's. Used instead of the plain IU when
@@ -36,7 +36,7 @@ public class InstalledIUElement extends ProvElement {
/*
* (non-Javadoc)
*
- * @see org.eclipse.equinox.prov.ui.model.ProvElement#getImageID(java.lang.Object)
+ * @see org.eclipse.equinox.p2.ui.model.ProvElement#getImageID(java.lang.Object)
*/
protected String getImageID(Object obj) {
return ProvUIImages.IMG_IU;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/MetadataRepositoryContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryContentProvider.java
index 33412aeed..0bf7d5642 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/MetadataRepositoryContentProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/MetadataRepositoryContentProvider.java
@@ -9,9 +9,9 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
import org.eclipse.jface.viewers.*;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProfileContentProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileContentProvider.java
index 10aaf8aaf..cd16f461f 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProfileContentProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileContentProvider.java
@@ -9,12 +9,12 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import java.util.ArrayList;
import java.util.Iterator;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jface.viewers.*;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProfileFactory.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileFactory.java
index b1edb454e..57106c03c 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProfileFactory.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProfileFactory.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.core.helpers.ServiceHelper;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProvElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProvElement.java
index 5d9c450dc..c006b29bd 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/model/ProvElement.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/model/ProvElement.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.model;
+package org.eclipse.equinox.p2.ui.model;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.ProvUIImages;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.ProvUIImages;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.model.IWorkbenchAdapter;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddArtifactRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java
index b2124b1a1..ca2bec4bf 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddArtifactRepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddArtifactRepositoryOperation.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation which adds an artifact repository given its URL.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddColocatedRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java
index 796aed5db..a1719a102 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddColocatedRepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddColocatedRepositoryOperation.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.ui.ColocatedRepositoryUtil;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.ui.ColocatedRepositoryUtil;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation that adds colocated artifact and metadata repositories
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddMetadataRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java
index 51ee6cc6a..78051f4c8 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddMetadataRepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddMetadataRepositoryOperation.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation that adds a metadata repository given its URL.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddProfileOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java
index 09e7a2319..8b6e9e379 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/AddProfileOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/AddProfileOperation.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation that adds the given profile to the profile registry.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/BecomeOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/BecomeOperation.java
index 8616cffca..0e8776f27 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/BecomeOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/BecomeOperation.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* An operation that installs the specified IU's into the specified profile
@@ -62,7 +62,7 @@ public class BecomeOperation extends ProfileModificationOperation {
/*
* (non-Javadoc)
* Overridden to use the Oracle to compute the validity of an install.
- * @see org.eclipse.equinox.prov.ui.operations.ProvisioningOperation#computeExecutionStatus(org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.equinox.p2.ui.operations.ProvisioningOperation#computeExecutionStatus(org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus computeExecutionStatus(IProgressMonitor monitor) {
//TODO Need to do the proper thing here
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/IOperationConfirmer.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/IOperationConfirmer.java
index 489e2e545..3e0e4d21b 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/IOperationConfirmer.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/IOperationConfirmer.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.swt.widgets.Shell;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/InstallOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallOperation.java
index 2381687e3..ea8ea67d8 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/InstallOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/InstallOperation.java
@@ -8,14 +8,14 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* An operation that installs the specified IU's into the specified profile
@@ -68,7 +68,7 @@ public class InstallOperation extends ProfileModificationOperation {
/*
* (non-Javadoc)
* Overridden to use the Oracle to compute the validity of an install.
- * @see org.eclipse.equinox.prov.ui.operations.ProvisioningOperation#computeExecutionStatus(org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.equinox.p2.ui.operations.ProvisioningOperation#computeExecutionStatus(org.eclipse.core.runtime.IProgressMonitor)
*/
public IStatus computeExecutionStatus(IProgressMonitor monitor) {
try {
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProfileModificationOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java
index 0a1f6f123..53d8a27f8 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProfileModificationOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileModificationOperation.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
/**
* Abstract class representing provisioning profile operations
@@ -56,7 +56,7 @@ public abstract class ProfileModificationOperation extends ProfileOperation {
/*
* (non-Javadoc)
- * @see org.eclipse.equinox.prov.ui.operations.ProvisioningOperation#getAffectedObjects()
+ * @see org.eclipse.equinox.p2.ui.operations.ProvisioningOperation#getAffectedObjects()
*/
public Object[] getAffectedObjects() {
if (ius != null)
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProfileOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java
index 7dc897889..448e05d93 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProfileOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProfileOperation.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Abstract class representing provisioning profile operations
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProvisioningOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java
index 05749a617..538d20edc 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/ProvisioningOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/ProvisioningOperation.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.ProvisioningUndoSupport;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.ProvisioningUndoSupport;
import org.eclipse.osgi.util.NLS;
/**
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveArtifactRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java
index 636589c32..116aaf711 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveArtifactRepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveArtifactRepositoryOperation.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation which removes the artifact repository with the given URL.
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveColocatedRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java
index bad797f75..64251c4df 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveColocatedRepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveColocatedRepositoryOperation.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ColocatedRepositoryUtil;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ColocatedRepositoryUtil;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation that removes the colocated repositories with the given URLs. *
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveMetadataRepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java
index 30e2fa282..a30c9048a 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveMetadataRepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveMetadataRepositoryOperation.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation that removes the metadata repository with the given URL. *
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveProfilesOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java
index ba91c7594..cbe323690 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RemoveProfilesOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RemoveProfilesOperation.java
@@ -8,12 +8,12 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* Operation that removes a profile
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RepositoryOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java
index 2b686491f..f0154abea 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/RepositoryOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/RepositoryOperation.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import java.net.URL;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/UninstallOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UninstallOperation.java
index 5d44a1086..2a18eb1fd 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/UninstallOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UninstallOperation.java
@@ -8,13 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* An operation that uninstalls the specified IU's from the specified profile
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/UpdateOperation.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UpdateOperation.java
index b9f43c5a2..265f4faa5 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/operations/UpdateOperation.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/operations/UpdateOperation.java
@@ -8,15 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.operations;
+package org.eclipse.equinox.p2.ui.operations;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.core.ProvisionException;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.ProvisioningUtil;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.ProvisioningUtil;
/**
* An operation that installs the specified IU's into the specified profile
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/ColocatedRepositoryLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ColocatedRepositoryLabelProvider.java
index fbfb945e6..5942e5afc 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/ColocatedRepositoryLabelProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ColocatedRepositoryLabelProvider.java
@@ -9,13 +9,13 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import java.net.URL;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.prov.ui.ColocatedRepositoryUtil;
-import org.eclipse.equinox.prov.ui.ProvUIImages;
+import org.eclipse.equinox.p2.metadata.repository.IMetadataRepository;
+import org.eclipse.equinox.p2.ui.ColocatedRepositoryUtil;
+import org.eclipse.equinox.p2.ui.ProvUIImages;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUCapabilityFilter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUCapabilityFilter.java
index 26d60351e..606f711c0 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUCapabilityFilter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUCapabilityFilter.java
@@ -9,10 +9,10 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.metadata.*;
+import org.eclipse.equinox.p2.metadata.*;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUDetailsLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDetailsLabelProvider.java
index 29410e89f..2aff75f99 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUDetailsLabelProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDetailsLabelProvider.java
@@ -9,12 +9,12 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.IInstallableUnitConstants;
-import org.eclipse.equinox.prov.ui.ProvUIImages;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnitConstants;
+import org.eclipse.equinox.p2.ui.ProvUIImages;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUDragAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java
index 504b4af1d..34241da53 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUDragAdapter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUDragAdapter.java
@@ -8,11 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import java.util.*;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.dnd.*;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUGroupFilter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUGroupFilter.java
index ba25ec062..faf8be2bc 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUGroupFilter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUGroupFilter.java
@@ -9,10 +9,10 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.metadata.RequiredCapability;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.RequiredCapability;
/**
* Viewer filter which filters IU's so that only those with the kind "group" are
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUPropertyFilter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUPropertyFilter.java
index 3b1b2f584..932059cb2 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/IUPropertyFilter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/IUPropertyFilter.java
@@ -9,10 +9,10 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/InstallIUDropAdapter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java
index 9735b7852..83955b235 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/InstallIUDropAdapter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InstallIUDropAdapter.java
@@ -8,17 +8,17 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import java.util.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.prov.engine.Profile;
-import org.eclipse.equinox.prov.metadata.IInstallableUnit;
-import org.eclipse.equinox.prov.ui.ProvUIActivator;
-import org.eclipse.equinox.prov.ui.actions.InstallAction;
-import org.eclipse.equinox.prov.ui.internal.ProvUIMessages;
-import org.eclipse.equinox.prov.ui.model.InstalledIUElement;
-import org.eclipse.equinox.prov.ui.operations.IOperationConfirmer;
+import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
+import org.eclipse.equinox.p2.engine.Profile;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.ui.ProvUIActivator;
+import org.eclipse.equinox.p2.ui.actions.InstallAction;
+import org.eclipse.equinox.p2.ui.model.InstalledIUElement;
+import org.eclipse.equinox.p2.ui.operations.IOperationConfirmer;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.dnd.*;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/InternalRepositoryFilter.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InternalRepositoryFilter.java
index 5766b730c..146c6a111 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/InternalRepositoryFilter.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/InternalRepositoryFilter.java
@@ -9,10 +9,10 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/ProvElementLabelProvider.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java
index 98624250a..f53bd8163 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/ProvElementLabelProvider.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/ProvElementLabelProvider.java
@@ -9,16 +9,16 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
-import org.eclipse.equinox.prov.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.prov.core.repository.IRepositoryInfo;
-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.ui.ProvUIImages;
-import org.eclipse.equinox.prov.ui.model.InstalledIUElement;
-import org.eclipse.equinox.prov.ui.model.ProvElement;
+import org.eclipse.equinox.p2.artifact.repository.IArtifactRepository;
+import org.eclipse.equinox.p2.core.repository.IRepositoryInfo;
+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.ui.ProvUIImages;
+import org.eclipse.equinox.p2.ui.model.InstalledIUElement;
+import org.eclipse.equinox.p2.ui.model.ProvElement;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/StructuredViewerProvisioningListener.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java
index 317e435b3..76fa7ffce 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/prov/ui/viewers/StructuredViewerProvisioningListener.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/viewers/StructuredViewerProvisioningListener.java
@@ -9,12 +9,12 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.prov.ui.viewers;
+package org.eclipse.equinox.p2.ui.viewers;
import java.util.EventObject;
-import org.eclipse.equinox.prov.core.eventbus.SynchronousProvisioningListener;
-import org.eclipse.equinox.prov.engine.*;
-import org.eclipse.equinox.prov.ui.IProvisioningProperties;
+import org.eclipse.equinox.p2.core.eventbus.SynchronousProvisioningListener;
+import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.ui.IProvisioningProperties;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.StructuredViewer;

Back to the top