Author: jdcasey
Date: Tue Mar 20 14:40:59 2007
New Revision: 520609
URL: http://svn.apache.org/viewvc?view=rev&rev=520609
Log:
Merging revIds: 515814:520600 from 2.1-lifecycle-refactor branch to trunk.
Added:
maven/components/trunk/maven-build-context/src/main/java/org/apache/maven/context/ScopedBuildContext.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-build-context/src/main/java/org/apache/maven/context/ScopedBuildContext.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/SessionContext.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/execution/SessionContext.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionContext.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionContext.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/BindingUtils.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactory.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LegacyLifecycle.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LegacyLifecycle.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LegacyLifecycleMappingParser.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LegacyLifecycleMappingParser.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/MojoBindingFactory.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanModifier.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanModifier.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanUtils.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanner.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlanner.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationModifier.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DirectInvocationOriginElement.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkPlanModifier.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkPlanModifier.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ForkedDirectInvocationModifier.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlan.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlannerException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlannerException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ModifiablePlanElement.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ModifiablePlanElement.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ReportingPlanModifier.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/ReportingPlanModifier.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/SubLifecycleBuildPlan.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ClearForkedContextMojo.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/ClearForkedContextMojo.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/EndForkedExecutionMojo.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/EndForkedExecutionMojo.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/StartForkedExecutionMojo.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/StartForkedExecutionMojo.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/StateManagementUtils.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/StateManagementUtils.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java
maven/components/trunk/maven-core/src/main/resources/META-INF/maven/plugin.xml
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/resources/META-INF/maven/plugin.xml
maven/components/trunk/maven-core/src/site/resources/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/site/resources/
maven/components/trunk/maven-core/src/site/resources/design/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/site/resources/design/
maven/components/trunk/maven-core/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png
maven/components/trunk/maven-core/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png
maven/components/trunk/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/binding/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultMojoBindingFactoryTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/LegacyLifecycleParsingTestComponent.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/binding/LegacyLifecycleParsingTestComponent.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/plan/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/ForkPlanModifierTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/plan/ForkPlanModifierTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlanTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/plan/LifecycleBuildPlanTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/ReportingPlanModifierTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/plan/ReportingPlanModifierTest.java
maven/components/trunk/maven-core/src/test/resources/META-INF/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/
maven/components/trunk/maven-core/src/test/resources/META-INF/maven/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/maven/
maven/components/trunk/maven-core/src/test/resources/META-INF/maven/org.apache.maven/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/maven/org.apache.maven/
maven/components/trunk/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/
maven/components/trunk/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties
maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/
maven/components/trunk/maven-core/src/test/resources/META-INF/plexus/components.xml
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-lifecycle/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/
maven/components/trunk/maven-lifecycle/pom.xml
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/pom.xml
maven/components/trunk/maven-lifecycle/src/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/
maven/components/trunk/maven-lifecycle/src/main/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/
maven/components/trunk/maven-lifecycle/src/main/java/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/
maven/components/trunk/maven-lifecycle/src/main/java/org/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleException.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleLoaderException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleLoaderException.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleSpecificationException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleSpecificationException.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingUtils.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingUtils.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/NoSuchLifecycleException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/NoSuchLifecycleException.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/NoSuchPhaseException.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/NoSuchPhaseException.java
maven/components/trunk/maven-lifecycle/src/main/mdo/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/
maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
maven/components/trunk/maven-lifecycle/src/test/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/
maven/components/trunk/maven-lifecycle/src/test/java/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/
maven/components/trunk/maven-lifecycle/src/test/java/org/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/
maven/components/trunk/maven-lifecycle/src/test/java/org/apache/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/
maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/
maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/
maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java
maven/components/trunk/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java
maven/components/trunk/maven-lifecycle/src/test/resources/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/resources/
maven/components/trunk/maven-lifecycle/src/test/resources/META-INF/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/resources/META-INF/
maven/components/trunk/maven-lifecycle/src/test/resources/META-INF/plexus/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/resources/META-INF/plexus/
maven/components/trunk/maven-lifecycle/src/test/resources/META-INF/plexus/components.xml
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-lifecycle/src/test/resources/single-clean-mapping.xml
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/resources/single-clean-mapping.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/context/
- copied from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/context/
maven/components/trunk/maven-project/src/main/java/org/apache/maven/context/ProjectScopedContext.java
- copied unchanged from r520600,
maven/components/branches/2.1-lifecycle-refactor/maven-project/src/main/java/org/apache/maven/context/ProjectScopedContext.java
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
Modified:
maven/components/trunk/build.properties
maven/components/trunk/build.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build.properties
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=520609&r1=520608&r2=520609
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Tue Mar 20 14:40:59 2007
@@ -16,6 +16,7 @@
# under the License.
classworlds.version=1.2-alpha-7
+plexus-active-collections.version=1.0-SNAPSHOT
plexus.version=1.0-alpha-20
plexus-archiver.version=1.0-alpha-8
plexus-utils.version=1.4.1
Modified: maven/components/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/build.xml?view=diff&rev=520609&r1=520608&r2=520609
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Tue Mar 20 14:40:59 2007
@@ -116,6 +116,7 @@
</sequential>
</macrodef>
<pull orgpath="commons-cli/commons-cli" version="${commons-cli.version}"
name="commons-cli"/>
+ <pull orgpath="org/codehaus/plexus/plexus-active-collections"
version="${plexus-active-collections.version}" name="plexus-active-collections"
repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-utils"
version="${plexus-utils.version}" name="plexus-utils" repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-container-default"
version="${plexus.version}" name="plexus-container-default"
repository="codehaus"/>
<pull orgpath="org/codehaus/plexus/plexus-component-api"
version="${plexus.version}" name="plexus-component-api" repository="codehaus"/>
@@ -153,6 +154,7 @@
<path id="pre.classpath">
<pathelement
location="${maven.repo.local}/commons-cli/commons-cli/${commons-cli.version}/commons-cli-${commons-cli.version}.jar"/>
<pathelement
location="${maven.repo.local}/commons-lang/commons-lang/${commons-lang.version}/commons-lang-${commons-lang.version}.jar"/>
+ <pathelement
location="${maven.repo.local}/org/codehaus/plexus/plexus-active-collections/${plexus-active-collections.version}/plexus-active-collections-${plexus-active-collections.version}.jar"/>
<pathelement
location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/${plexus-utils.version}/plexus-utils-${plexus-utils.version}.jar"/>
<pathelement
location="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/${plexus.version}/plexus-container-default-${plexus.version}.jar"/>
<pathelement
location="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/${plexus.version}/plexus-component-api-${plexus.version}.jar"/>
@@ -226,6 +228,7 @@
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
<!-- DGF TODO turn this into a big <apply> task? write a custom task? -->
+ <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo"/>
<modello
file="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo"/>
<modello file="maven-plugin-registry/plugin-registry.mdo"/>
@@ -339,6 +342,9 @@
</classpath>
<sysproperty key="classworlds.conf" value="${bootstrapDir}/m2.conf"/>
<sysproperty key="bootstrapDir" value="${bootstrapDir}"/>
+<!--
+ <arg value="-X"/>
+ -->
<arg value="-e"/>
<arg line="${maven.goals}"/>
</java>
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?view=diff&rev=520609&r1=520608&r2=520609
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Tue Mar 20 14:40:59 2007
@@ -32,6 +32,11 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-lifecycle</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-build-context</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
@@ -67,6 +72,10 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
@@ -147,6 +156,11 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>1.2-alpha-5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-active-collections</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?view=diff&rev=520609&r1=520608&r2=520609
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Tue Mar 20 14:40:59 2007
@@ -48,6 +48,7 @@
artifacts.add( "maven-build-context" );
artifacts.add( "maven-core" );
artifacts.add( "maven-error-diagnoser" );
+ artifacts.add( "maven-lifecycle" );
artifacts.add( "maven-model" );
artifacts.add( "maven-monitor" );
artifacts.add( "maven-plugin-api" );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?view=diff&rev=520609&r1=520608&r2=520609
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Tue Mar 20 14:40:59 2007
@@ -33,6 +33,7 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ReactorManager;
import org.apache.maven.execution.RuntimeInformation;
+import org.apache.maven.execution.SessionContext;
import org.apache.maven.extension.BuildExtensionScanner;
import org.apache.maven.extension.ExtensionScanningException;
import org.apache.maven.lifecycle.LifecycleExecutor;
@@ -542,7 +543,12 @@
ReactorManager rpm,
EventDispatcher dispatcher )
{
- return new MavenSession( container, request, dispatcher, rpm );
+ MavenSession session = new MavenSession( container, request,
dispatcher, rpm );
+
+ SessionContext ctx = new SessionContext( session );
+ ctx.store( buildContextManager );
+
+ return session;
}
// ----------------------------------------------------------------------
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?view=diff&rev=520609&r1=520608&r2=520609
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Tue Mar 20 14:40:59 2007
@@ -28,6 +28,7 @@
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import java.util.Date;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -48,6 +49,8 @@
private MavenExecutionRequest request;
+ private Map reports = new LinkedHashMap();
+
public MavenSession( PlexusContainer container,
MavenExecutionRequest request,
EventDispatcher eventDispatcher,
@@ -156,4 +159,5 @@
{
return request;
}
+
}
