You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/07/02 05:31:08 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/lifecycle MavenLifecycleManagerTest.java
jvanzyl 2004/07/01 20:31:08
Modified: maven-core/src/main/java/org/apache/maven/lifecycle/phase
GoalAttainmentPhase.java GoalResolutionPhase.java
maven-core/src/test/java/org/apache/maven/lifecycle
MavenLifecycleManagerTest.java
Log:
Revision Changes Path
1.12 +9 -14 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java
Index: GoalAttainmentPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GoalAttainmentPhase.java 27 Jun 2004 17:02:17 -0000 1.11
+++ GoalAttainmentPhase.java 2 Jul 2004 03:31:08 -0000 1.12
@@ -79,7 +79,6 @@
context.release( plugin );
}
-
}
}
@@ -103,10 +102,11 @@
Object value = OgnlProjectValueExtractor.evaluate( expression, project, container );
- if ( value == null && parameter.isRequired() )
- {
-
- }
+ //@todo: mojo parameter validation
+ // This is the place where parameter validation should be performed.
+ //if ( value == null && parameter.isRequired() )
+ //{
+ //}
map.put( key, value );
}
@@ -115,14 +115,10 @@
return map;
}
-
-
- private void releaseComponents( MojoDescriptor goal, PluginExecutionRequest request, MavenLifecycleContext context )
+ private void releaseComponents( MojoDescriptor goal, PluginExecutionRequest request, MavenLifecycleContext context )
{
-
- if ( request != null && request.getParameters() != null )
+ if ( request != null && request.getParameters() != null )
{
-
for ( Iterator iterator = goal.getParameters().iterator(); iterator.hasNext(); )
{
Parameter parameter = (Parameter) iterator.next();
@@ -133,12 +129,11 @@
if ( expression != null & expression.startsWith( "#component" ) )
{
- Object component = request.getParameter( key );
+ Object component = request.getParameter( key );
context.release( component );
}
}
}
-
}
}
1.7 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalResolutionPhase.java
Index: GoalResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalResolutionPhase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GoalResolutionPhase.java 27 Jun 2004 17:02:17 -0000 1.6
+++ GoalResolutionPhase.java 2 Jul 2004 03:31:08 -0000 1.7
@@ -32,7 +32,6 @@
public void execute( MavenLifecycleContext context )
throws Exception
{
-
PluginManager pluginManager = null;
try
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 27 Jun 2004 07:39:08 -0000 1.3
+++ MavenLifecycleManagerTest.java 2 Jul 2004 03:31:08 -0000 1.4
@@ -18,6 +18,6 @@
List lifecyclePhases = mlm.getLifecyclePhases();
- assertEquals( 8, lifecyclePhases.size() );
+ assertEquals( 5, lifecyclePhases.size() );
}
}