jvanzyl 2004/04/05 08:41:46
Modified: maven-core project.xml
maven-core/src/main/resources/org/apache/maven plexus.xml
maven-core/src/test/java/org/apache/maven/plugin
PluginTest.java
Added: maven-core/src/main/java/org/apache/maven/lifecycle
AbstractMavenLifecyclePhase.java
DefaultMavenLifecycleManager.java
MavenLifecycleContext.java
MavenLifecycleManager.java MavenLifecyclePhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/phase
DependencyResolutionPhase.java
GoalAttainmentPhase.java
maven-core/src/test/java/org/apache/maven/lifecycle
MavenLifecycleManagerTest.java
Log:
Revision Changes Path
1.4 +1 -1 maven-components/maven-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 17:23:43 -0000 1.3
+++ project.xml 5 Apr 2004 15:41:46 -0000 1.4
@@ -130,7 +130,7 @@
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
- <include>**/PluginTest.java</include>
+ <include>**/*Test.java</include>
</includes>
<resources>
<resource>
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/AbstractMavenLifecyclePhase.java
Index: AbstractMavenLifecyclePhase.java
===================================================================
package org.apache.maven.lifecycle;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: AbstractMavenLifecyclePhase.java,v 1.1 2004/04/05 15:41:46 jvanzyl
Exp $
*/
public abstract class AbstractMavenLifecyclePhase
implements MavenLifecyclePhase
{
}
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultMavenLifecycleManager.java
Index: DefaultMavenLifecycleManager.java
===================================================================
package org.apache.maven.lifecycle;
import java.util.List;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: DefaultMavenLifecycleManager.java,v 1.1 2004/04/05 15:41:46 jvanzyl
Exp $
*/
public class DefaultMavenLifecycleManager
implements MavenLifecycleManager
{
private List lifecyclePhases;
public List getLifecyclePhases()
{
return lifecyclePhases;
}
}
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleContext.java
Index: MavenLifecycleContext.java
===================================================================
package org.apache.maven.lifecycle;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: MavenLifecycleContext.java,v 1.1 2004/04/05 15:41:46 jvanzyl Exp $
*/
public class MavenLifecycleContext
{
}
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleManager.java
Index: MavenLifecycleManager.java
===================================================================
package org.apache.maven.lifecycle;
import java.util.List;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: MavenLifecycleManager.java,v 1.1 2004/04/05 15:41:46 jvanzyl Exp $
*/
public interface MavenLifecycleManager
{
String ROLE = MavenLifecycleManager.class.getName();
List getLifecyclePhases();
}
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java
Index: MavenLifecyclePhase.java
===================================================================
package org.apache.maven.lifecycle;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: MavenLifecyclePhase.java,v 1.1 2004/04/05 15:41:46 jvanzyl Exp $
*/
public interface MavenLifecyclePhase
{
String ROLE = MavenLifecyclePhase.class.getName();
void execute( MavenLifecycleContext context )
throws Exception;
}
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/DependencyResolutionPhase.java
Index: DependencyResolutionPhase.java
===================================================================
package org.apache.maven.lifecycle.phase;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
import org.apache.maven.lifecycle.MavenLifecycleContext;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: DependencyResolutionPhase.java,v 1.1 2004/04/05 15:41:46 jvanzyl
Exp $
*/
public class DependencyResolutionPhase
extends AbstractMavenLifecyclePhase
{
public void execute( MavenLifecycleContext context )
throws Exception
{
}
}
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java
Index: GoalAttainmentPhase.java
===================================================================
package org.apache.maven.lifecycle.phase;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
import org.apache.maven.lifecycle.MavenLifecycleContext;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: GoalAttainmentPhase.java,v 1.1 2004/04/05 15:41:46 jvanzyl Exp $
*/
public class GoalAttainmentPhase
extends AbstractMavenLifecyclePhase
{
public void execute( MavenLifecycleContext context )
throws Exception
{
}
}
1.5 +10 -0
maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/resources/org/apache/maven/plexus.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plexus.xml 4 Apr 2004 17:23:44 -0000 1.4
+++ plexus.xml 5 Apr 2004 15:41:46 -0000 1.5
@@ -56,6 +56,16 @@
</requirement>
</requirements>
</component>
+ <component>
+ <role>org.apache.maven.lifecycle.MavenLifecycleManager</role>
+
<implementation>org.apache.maven.lifecycle.DefaultMavenLifecycleManager</implementation>
+ <configuration>
+ <lifecycle-phases>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.DependencyResolutionPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalAttainmentPhase"/>
+ </lifecycle-phases>
+ </configuration>
+ </component>
<!--
|
1.1
maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java
Index: MavenLifecycleManagerTest.java
===================================================================
package org.apache.maven.lifecycle;
import org.apache.maven.MavenPlexusComponentTestBase;
import java.util.List;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: MavenLifecycleManagerTest.java,v 1.1 2004/04/05 15:41:46 jvanzyl
Exp $
*/
public class MavenLifecycleManagerTest
extends MavenPlexusComponentTestBase
{
public MavenLifecycleManagerTest( String name )
{
super( name );
}
public void testMavenLifecycleManager()
throws Exception
{
MavenLifecycleManager mlm = (MavenLifecycleManager) lookup(
MavenLifecycleManager.ROLE );
List lifecyclePhases = mlm.getLifecyclePhases();
assertEquals( 2, lifecyclePhases.size() );
}
}
1.3 +5 -23
maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java
Index: PluginTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PluginTest.java 21 Mar 2004 00:33:18 -0000 1.2
+++ PluginTest.java 5 Apr 2004 15:41:46 -0000 1.3
@@ -25,8 +25,6 @@
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
/**
*
@@ -74,11 +72,7 @@
Maven maven = (Maven) lookup( Maven.ROLE );
- List goals = new ArrayList();
-
- goals.add( "integrated-execute" );
-
- maven.attainGoals( new File( System.getProperty( "user.dir"), "project.xml"
), goals );
+ maven.attainGoal( new File( System.getProperty( "user.dir"), "project.xml"
), "integrated-execute" );
IntegratedPlugin integratedPlugin = (IntegratedPlugin)
getContainer().lookup( Plugin.ROLE, "integrated-plugin" );
@@ -98,11 +92,7 @@
Maven maven = (Maven) lookup( Maven.ROLE );
- List goals = new ArrayList();
-
- goals.add( "singleton-execute" );
-
- maven.attainGoals( new File( System.getProperty( "user.dir"), "project.xml"
), goals );
+ maven.attainGoal( new File( System.getProperty( "user.dir"), "project.xml"
), "singleton-execute" );
SingletonPlugin singletonPlugin = (SingletonPlugin) getContainer().lookup(
Plugin.ROLE, "singleton-plugin" );
@@ -122,11 +112,7 @@
Maven maven = (Maven) lookup( Maven.ROLE );
- List goals = new ArrayList();
-
- goals.add( "setter-execute" );
-
- maven.attainGoals( new File( System.getProperty( "user.dir"), "project.xml"
), goals );
+ maven.attainGoal( new File( System.getProperty( "user.dir"), "project.xml"
), "setter-execute" );
// Now the goal has been attain, but because the instantiation strategy is
per-lookup
// We can't get the plugin object that executed. So we've made a little
class called
@@ -149,11 +135,7 @@
Maven maven = (Maven) lookup( Maven.ROLE );
- List goals = new ArrayList();
-
- goals.add( "field-execute" );
-
- maven.attainGoals( new File( System.getProperty( "user.dir"), "project.xml"
), goals );
+ maven.attainGoal( new File( System.getProperty( "user.dir"), "project.xml"
), "field-execute" );
// Now the goal has been attain, but because the instantiation strategy is
per-lookup
// We can't get the plugin object that executed. So we've made a little
class called
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
