Author: sisbell
Date: Tue Aug 19 08:26:16 2008
New Revision: 687078
URL: http://svn.apache.org/viewvc?rev=687078&view=rev
Log:
Removed deleted components from components xml files.
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=687078&r1=687077&r2=687078&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml
Tue Aug 19 08:26:16 2008
@@ -20,97 +20,6 @@
<component-set>
<components>
<component>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.injection.ProfileInjector</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- </requirement>
- </requirements>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.project.MavenProjectHelper</role>
-
<implementation>org.apache.maven.project.DefaultMavenProjectHelper</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
- </requirement>
- </requirements>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-
<implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
- </requirement>
- </requirements>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-
<implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.injection.ProfileInjector</role>
-
<implementation>org.apache.maven.profiles.injection.DefaultProfileInjector</implementation>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.builder.impl.DefaultProjectBuilder</implementation>
@@ -121,9 +30,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -132,39 +38,12 @@
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
</requirement>
<requirement>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
+ <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
@@ -183,101 +62,6 @@
</requirements>
</component>
-<!--Eliminate this component after Mercury Integration-->
- <component>
- <role>org.apache.maven.project.RepositoryHelper</role>
-
<implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- </requirements>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.activation.ProfileActivator</role>
- <role-hint>always-on</role-hint>
-
<implementation>org.apache.maven.profiles.activation.AlwaysOnProfileActivator</implementation>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.activation.ProfileActivator</role>
- <role-hint>jdk-prefix</role-hint>
-
<implementation>org.apache.maven.profiles.activation.JdkPrefixProfileActivator</implementation>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.activation.ProfileActivator</role>
- <role-hint>system-property</role-hint>
-
<implementation>org.apache.maven.profiles.activation.SystemPropertyProfileActivator</implementation>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.activation.ProfileActivator</role>
- <role-hint>os</role-hint>
-
<implementation>org.apache.maven.profiles.activation.OperatingSystemProfileActivator</implementation>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.activation.ProfileActivator</role>
- <role-hint>file</role-hint>
-
<implementation>org.apache.maven.profiles.activation.FileProfileActivator</implementation>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
- <role>org.apache.maven.profiles.activation.ProfileActivator</role>
- <role-hint>custom</role-hint>
-
<implementation>org.apache.maven.profiles.activation.CustomActivator</implementation>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-
<implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
- </component>
-
-<!--
- |
- |
- |
- -->
<component>
<role>org.apache.maven.project.validation.ModelValidator</role>
<implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
@@ -290,62 +74,6 @@
<role>org.apache.maven.project.path.PathTranslator</role>
<implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
</component>
-
- <component>
- <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
- <role-hint>maven</role-hint>
-
<implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
- <role-hint>maven-strict</role-hint>
-
<implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
- <configuration>
-
<strictlyEnforceThePresenceOfAValidMavenPOM>true</strictlyEnforceThePresenceOfAValidMavenPOM>
- </configuration>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
- </requirement>
- </requirements>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.resolver.metadata.MetadataSource</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.project.artifact.PomMetadataSource</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
<component>
<role>org.apache.maven.MavenTools</role>
@@ -356,17 +84,6 @@
</requirement>
</requirements>
</component>
-
- <component>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.project.workspace.DefaultProjectWorkspace</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.workspace.MavenWorkspaceStore</role>
- </requirement>
- </requirements>
- </component>
</components>
</component-set>
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=687078&r1=687077&r2=687078&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Tue Aug 19 08:26:16 2008
@@ -19,83 +19,6 @@
<plexus>
<components>
-<!--Eliminate this component after Mercury Integration-->
- <component>
- <role>org.apache.maven.project.RepositoryHelper</role>
-
<implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- </requirements>
- </component>
- <!-- Due to PLX-108, have to work around it...
- <component>
- <role>org.apache.maven.artifact.ArtifactResolver</role>
- <implementation>org.apache.maven.project.TestArtifactResolvertion>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- -->
- <component>
- <role>org.apache.maven.profiles.injection.ProfileInjector</role>
- <role-hint>test</role-hint>
-
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
- </component>
- <component>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.injection.ProfileInjector</role>
- <role-hint>test</role-hint>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.project.TestArtifactResolver</role>
-
<implementation>org.apache.maven.project.TestArtifactResolver</implementation>
- <requirements>
- <!--
- <requirement>
- <role>org.apache.maven.artifact.manager.ArtifactManager</role>
- </requirement>
- -->
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
- </requirement>
- </requirements>
- </component>
<component>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
<role-hint>default</role-hint>
@@ -107,9 +30,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -118,38 +38,12 @@
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
</requirement>
<requirement>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
@@ -159,9 +53,6 @@
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- </requirement>
- <requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
</requirements>
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=687078&r1=687077&r2=687078&view=diff
==============================================================================
---
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Tue Aug 19 08:26:16 2008
@@ -18,81 +18,7 @@
-->
<plexus>
- <components><!--Eliminate this component after Mercury Integration-->
- <component>
- <role>org.apache.maven.project.RepositoryHelper</role>
-
<implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- </requirements>
- </component>
-
- <!-- Due to PLX-108, have to work around it...
- <component>
- <role>org.apache.maven.artifact.ArtifactResolver</role>
- <implementation>org.apache.maven.project.TestArtifactResolvertion>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- -->
- <component>
- <role>org.apache.maven.profiles.injection.ProfileInjector</role>
- <role-hint>test</role-hint>
-
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
- </component>
- <component>
- <role>org.apache.maven.project.TestArtifactResolver</role>
-
<implementation>org.apache.maven.project.TestArtifactResolver</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.injection.ProfileInjector</role>
- <role-hint>test</role-hint>
- </requirement>
- </requirements>
- </component>
+ <components>
<component>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
<role-hint>default</role-hint>
@@ -104,9 +30,6 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
</requirements>
</component>
<component>
@@ -115,50 +38,18 @@
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
</requirement>
<requirement>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
- </requirement>
- <requirement>
-
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.validation.ModelValidator</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.path.PathTranslator</role>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- </requirement>
- <requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
</requirements>
