From d8e768b676bc9c9e55ec5193c7887b28c250a464 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Fri, 23 Jun 2006 14:43:50 +0000 Subject: [PATCH] PR: MPCONSOLE-6 Add tab completion and history functionality using the jline library. New property maven.console.completor.goals. Upgrade to commons-jelly-tags-interaction-1.1. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@416733 13f79535-47bb-0310-9956-ffa450edef68 --- console/plugin.jelly | 3 ++- console/plugin.properties | 1 + console/project.xml | 7 ++++++- console/xdocs/changes.xml | 3 +++ console/xdocs/index.xml | 12 ++++-------- console/xdocs/navigation.xml | 1 + console/xdocs/properties.xml | 9 +++++++++ 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/console/plugin.jelly b/console/plugin.jelly index d6733397..10164822 100644 --- a/console/plugin.jelly +++ b/console/plugin.jelly @@ -30,7 +30,8 @@ - + ${maven.console.completor.goals} + diff --git a/console/plugin.properties b/console/plugin.properties index 19e75505..1e919ecf 100644 --- a/console/plugin.properties +++ b/console/plugin.properties @@ -22,3 +22,4 @@ # console (defaults to "help"). The usage section is displayed in # any case). maven.console.first = ${maven.default.goal} +maven.console.completor.goals = clean,java:compile,jar,test,xdoc,site,quit,help diff --git a/console/project.xml b/console/project.xml index 2c05fc3a..bbba3915 100644 --- a/console/project.xml +++ b/console/project.xml @@ -53,12 +53,17 @@ commons-jelly commons-jelly-tags-interaction - 1.0 + 1.1 commons-jelly commons-jelly-tags-log 1.0 + + jline + jline + 0.9.5 + diff --git a/console/xdocs/changes.xml b/console/xdocs/changes.xml index 87f47a80..f300a314 100644 --- a/console/xdocs/changes.xml +++ b/console/xdocs/changes.xml @@ -25,6 +25,9 @@ + Upgrade to commons-jelly-tags-interaction-1.1. + New property maven.console.completor.goals. + Add tab completion and history functionality using the jline library. Split property setting into a separate goal console:set-properties to allow annotation of the properties Removed the list command as it hasn't worked as expected since the early betas (goals are lazy loaded into the werkz project) Add way to display a property value diff --git a/console/xdocs/index.xml b/console/xdocs/index.xml index 281ac12a..dfe3700c 100644 --- a/console/xdocs/index.xml +++ b/console/xdocs/index.xml @@ -61,14 +61,10 @@

- It is possible to add completion and history to the console, however - it requires the use of an external library. This library is licensed - under the LPGL, and so cannot be used in the console by default, but - can be downloaded from JLine. -

-

- Instructions are detailed in this - mailing list post. + In version 1.2 of the console plugin, tab completion and history functionality + have been introduced via the use of the + jline library. Check the jline + homepage for documentation, in particular a list of default key bindings.

diff --git a/console/xdocs/navigation.xml b/console/xdocs/navigation.xml index 64c323e2..64c23992 100644 --- a/console/xdocs/navigation.xml +++ b/console/xdocs/navigation.xml @@ -27,6 +27,7 @@ + diff --git a/console/xdocs/properties.xml b/console/xdocs/properties.xml index 685aac26..0804db70 100644 --- a/console/xdocs/properties.xml +++ b/console/xdocs/properties.xml @@ -38,6 +38,15 @@ The help is displayed in any case. + + maven.console.completor.goals + Yes + + A comma-separated list of goals that are known to the console plugin + for tab completion. Defaults to + "clean,java:compile,jar,test,xdoc,site,quit,help". + +