Author: bentmann
Date: Sun Sep 20 11:52:30 2009
New Revision: 817011
URL: http://svn.apache.org/viewvc?rev=817011&view=rev
Log:
o Polished site
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java?rev=817011&r1=817010&r2=817011&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
Sun Sep 20 11:52:30 2009
@@ -57,7 +57,7 @@
/**
* The Maven Project.
*
- * @parameter expression="${project}"
+ * @parameter default-value="${project}"
* @required
* @readonly
*/
@@ -82,7 +82,7 @@
* the command line. If the goal is run indirectly as part of a site
generation, the output directory configured in
* the Maven Site Plugin is used instead.
*
- * @parameter expression="${project.reporting.outputDirectory}"
+ * @parameter default-value="${project.reporting.outputDirectory}"
* @required
*/
protected File outputDirectory;
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm?rev=817011&r1=817010&r2=817011&view=diff
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/integration-test-verify.apt.vm
Sun Sep 20 11:52:30 2009
@@ -30,7 +30,7 @@
If you are using other integration test frameworks, or if you need to setup
an integration test enviroment prior to
test execution and tear that envronment down afterwards, then you need to
use the <<<invoker:integration-test>>> and
- <<<invoker:verify>> goals in place of <<<invoker:run>>>. For example:
+ <<<invoker:verify>>> goals in place of <<<invoker:run>>>. For example:
+----
<project>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt?rev=817011&r1=817010&r2=817011&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/index.apt Sun Sep 20
11:52:30 2009
@@ -36,18 +36,24 @@
* Goals Overview
- The Invoker Plugin has two goals:
+ The plugin has four goals meant to participate in the default build
lifecycle:
- * {{{./install-mojo.html}invoker:install}} copies the project artifacts of
the main build into the local repository to
- prepare the execution of the selected sub projects.
-
- * {{{./run-mojo.html}invoker:run}} runs a set of Maven projects in a
directory and verifies the result (this is
- equivalent to running both <<<invoker:integration-test>>> and
<<<invoker:verify>>>).
+ * {{{./install-mojo.html}invoker:install}} copies the project artifacts and
dependencies of the main build into a
+ dedicated local repository to prepare the execution of the selected sub
projects in an isolated environment.
* {{{./integration-test-mojo.html}invoker:integration-test}} runs a set of
Maven projects in a directory.
* {{{./verify-mojo.html}invoker:verify}} verifies the result of
<<<invoker:integration-test>>>.
+ * {{{./run-mojo.html}invoker:run}} runs a set of Maven projects in a
directory and verifies the result. This is
+ equivalent to running both <<<invoker:integration-test>>> and
<<<invoker:verify>>>.
+
+ []
+
+ This last goal is intended for usage with the site lifecycle:
+
+ * {{{./report-mojo.html}invoker:report}} integrates the results from
previous builds into the site.
+
[]
* Usage
Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml?rev=817011&r1=817010&r2=817011&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/site/fml/faq.fml Sun Sep 20
11:52:30 2009
@@ -43,7 +43,7 @@
Sometimes you might want to test that error conditions are properly
dealt with, i.e. fail a build. To assert
a failure for a particular IT project, put the following setting into
the properties file denoted by the
plugin's <a
href="run-mojo.html#invokerPropertiesFile"><code>invokerPropertiesFile</code></a>
parameter:
- <i>invoker.buildResult=failure</i>
+ <i>invoker.buildResult=failure</i>.
Now, the failure of the IT build will be interpreted as a test
success. Likewise, a successful IT build will
be considered a test failure.
</p>
