Author: stephenc Date: Tue Oct 20 20:22:28 2009 New Revision: 827777 URL: http://svn.apache.org/viewvc?rev=827777&view=rev Log: [MINVOKER-95] Committing some tidy-up's suggested by Benjamin Bentmann
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-false/selector.bsh (props changed) maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-other/selector.bsh (props changed) maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-quiet/selector.bsh (props changed) maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-true/selector.bsh (props changed) maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-throw/selector.bsh (props changed) maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-false/selector.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-other/selector.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-quiet/selector.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-ret-true/selector.bsh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-invoker-plugin/src/it/selector-scripts/src/it/script-throw/selector.bsh ------------------------------------------------------------------------------ svn:eol-style = native Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=827777&r1=827776&r2=827777&view=diff ============================================================================== --- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Tue Oct 20 20:22:28 2009 @@ -225,14 +225,17 @@ private Invoker invoker; /** - * Relative path of a selector script to run prior to executing the build. This script may be written with - * either BeanShell or Groovy (since 1.3). If the file extension is omitted (e.g. <code>prebuild</code>), the plugin - * searches for the file by trying out the well-known extensions <code>.bsh</code> and <code>.groovy</code>. If this - * script exists for a particular project but returns any non-null value different from <code>true</code> or throws - * an exception, the corresponding build is flagged as skipped. In this case, none of the pre-build hook script, - * Maven nor the post-build hook script will be invoked. + * Relative path of a selector script to run prior in order to decide if the build should be executed. This script + * may be written with either BeanShell or Groovy. If the file extension is omitted (e.g. <code>selector</code>), + * the plugin searches for the file by trying out the well-known extensions <code>.bsh</code> and <code>.groovy</code>. + * If this script exists for a particular project but returns any non-null value different from <code>true</code>, + * the corresponding build is flagged as skipped. In this case, none of the pre-build hook script, + * Maven nor the post-build hook script will be invoked. If this script throws an exception, the corresponding + * build is flagged as in error, and none of the pre-build hook script, Maven not the post-build hook script will + * be invoked. * * @parameter expression="${invoker.selectorScript}" default-value="selector" + * @since 1.5 */ private String selectorScript; Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm?rev=827777&r1=827776&r2=827777&view=diff ============================================================================== --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm Tue Oct 20 20:22:28 2009 @@ -58,7 +58,7 @@ In this example, the directory <<<src/it>>> is the location where all the IT projects reside. You simply put each integration test into a distinct sub directory, like shown by <<<first-it>>> and <<<second-it>>>. The plugin - configuration for this example would like this: + configuration for this example would look like this: ------------------- <project>