Author: brett Date: Thu Jan 20 14:32:27 2005 New Revision: 125826 URL: http://svn.apache.org/viewcvs?view=rev&rev=125826 Log: update docs, make minor improvements Modified: maven/maven-1/plugins/trunk/console/plugin.jelly maven/maven-1/plugins/trunk/console/project.xml maven/maven-1/plugins/trunk/console/xdocs/changes.xml maven/maven-1/plugins/trunk/console/xdocs/goals.xml maven/maven-1/plugins/trunk/console/xdocs/index.xml
Modified: maven/maven-1/plugins/trunk/console/plugin.jelly Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/console/plugin.jelly?view=diff&rev=125826&p1=maven/maven-1/plugins/trunk/console/plugin.jelly&r1=125825&p2=maven/maven-1/plugins/trunk/console/plugin.jelly&r2=125826 ============================================================================== --- maven/maven-1/plugins/trunk/console/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/console/plugin.jelly Thu Jan 20 14:32:27 2005 @@ -32,7 +32,11 @@ <log:info/> <i:ask question="${pom.artifactId} ${pom.currentVersion} >" answer="goal" default="${lastGoal}"/> <j:choose> - <j:when test="${goal.indexOf('=') != '-1'}"> + <j:when test="${goal.indexOf('=') == '0'}"> + <j:set var="prop" value="${goal.substring(1)}" /> + <log:info>${prop} = ${context.getVariable(prop)}</log:info> + </j:when> + <j:when test="${goal.indexOf('=') gt 0}"> <util:tokenize var="propertyPieces" delim="=">${goal}</util:tokenize> <log:info>Setting property ${propertyPieces[0]} to ${propertyPieces[1]}</log:info> <j:set var="${propertyPieces[0]}" value="${propertyPieces[1]}" scope="parent" /> @@ -40,9 +44,6 @@ <j:when test="${goal=='help'}"> <attainGoal name="console:help"/> </j:when> - <j:when test="${goal=='list'}"> - <attainGoal name="console:listGoals"/> - </j:when> <j:when test="${goal=='quit'}"> <j:set var="followOn" value="false"/> </j:when> @@ -66,20 +67,14 @@ </j:while> </goal> - <goal name="console:listGoals" description="List all available goals"> - <j:set var="proj" value="${org.apache.commons.jelly.werkz.Project}"/> - <j:forEach var="listGoal" items="${proj.goals}" trim="false"> -<log:info>${listGoal.name}</log:info> - </j:forEach> - </goal> - <goal name="console:help" description="Print the help message."> <log:info> The following commands are available: - list - list all available goals help - this message <goalname> - attain a goal + <property>=<value> - set a property value + =<property> - display a property value quit - quits the console </log:info> Modified: maven/maven-1/plugins/trunk/console/project.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/console/project.xml?view=diff&rev=125826&p1=maven/maven-1/plugins/trunk/console/project.xml&r1=125825&p2=maven/maven-1/plugins/trunk/console/project.xml&r2=125826 ============================================================================== --- maven/maven-1/plugins/trunk/console/project.xml (original) +++ maven/maven-1/plugins/trunk/console/project.xml Thu Jan 20 14:32:27 2005 @@ -23,7 +23,7 @@ <pomVersion>3</pomVersion> <id>maven-console-plugin</id> <name>Maven Console Plugin</name> - <currentVersion>1.1</currentVersion> + <currentVersion>1.2-SNAPSHOT</currentVersion> <shortDescription>Console for Maven</shortDescription> <url>http://maven.apache.org/reference/plugins/console/</url> <issueTrackingUrl>http://jira.codehaus.org/browse/MPCONSOLE</issueTrackingUrl> Modified: maven/maven-1/plugins/trunk/console/xdocs/changes.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/console/xdocs/changes.xml?view=diff&rev=125826&p1=maven/maven-1/plugins/trunk/console/xdocs/changes.xml&r1=125825&p2=maven/maven-1/plugins/trunk/console/xdocs/changes.xml&r2=125826 ============================================================================== --- maven/maven-1/plugins/trunk/console/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/console/xdocs/changes.xml Thu Jan 20 14:32:27 2005 @@ -24,6 +24,11 @@ <author email="[EMAIL PROTECTED]">dIon Gillard</author> </properties> <body> + <release version="1.2-SNAPSHOT" date="in SVN"> + <action dev="brett" type="remove">Removed the <code>list</code> command as it hasn't worked as expected since the early betas (goals are lazy loaded into the werkz project)</action> + <action dev="brett" type="add">Add way to display a property value</action> + <action dev="brett" type="update">Improve help</action> + </release> <release version="1.1" date="2004-05-15"> <action dev="brett" type="add" issue="MPCONSOLE-2">Add some whitespace before goal</action> <action dev="brett" type="fix">Set properties in parent scope so it takes effect for plugin properties</action> Modified: maven/maven-1/plugins/trunk/console/xdocs/goals.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/console/xdocs/goals.xml?view=diff&rev=125826&p1=maven/maven-1/plugins/trunk/console/xdocs/goals.xml&r1=125825&p2=maven/maven-1/plugins/trunk/console/xdocs/goals.xml&r2=125826 ============================================================================== --- maven/maven-1/plugins/trunk/console/xdocs/goals.xml (original) +++ maven/maven-1/plugins/trunk/console/xdocs/goals.xml Thu Jan 20 14:32:27 2005 @@ -36,12 +36,6 @@ </td> </tr> <tr> - <td>console:listGoals</td> - <td> - Lists the goals available for the currently loaded project - </td> - </tr> - <tr> <td>console:help</td> <td>Displays a help message along with a list of valid commands</td> </tr> Modified: maven/maven-1/plugins/trunk/console/xdocs/index.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/console/xdocs/index.xml?view=diff&rev=125826&p1=maven/maven-1/plugins/trunk/console/xdocs/index.xml&r1=125825&p2=maven/maven-1/plugins/trunk/console/xdocs/index.xml&r2=125826 ============================================================================== --- maven/maven-1/plugins/trunk/console/xdocs/index.xml (original) +++ maven/maven-1/plugins/trunk/console/xdocs/index.xml Thu Jan 20 14:32:27 2005 @@ -34,13 +34,21 @@ </p> <p> The console simply loads the current project.xml and waits for - the user to supply a goal (or other command) to execute. The - following commands are currently implemented: - <ul> - <li>help - displays the valid commands for the console</li> - <li>list - lists valid goals for the loaded project</li> - </ul> + the user to supply a goal (or set of comma-separated goals) to execute. </p> + <source>clean,jar:jar</source> + <p> + You can press enter to re-run the last successful goal which is + displayed in the prompt. + </p> + <p> + To change a property on the fly, assign it like so: + </p> + <source>maven.test.skip=true</source> + <p> + To check the current value of a property, start the command with <code>=</code>: + </p> + <source>=maven.compile.source</source> <p> For more information on the functionality provided by this plugin, please see the <a href="goals.html">Goals</a> document. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
