You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/03/09 23:27:55 UTC
svn commit: r516585 - in /maven/components/branches/2.1-lifecycle-refactor:
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/java/org/apache/maven/lifecycle/binding/
maven-core/src/main/java/org/apache/maven/lifecycle/plan/ mave...
Author: jdcasey
Date: Fri Mar 9 14:27:53 2007
New Revision: 516585
URL: http://svn.apache.org/viewvc?view=rev&rev=516585
Log:
starting unit tests for the LegacyLifecycleMappingParser.
Added:
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java (with props)
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java (with props)
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml (with props)
Modified:
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParser.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlan.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanModifier.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanner.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleOverlayPlanModifier.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlan.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlanModifier.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingParser.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/PrefixedMojoBinding.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java
maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/MojoBindingParserTest.java
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParser.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParser.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParser.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParser.java Fri Mar 9 14:27:53 2007
@@ -1,24 +1,13 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.lifecycle.BuildBinding;
-import org.apache.maven.lifecycle.CleanBinding;
-import org.apache.maven.lifecycle.Lifecycle;
-import org.apache.maven.lifecycle.LifecycleBindings;
-import org.apache.maven.lifecycle.LifecycleExecutionException;
-import org.apache.maven.lifecycle.MojoBinding;
-import org.apache.maven.lifecycle.Phase;
-import org.apache.maven.lifecycle.SiteBinding;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.lifecycle.Execution;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.apache.maven.lifecycle.model.BuildBinding;
+import org.apache.maven.lifecycle.model.CleanBinding;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.lifecycle.model.Phase;
+import org.apache.maven.lifecycle.model.SiteBinding;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -80,30 +69,33 @@
throws LifecycleSpecificationException
{
BuildBinding binding = new BuildBinding();
-
- binding.setValidate( parsePhaseBindings( (String) phases.get( "validate" ) ) );
- binding.setInitialize( parsePhaseBindings( (String) phases.get( "initialize" ) ) );
- binding.setGenerateSources( parsePhaseBindings( (String) phases.get( "generate-sources" ) ) );
- binding.setProcessSources( parsePhaseBindings( (String) phases.get( "process-sources" ) ) );
- binding.setGenerateResources( parsePhaseBindings( (String) phases.get( "generate-resources" ) ) );
- binding.setProcessResources( parsePhaseBindings( (String) phases.get( "process-resources" ) ) );
- binding.setCompile( parsePhaseBindings( (String) phases.get( "compile" ) ) );
- binding.setProcessClasses( parsePhaseBindings( (String) phases.get( "process-classes" ) ) );
- binding.setGenerateTestSources( parsePhaseBindings( (String) phases.get( "generate-test-sources" ) ) );
- binding.setProcessTestSources( parsePhaseBindings( (String) phases.get( "process-test-sources" ) ) );
- binding.setGenerateTestResources( parsePhaseBindings( (String) phases.get( "generate-test-resources" ) ) );
- binding.setProcessTestResources( parsePhaseBindings( (String) phases.get( "process-test-resources" ) ) );
- binding.setTestCompile( parsePhaseBindings( (String) phases.get( "test-compile" ) ) );
- binding.setProcessTestClasses( parsePhaseBindings( (String) phases.get( "process-test-classes" ) ) );
- binding.setTest( parsePhaseBindings( (String) phases.get( "test" ) ) );
- binding.setPreparePackage( parsePhaseBindings( (String) phases.get( "prepare-package" ) ) );
- binding.setCreatePackage( parsePhaseBindings( (String) phases.get( "package" ) ) );
- binding.setPreIntegrationTest( parsePhaseBindings( (String) phases.get( "pre-integration-test" ) ) );
- binding.setIntegrationTest( parsePhaseBindings( (String) phases.get( "integration-test" ) ) );
- binding.setPostIntegrationTest( parsePhaseBindings( (String) phases.get( "post-integration-test" ) ) );
- binding.setVerify( parsePhaseBindings( (String) phases.get( "verify" ) ) );
- binding.setInstall( parsePhaseBindings( (String) phases.get( "install" ) ) );
- binding.setDeploy( parsePhaseBindings( (String) phases.get( "deploy" ) ) );
+
+ if ( phases != null )
+ {
+ binding.setValidate( parsePhaseBindings( (String) phases.get( "validate" ) ) );
+ binding.setInitialize( parsePhaseBindings( (String) phases.get( "initialize" ) ) );
+ binding.setGenerateSources( parsePhaseBindings( (String) phases.get( "generate-sources" ) ) );
+ binding.setProcessSources( parsePhaseBindings( (String) phases.get( "process-sources" ) ) );
+ binding.setGenerateResources( parsePhaseBindings( (String) phases.get( "generate-resources" ) ) );
+ binding.setProcessResources( parsePhaseBindings( (String) phases.get( "process-resources" ) ) );
+ binding.setCompile( parsePhaseBindings( (String) phases.get( "compile" ) ) );
+ binding.setProcessClasses( parsePhaseBindings( (String) phases.get( "process-classes" ) ) );
+ binding.setGenerateTestSources( parsePhaseBindings( (String) phases.get( "generate-test-sources" ) ) );
+ binding.setProcessTestSources( parsePhaseBindings( (String) phases.get( "process-test-sources" ) ) );
+ binding.setGenerateTestResources( parsePhaseBindings( (String) phases.get( "generate-test-resources" ) ) );
+ binding.setProcessTestResources( parsePhaseBindings( (String) phases.get( "process-test-resources" ) ) );
+ binding.setTestCompile( parsePhaseBindings( (String) phases.get( "test-compile" ) ) );
+ binding.setProcessTestClasses( parsePhaseBindings( (String) phases.get( "process-test-classes" ) ) );
+ binding.setTest( parsePhaseBindings( (String) phases.get( "test" ) ) );
+ binding.setPreparePackage( parsePhaseBindings( (String) phases.get( "prepare-package" ) ) );
+ binding.setCreatePackage( parsePhaseBindings( (String) phases.get( "package" ) ) );
+ binding.setPreIntegrationTest( parsePhaseBindings( (String) phases.get( "pre-integration-test" ) ) );
+ binding.setIntegrationTest( parsePhaseBindings( (String) phases.get( "integration-test" ) ) );
+ binding.setPostIntegrationTest( parsePhaseBindings( (String) phases.get( "post-integration-test" ) ) );
+ binding.setVerify( parsePhaseBindings( (String) phases.get( "verify" ) ) );
+ binding.setInstall( parsePhaseBindings( (String) phases.get( "install" ) ) );
+ binding.setDeploy( parsePhaseBindings( (String) phases.get( "deploy" ) ) );
+ }
return binding;
}
@@ -113,9 +105,12 @@
{
CleanBinding binding = new CleanBinding();
- binding.setPreClean( parsePhaseBindings( (String) phaseMappings.get( "pre-clean" ) ) );
- binding.setClean( parsePhaseBindings( (String) phaseMappings.get( "clean" ) ) );
- binding.setPostClean( parsePhaseBindings( (String) phaseMappings.get( "post-clean" ) ) );
+ if ( phaseMappings != null )
+ {
+ binding.setPreClean( parsePhaseBindings( (String) phaseMappings.get( "pre-clean" ) ) );
+ binding.setClean( parsePhaseBindings( (String) phaseMappings.get( "clean" ) ) );
+ binding.setPostClean( parsePhaseBindings( (String) phaseMappings.get( "post-clean" ) ) );
+ }
return binding;
}
@@ -150,9 +145,13 @@
{
SiteBinding binding = new SiteBinding();
- binding.setPreSite( parsePhaseBindings( (String) phases.get( "pre-site" ) ) );
- binding.setSite( parsePhaseBindings( (String) phases.get( "site" ) ) );
- binding.setPostSite( parsePhaseBindings( (String) phases.get( "post-site" ) ) );
+ if ( phases != null )
+ {
+ binding.setPreSite( parsePhaseBindings( (String) phases.get( "pre-site" ) ) );
+ binding.setSite( parsePhaseBindings( (String) phases.get( "site" ) ) );
+ binding.setPostSite( parsePhaseBindings( (String) phases.get( "post-site" ) ) );
+ binding.setSiteDeploy( parsePhaseBindings( (String) phases.get( "site-deploy" ) ) );
+ }
return binding;
}
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManager.java Fri Mar 9 14:27:53 2007
@@ -2,12 +2,12 @@
import org.apache.maven.lifecycle.LegacyLifecycleMappingParser;
import org.apache.maven.lifecycle.LifecycleBindingLoader;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
import org.apache.maven.lifecycle.LifecycleUtils;
-import org.apache.maven.lifecycle.MojoBinding;
import org.apache.maven.lifecycle.MojoBindingParser;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/binding/LifecycleBindingManager.java Fri Mar 9 14:27:53 2007
@@ -1,8 +1,8 @@
package org.apache.maven.lifecycle.binding;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlan.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlan.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlan.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlan.java Fri Mar 9 14:27:53 2007
@@ -1,8 +1,8 @@
package org.apache.maven.lifecycle.plan;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
import org.apache.maven.lifecycle.LifecycleUtils;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
import java.util.ArrayList;
import java.util.Iterator;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanModifier.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanModifier.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanModifier.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanModifier.java Fri Mar 9 14:27:53 2007
@@ -1,10 +1,10 @@
package org.apache.maven.lifecycle.plan;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
import org.apache.maven.lifecycle.LifecycleUtils;
-import org.apache.maven.lifecycle.MojoBinding;
-import org.apache.maven.lifecycle.Phase;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.lifecycle.model.Phase;
import java.util.ArrayList;
import java.util.Collections;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanner.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanner.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanner.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultLifecyclePlanner.java Fri Mar 9 14:27:53 2007
@@ -1,12 +1,12 @@
package org.apache.maven.lifecycle.plan;
-import org.apache.maven.lifecycle.LifecycleBinding;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleLoaderException;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
import org.apache.maven.lifecycle.LifecycleUtils;
-import org.apache.maven.lifecycle.MojoBinding;
import org.apache.maven.lifecycle.binding.LifecycleBindingManager;
+import org.apache.maven.lifecycle.model.LifecycleBinding;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.loader.PluginLoader;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleOverlayPlanModifier.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleOverlayPlanModifier.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleOverlayPlanModifier.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecycleOverlayPlanModifier.java Fri Mar 9 14:27:53 2007
@@ -1,7 +1,7 @@
package org.apache.maven.lifecycle.plan;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleUtils;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
import java.util.ArrayList;
import java.util.Iterator;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlan.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlan.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlan.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlan.java Fri Mar 9 14:27:53 2007
@@ -1,7 +1,7 @@
package org.apache.maven.lifecycle.plan;
-import org.apache.maven.lifecycle.LifecycleBindings;
import org.apache.maven.lifecycle.LifecycleSpecificationException;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
import java.util.List;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlanModifier.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlanModifier.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlanModifier.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/lifecycle/plan/LifecyclePlanModifier.java Fri Mar 9 14:27:53 2007
@@ -1,6 +1,6 @@
package org.apache.maven.lifecycle.plan;
-import org.apache.maven.lifecycle.LifecycleBindings;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
public interface LifecyclePlanModifier extends ModifiablePlanElement
{
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java Fri Mar 9 14:27:53 2007
@@ -5,8 +5,8 @@
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.context.BuildContextManager;
import org.apache.maven.execution.SessionContext;
-import org.apache.maven.lifecycle.MojoBinding;
import org.apache.maven.lifecycle.PrefixedMojoBinding;
+import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.InvalidPluginException;
import org.apache.maven.plugin.PluginManager;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java Fri Mar 9 14:27:53 2007
@@ -1,6 +1,6 @@
package org.apache.maven.plugin.loader;
-import org.apache.maven.lifecycle.MojoBinding;
+import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
Added: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java?view=auto&rev=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java (added)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java Fri Mar 9 14:27:53 2007
@@ -0,0 +1,62 @@
+package org.apache.maven.lifecycle;
+
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.codehaus.plexus.PlexusTestCase;
+
+import java.util.List;
+
+public class LegacyLifecycleMappingParserTest
+ extends PlexusTestCase
+{
+
+ private LegacyLifecycleParsingTestComponent testComponent;
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ testComponent = (LegacyLifecycleParsingTestComponent) lookup( LegacyLifecycleParsingTestComponent.ROLE, "default" );
+ }
+
+ public void tearDown() throws Exception
+ {
+ release( testComponent );
+
+ super.tearDown();
+ }
+
+ public void testParseDefaultMappings_UsingExistingDefaultMappings() throws LifecycleSpecificationException
+ {
+ List lifecycles = testComponent.getLifecycles();
+ LifecycleBindings bindings = LegacyLifecycleMappingParser.parseDefaultMappings( lifecycles );
+
+// <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+ List cleanPhase = bindings.getCleanBinding().getClean().getBindings();
+ assertEquals( 1, cleanPhase.size() );
+
+ MojoBinding binding = (MojoBinding) cleanPhase.get( 0 );
+ assertEquals( "org.apache.maven.plugins", binding.getGroupId() );
+ assertEquals( "maven-clean-plugin", binding.getArtifactId() );
+ assertEquals( "clean", binding.getGoal() );
+
+// <site>org.apache.maven.plugins:maven-site-plugin:site</site>
+ List sitePhase = bindings.getSiteBinding().getSite().getBindings();
+ assertEquals( 1, sitePhase.size() );
+
+ binding = (MojoBinding) sitePhase.get( 0 );
+ assertEquals( "org.apache.maven.plugins", binding.getGroupId() );
+ assertEquals( "maven-site-plugin", binding.getArtifactId() );
+ assertEquals( "site", binding.getGoal() );
+
+// <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
+ List siteDeployPhase = bindings.getSiteBinding().getSiteDeploy().getBindings();
+ assertEquals( 1, siteDeployPhase.size() );
+
+ binding = (MojoBinding) siteDeployPhase.get( 0 );
+ assertEquals( "org.apache.maven.plugins", binding.getGroupId() );
+ assertEquals( "maven-site-plugin", binding.getArtifactId() );
+ assertEquals( "deploy", binding.getGoal() );
+ }
+
+}
Propchange: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java?view=auto&rev=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java (added)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java Fri Mar 9 14:27:53 2007
@@ -0,0 +1,16 @@
+package org.apache.maven.lifecycle;
+
+import java.util.List;
+
+public class LegacyLifecycleParsingTestComponent
+{
+
+ public static final String ROLE = LegacyLifecycleParsingTestComponent.class.getName();
+ private List lifecycles;
+
+ public List getLifecycles()
+ {
+ return lifecycles;
+ }
+
+}
Propchange: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleParsingTestComponent.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml?view=auto&rev=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml (added)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml Fri Mar 9 14:27:53 2007
@@ -0,0 +1,65 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.lifecycle.LegacyLifecycleParsingTestComponent</role>
+ <role-hint>default</role-hint>
+ <implementation>org.apache.maven.lifecycle.LegacyLifecycleParsingTestComponent</implementation>
+ <configuration>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <phases>
+ <phase>validate</phase>
+ <phase>initialize</phase>
+ <phase>generate-sources</phase>
+ <phase>process-sources</phase>
+ <phase>generate-resources</phase>
+ <phase>process-resources</phase>
+ <phase>compile</phase>
+ <phase>process-classes</phase>
+ <phase>generate-test-sources</phase>
+ <phase>process-test-sources</phase>
+ <phase>generate-test-resources</phase>
+ <phase>process-test-resources</phase>
+ <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
+ <phase>test</phase>
+ <phase>prepare-package</phase>
+ <phase>package</phase>
+ <phase>pre-integration-test</phase>
+ <phase>integration-test</phase>
+ <phase>post-integration-test</phase>
+ <phase>verify</phase>
+ <phase>install</phase>
+ <phase>deploy</phase>
+ </phases>
+ </lifecycle>
+ <lifecycle>
+ <id>clean</id>
+ <phases>
+ <phase>pre-clean</phase>
+ <phase>clean</phase>
+ <phase>post-clean</phase>
+ </phases>
+ <default-phases>
+ <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+ </default-phases>
+ </lifecycle>
+ <lifecycle>
+ <id>site</id>
+ <phases>
+ <phase>pre-site</phase>
+ <phase>site</phase>
+ <phase>post-site</phase>
+ <phase>site-deploy</phase>
+ </phases>
+ <default-phases>
+ <site>org.apache.maven.plugins:maven-site-plugin:site</site>
+ <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
+ </default-phases>
+ </lifecycle>
+ </lifecycles>
+ </configuration>
+ </component>
+ </components>
+</component-set>
\ No newline at end of file
Propchange: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/2.1-lifecycle-refactor/maven-core/src/test/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoader.java Fri Mar 9 14:27:53 2007
@@ -1,6 +1,7 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.lifecycle.io.xpp3.LifecycleBindingsXpp3Reader;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.io.xpp3.LifecycleBindingsXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.IOException;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleBindingLoader.java Fri Mar 9 14:27:53 2007
@@ -1,5 +1,7 @@
package org.apache.maven.lifecycle;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+
public interface LifecycleBindingLoader
{
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleUtils.java Fri Mar 9 14:27:53 2007
@@ -1,5 +1,12 @@
package org.apache.maven.lifecycle;
+import org.apache.maven.lifecycle.model.BuildBinding;
+import org.apache.maven.lifecycle.model.CleanBinding;
+import org.apache.maven.lifecycle.model.LifecycleBinding;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.lifecycle.model.Phase;
+import org.apache.maven.lifecycle.model.SiteBinding;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.ArrayList;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingParser.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingParser.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingParser.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/MojoBindingParser.java Fri Mar 9 14:27:53 2007
@@ -1,6 +1,6 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.lifecycle.MojoBinding;
+import org.apache.maven.lifecycle.model.MojoBinding;
import java.util.StringTokenizer;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/PrefixedMojoBinding.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/PrefixedMojoBinding.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/PrefixedMojoBinding.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/PrefixedMojoBinding.java Fri Mar 9 14:27:53 2007
@@ -1,6 +1,6 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.lifecycle.MojoBinding;
+import org.apache.maven.lifecycle.model.MojoBinding;
public class PrefixedMojoBinding
extends MojoBinding
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo Fri Mar 9 14:27:53 2007
@@ -30,7 +30,7 @@
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.lifecycle</value>
+ <value>org.apache.maven.lifecycle.model</value>
</default>
</defaults>
<classes>
@@ -486,6 +486,14 @@
<type>Phase</type>
</association>
</field>
+ <field xml.tagName="site-deploy">
+ <name>siteDeploy</name>
+ <version>1.0.0</version>
+ <defaultValue>new Phase()</defaultValue>
+ <association>
+ <type>Phase</type>
+ </association>
+ </field>
</fields>
<codeSegments>
<codeSegment>
@@ -503,6 +511,7 @@
phases.add( getPreSite() );
phases.add( getSite() );
phases.add( getPostSite() );
+ phases.add( getSiteDeploy() );
return java.util.Collections.unmodifiableList( phases );
}
@@ -514,6 +523,7 @@
phases.add( "pre-site" );
phases.add( "site" );
phases.add( "post-site" );
+ phases.add( "site-deploy" );
return java.util.Collections.unmodifiableList( phases );
}
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/ClassLoaderXmlBindingLoaderTest.java Fri Mar 9 14:27:53 2007
@@ -1,5 +1,9 @@
package org.apache.maven.lifecycle;
+import org.apache.maven.lifecycle.model.CleanBinding;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.lifecycle.model.Phase;
import org.codehaus.plexus.PlexusTestCase;
import java.util.List;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/LifecycleUtilsTest.java Fri Mar 9 14:27:53 2007
@@ -1,5 +1,11 @@
package org.apache.maven.lifecycle;
+import org.apache.maven.lifecycle.model.BuildBinding;
+import org.apache.maven.lifecycle.model.CleanBinding;
+import org.apache.maven.lifecycle.model.LifecycleBinding;
+import org.apache.maven.lifecycle.model.LifecycleBindings;
+import org.apache.maven.lifecycle.model.MojoBinding;
+import org.apache.maven.lifecycle.model.Phase;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.ArrayList;
Modified: maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/MojoBindingParserTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/MojoBindingParserTest.java?view=diff&rev=516585&r1=516584&r2=516585
==============================================================================
--- maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/MojoBindingParserTest.java (original)
+++ maven/components/branches/2.1-lifecycle-refactor/maven-lifecycle/src/test/java/org/apache/maven/lifecycle/MojoBindingParserTest.java Fri Mar 9 14:27:53 2007
@@ -1,5 +1,7 @@
package org.apache.maven.lifecycle;
+import org.apache.maven.lifecycle.model.MojoBinding;
+
import junit.framework.TestCase;
public class MojoBindingParserTest