jvanzyl 2004/05/20 20:43:28
Modified: maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java
maven-core/src/main/resources/org/apache/maven plexus.xml
maven-core/src/test/java/org/apache/maven/lifecycle
MavenLifecycleManagerTest.java
maven-core/src/test/java/org/apache/maven/lifecycle/phase
GoalDecorationPhaseTest.java
maven-core/src/test/resources maven.xml
Removed: maven-core/src/main/resources/META-INF/plexus components.xml
Log:
Revision Changes Path
1.4 +0 -1
maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultPluginManager.java 20 May 2004 21:51:02 -0000 1.3
+++ DefaultPluginManager.java 21 May 2004 03:43:28 -0000 1.4
@@ -92,7 +92,6 @@
for ( Iterator it = goalList.iterator(); it.hasNext(); )
{
-
execStack.push( it.next() );
}
1.15 +39 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plexus.xml 20 May 2004 20:38:03 -0000 1.14
+++ plexus.xml 21 May 2004 03:43:28 -0000 1.15
@@ -20,5 +20,44 @@
<maven-home>${maven.home}</maven-home>
</configuration>
</component>
+ <component>
+ <role>org.apache.maven.MavenCore</role>
+ <implementation>org.apache.maven.DefaultMavenCore</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.plugin.PluginManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.MavenLifecycleManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
+ <configuration>
+
<default-bundle-name>org.apache.maven.messages.messages</default-bundle-name>
+ </configuration>
+ </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.GoalDecorationPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalResolutionPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.DependencyResolutionPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.PluginDownloadPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.ArtifactDownloadPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalAttainmentPhase"/>
+ </lifecycle-phases>
+ </configuration>
+ </component>
</components>
</configuration>
1.4 +2 -2
maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java
Index: MavenLifecycleManagerTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MavenLifecycleManagerTest.java 20 May 2004 21:51:02 -0000 1.3
+++ MavenLifecycleManagerTest.java 21 May 2004 03:43:28 -0000 1.4
@@ -23,6 +23,6 @@
List lifecyclePhases = mlm.getLifecyclePhases();
- assertEquals( 5, lifecyclePhases.size() );
+ assertEquals( 6, lifecyclePhases.size() );
}
}
1.2 +2 -2
maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/phase/GoalDecorationPhaseTest.java
Index: GoalDecorationPhaseTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/phase/GoalDecorationPhaseTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalDecorationPhaseTest.java 12 May 2004 23:38:41 -0000 1.1
+++ GoalDecorationPhaseTest.java 21 May 2004 03:43:28 -0000 1.2
@@ -14,7 +14,8 @@
/**
* @author jdcasey
*/
-public class GoalDecorationPhaseTest extends MavenPlexusComponentTestBase
+public class GoalDecorationPhaseTest
+ extends MavenPlexusComponentTestBase
{
public GoalDecorationPhaseTest( String name )
{
@@ -49,5 +50,4 @@
assertEquals( "compile", script.getDefaultGoal() );
}
-
}
1.2 +10 -6 maven-components/maven-core/src/test/resources/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/resources/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 13 May 2004 21:50:55 -0000 1.1
+++ maven.xml 21 May 2004 03:43:28 -0000 1.2
@@ -1,11 +1,15 @@
-<project default="compile">
+<?xml version="1.0" encoding="UTF-8"?>
- <goal name="dummy">
- </goal>
-
+<project default="compile" xmlns:c="marmalade:jstl-core">
<preGoal name="dummy">
+ <c:set var="testPreGoal" value="TestValue"/>
</preGoal>
-
+
<postGoal name="dummy">
+ <c:set var="testPostGoal" value="TestValue"/>
</postGoal>
-</project>
\ No newline at end of file
+</project>
+
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
