fixed
> -----Original Message----- > From: Emmanuel Venisse [mailto:[EMAIL PROTECTED] > Sent: Saturday, 3 April 2004 4:28 PM > To: Maven Developers List > Subject: Re: cvs commit: > maven/src/test/touchstone-build/src/reactor-build/default maven.xml > > > Touchnstone tests fails due to your last commit in > maven/src/test/touchstone-build/maven.xml > > [exec] BUILD FAILED > [exec] File...... > file:/D:/cvs_repo/jakarta/maven-branch/1.0/maven/maven.xml > [exec] Element... maven:maven > [exec] Total time: 3 minutes 35 seconds > [exec] Finished at: Sat Apr 03 08:25:14 CEST 2004 > > [exec] Line...... 64 > [exec] Column.... 7 > [exec] Unable to obtain goal [touchstone-tests] -- > file:/D:/cvs_repo/jakarta/maven-br > anch/1.0/maven/src/test/touchstone-build/maven.xml:784:7: > <maven:maven> No goal [null] > > Emmanuel > > ----- Original Message ----- > From: <[EMAIL PROTECTED]> > To: <[EMAIL PROTECTED]> > Sent: Saturday, April 03, 2004 1:43 AM > Subject: cvs commit: > maven/src/test/touchstone-build/src/reactor-build/default maven.xml > > > > brett 2004/04/02 15:43:09 > > > > Modified: src/java/org/apache/maven/jelly Tag: MAVEN-1_0-BRANCH > > JellyUtils.java MavenExpressionFactory.java > > MavenJellyContext.java > > src/java/org/apache/maven/plugin Tag: > MAVEN-1_0-BRANCH > > PluginManager.java > > src/test/touchstone-build Tag: > MAVEN-1_0-BRANCH maven.xml > > > src/test/touchstone-build/src/reactor-build/default Tag: > > MAVEN-1_0-BRANCH maven.xml > > Log: > > PR: MAVEN-1214 > > allow expressions in default goal name > > > > Revision Changes Path > > No revision > > No revision > > 1.16.4.7 +7 -6 > maven/src/java/org/apache/maven/jelly/JellyUtils.java > > > > Index: JellyUtils.java > > > =================================================================== > > RCS file: > /home/cvs/maven/src/java/org/apache/maven/jelly/JellyUtils.java,v > > retrieving revision 1.16.4.6 > > retrieving revision 1.16.4.7 > > diff -u -r1.16.4.6 -r1.16.4.7 > > --- JellyUtils.java 28 Mar 2004 21:27:27 -0000 1.16.4.6 > > +++ JellyUtils.java 2 Apr 2004 23:43:09 -0000 1.16.4.7 > > @@ -45,6 +45,9 @@ > > */ > > public class JellyUtils > > { > > + /** Maven Expression Factory. */ > > + private static MavenExpressionFactory > mavenExpressionFactory = new > MavenExpressionFactory(); > > + > > /** > > * Run a jelly script. > > * > > @@ -178,26 +181,24 @@ > > * Recursively evaluate a string representation of a jelly > expression. > > * > > * @param text String representation of the a Jelly > expression. > > - * @param factory Expression factory used for evaluating the > expression. > > * @param context The Jelly context to compute the expression > against. > > * > > * @return The recursively evaluated Jelly expression. > > */ > > public static Expression decomposeExpression( String text, > > - > ExpressionFactory > factory, > > JellyContext > context ) > > { > > Expression expression = null; > > > > try > > { > > - expression = CompositeExpression.parse( > text, factory ); > > + expression = CompositeExpression.parse( text, > mavenExpressionFactory ); > > > > String expressionText = expression.evaluateAsString( > context ); > > > > - if ( CompositeExpression.parse( > expressionText, factory ) > instanceof CompositeExpression ) > > + if ( CompositeExpression.parse( expressionText, > mavenExpressionFactory ) instanceof CompositeExpression ) > > { > > - expression = decomposeExpression( expressionText, > factory, context ); > > + expression = decomposeExpression( expressionText, > context ); > > } > > } > > catch ( Exception e ) > > > > > > > > 1.12.4.2 +2 -3 > maven/src/java/org/apache/maven/jelly/MavenExpressionFactory.java > > > > Index: MavenExpressionFactory.java > > > =================================================================== > > RCS file: > /home/cvs/maven/src/java/org/apache/maven/jelly/MavenExpressio > nFactory.java, > v > > retrieving revision 1.12.4.1 > > retrieving revision 1.12.4.2 > > diff -u -r1.12.4.1 -r1.12.4.2 > > --- MavenExpressionFactory.java 1 Mar 2004 22:36:36 -0000 1.12.4.1 > > +++ MavenExpressionFactory.java 2 Apr 2004 23:43:09 -0000 1.12.4.2 > > @@ -81,8 +81,7 @@ > > > > if ( answer instanceof String ) > > { > > - Expression e = > JellyUtils.decomposeExpression( (String) answer, f, context ); > > - return e; > > + return > JellyUtils.decomposeExpression( (String) answer, context ); > > } > > } > > > > > > > > > > 1.35.4.5 +1 -11 > maven/src/java/org/apache/maven/jelly/MavenJellyContext.java > > > > Index: MavenJellyContext.java > > > =================================================================== > > RCS file: > /home/cvs/maven/src/java/org/apache/maven/jelly/MavenJellyCont > ext.java,v > > retrieving revision 1.35.4.4 > > retrieving revision 1.35.4.5 > > diff -u -r1.35.4.4 -r1.35.4.5 > > --- MavenJellyContext.java 1 Apr 2004 01:52:20 -0000 1.35.4.4 > > +++ MavenJellyContext.java 2 Apr 2004 23:43:09 -0000 1.35.4.5 > > @@ -257,16 +257,6 @@ > > } > > > > /** > > - * Set the mavenRepoRemote attribute. > > - * > > - * @param mavenRepoRemote List of remove repositories. > > - */ > > - public void setMavenRepoRemotes( List mavenRepoRemote ) > > - { > > - setVariable( MavenConstants.REPO_REMOTE, > mavenRepoRemote ); > > - } > > - > > - /** > > * Get the mavenRepoRemote attribute. > > * > > * @return The list of remote repositories. > > > > > > > > No revision > > No revision > > 1.70.4.34 +5 -1 > 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.33 > > retrieving revision 1.70.4.34 > > diff -u -r1.70.4.33 -r1.70.4.34 > > --- PluginManager.java 2 Apr 2004 03:42:25 -0000 1.70.4.33 > > +++ PluginManager.java 2 Apr 2004 23:43:09 -0000 1.70.4.34 > > @@ -23,6 +23,7 @@ > > import com.werken.werkz.WerkzProject; > > import com.werken.werkz.jelly.JellySession; > > import org.apache.commons.io.FileUtils; > > +import org.apache.commons.jelly.expression.Expression; > > import org.apache.commons.jelly.Script; > > import org.apache.commons.logging.Log; > > import org.apache.commons.logging.LogFactory; > > @@ -522,6 +523,9 @@ > > > > if ( defaultGoalName != null ) > > { > > + // 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 ); > > } > > > > > > > > No revision > > No revision > > 1.43.4.11 +9 -0 maven/src/test/touchstone-build/maven.xml > > > > Index: maven.xml > > > =================================================================== > > RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v > > retrieving revision 1.43.4.10 > > retrieving revision 1.43.4.11 > > diff -u -r1.43.4.10 -r1.43.4.11 > > --- maven.xml 4 Mar 2004 17:47:00 -0000 1.43.4.10 > > +++ maven.xml 2 Apr 2004 23:43:09 -0000 1.43.4.11 > > @@ -776,6 +776,15 @@ > > <j:if test="${ranDefault != 'subproject-default'}"> > > <ant:fail>Default goal in subproject is not > overriding parent > project</ant:fail> > > </j:if> > > + > > + <maven:maven > > + > descriptor="${basedir}/src/reactor-build/default/project.xml" > > + goals="" > > + ignoreFailures="false" > > + /> > > + <j:if test="${ranDefault != 'base-default'}"> > > + <ant:fail>Default goal in base project is not honouring > property</ant:fail> > > + </j:if> > > </goal> > > </project> > > > > > > > > > > No revision > > No revision > > 1.1.2.3 +1 -1 > maven/src/test/touchstone-build/src/reactor-build/default/maven.xml > > > > Index: maven.xml > > > =================================================================== > > RCS file: > /home/cvs/maven/src/test/touchstone-build/src/reactor-build/de > fault/maven.xm > l,v > > retrieving revision 1.1.2.2 > > retrieving revision 1.1.2.3 > > diff -u -r1.1.2.2 -r1.1.2.3 > > --- maven.xml 4 Mar 2004 17:47:00 -0000 1.1.2.2 > > +++ maven.xml 2 Apr 2004 23:43:09 -0000 1.1.2.3 > > @@ -17,7 +17,7 @@ > > */ > > --> > > > > -<project default="base-default" > > +<project default="${base.default.goal}" > > xmlns:j="jelly:core"> > > > > <goal name="base-default"> > > > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] >
