brett 2004/04/09 17:57:34
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenConstants.java
src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
set a variable that communicates what the default goal was
Revision Changes Path
No revision
No revision
1.30.4.6 +4 -1 maven/src/java/org/apache/maven/MavenConstants.java
Index: MavenConstants.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenConstants.java,v
retrieving revision 1.30.4.5
retrieving revision 1.30.4.6
diff -u -r1.30.4.5 -r1.30.4.6
--- MavenConstants.java 1 Apr 2004 01:52:19 -0000 1.30.4.5
+++ MavenConstants.java 10 Apr 2004 00:57:34 -0000 1.30.4.6
@@ -81,6 +81,9 @@
/** Project build file name. (maven.xml) */
public static final String BUILD_FILE_NAME = "maven.xml";
+ /** Defaults goal name property. */
+ public static final String DEFAULT_GOAL = "maven.default.goal";
+
/** Defaults properties */
public static final String DEFAULTS_PROPERTIES = "/defaults.properties";
No revision
No revision
1.70.4.36 +10 -7 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.35
retrieving revision 1.70.4.36
diff -u -r1.70.4.35 -r1.70.4.36
--- PluginManager.java 8 Apr 2004 00:12:05 -0000 1.70.4.35
+++ PluginManager.java 10 Apr 2004 00:57:34 -0000 1.70.4.36
@@ -29,6 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.maven.AbstractMavenComponent;
import org.apache.maven.AntProjectBuilder;
+import org.apache.maven.MavenConstants;
import org.apache.maven.MavenException;
import org.apache.maven.MavenSession;
import org.apache.maven.MavenUtils;
@@ -517,15 +518,17 @@
}
// Default goal handling - if goals are null, don't even process the default
- if ( goals != null && goals.size() == 0 )
+
+ String defaultGoalName = transientMapper.getDefaultGoalName();
+ if ( defaultGoalName != null )
{
- String defaultGoalName = transientMapper.getDefaultGoalName();
+ // By evaluating expression now it has the same scope as the POM.
+ Expression e = JellyUtils.decomposeExpression( defaultGoalName,
baseContext );
+ defaultGoalName = e.evaluateAsString( baseContext );
+ baseContext.setVariable( MavenConstants.DEFAULT_GOAL, defaultGoalName );
- if ( defaultGoalName != null )
+ if ( goals != null && goals.size() == 0 )
{
- // By evaluating expression now it has the same scope as the POM.
- Expression e = JellyUtils.decomposeExpression( defaultGoalName,
baseContext );
- defaultGoalName = e.evaluateAsString( baseContext );
log.debug( "Using default goal: " + defaultGoalName );
goals.add( defaultGoalName );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
