Author: dennisl
Date: Sat Feb 5 21:59:43 2011
New Revision: 1067535
URL: http://svn.apache.org/viewvc?rev=1067535&view=rev
Log:
o Use goal instead of mojo in the documentation.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm?rev=1067535&r1=1067534&r2=1067535&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
Sat Feb 5 21:59:43 2011
@@ -105,7 +105,7 @@ Including Module Binaries
* The POM
Now, let's review the POM configuration necessary to enable the building of
- this assembly via the <<<assembly:single>>> mojo. First, let's look at the
parent POM:
+ this assembly via the <<<assembly:single>>> goal. First, let's look at the
parent POM:
+---+
<?xml version="1.0" encoding="UTF-8"?>
@@ -220,7 +220,7 @@ mvn clean package
removed before building the assembly directory.
<<Note:>> Because of a quirk in Maven 2.0's execution model relating to
- aggregator mojos and the inheritance hierarchy, we need to explicitly execute
+ aggregator goals and the inheritance hierarchy, we need to explicitly execute
the package phase ahead of the assembly invocation, to ensure all modules
have
been built.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm?rev=1067535&r1=1067534&r2=1067535&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
Sat Feb 5 21:59:43 2011
@@ -79,7 +79,7 @@ Including Module Sources
* The POM
Now, let's review the POM configuration necessary to enable the building of
- this assembly via the <assembly:directory> mojo:
+ this assembly via the <assembly:directory> goal:
+---+
<?xml version="1.0" encoding="UTF-8"?>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt?rev=1067535&r1=1067534&r2=1067535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt Sat Feb 5
21:59:43 2011
@@ -112,17 +112,17 @@ The Maven Assembly Plugin
since they wreak havoc with normal build processes and promote non-standard
build practices.
- Additionally, the <<<assembly:single-directory>>> mojo is
+ Additionally, the <<<assembly:single-directory>>> goal is
redundant, and has been deprecated in favor of the <<<dir>>> assembly format.
- Finally, the <<<assembly:unpack>>> mojo has been deprecated in favor of the
far
+ Finally, the <<<assembly:unpack>>> goal has been deprecated in favor of the
far
more comprehensive
{{{http://maven.apache.org/plugins/maven-dependency-plugin/}Maven
Dependency Plugin}}.
* Goals
- The main goal in the assembly plugin is the {{{./single-mojo.html}single}}
mojo. It is used to create all assemblies.
- <<All other mojos are currently deprecated.>>
+ The main goal in the assembly plugin is the {{{./single-mojo.html}single}}
goal. It is used to create all assemblies.
+ <<All other goals are currently deprecated.>>
For more information about the goals that are available in the Assembly
Plugin, see {{{./plugin-info.html}the plugin documentation page}}.
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm?rev=1067535&r1=1067534&r2=1067535&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/usage.apt.vm Sat Feb
5 21:59:43 2011
@@ -129,7 +129,7 @@ Usage
Additionally, it's possible to specify a mixture of <<<descriptors>>> and
<<<descriptorRefs>>> within the same configuration.
- <<NOTE:>> Many other configuration options are available for the various
mojos
+ <<Note:>> Many other configuration options are available for the various
goals
in the Assembly Plugin. For more information, see the
{{{./examples/index.html}examples section}} or the
{{{./plugin-info.html}plugin
parameter documentation}}.
@@ -143,9 +143,9 @@ Usage
In most cases, you'll want to make sure your assemblies are created as part
of your normal build process. This ensures the assembly archives are made
available for installation and deployment, and that they are created during
- the release of your project. This is handled by the <<<assembly:single>>>
mojo.
+ the release of your project. This is handled by the <<<assembly:single>>>
goal.
- To bind the <<<single>>> mojo to a project's build lifecycle, you can add
+ To bind the <<<single>>> goal to a project's build lifecycle, you can add
this configuration (assuming you're using the <<<jar-with-dependencies>>>
prefabricated descriptor):
@@ -168,7 +168,7 @@ Usage
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
- <goal>single</goal> <!-- goals == mojos -->
+ <goal>single</goal>
</goals>
</execution>
</executions>
@@ -197,10 +197,10 @@ target/sample-1.0-SNAPSHOT-jar-with-depe
** GOTCHA!
- In most cases, the <<<single>>> mojo should be bound to the <<<package>>>
phase
+ In most cases, the <<<single>>> goal should be bound to the <<<package>>>
phase
of the build. However, if your assembly doesn't require binaries, or if you
need
to use one assembly as input for another, you may need to change this. While
it's
- possible to assign the <<<single>>> mojo to any phase of the build
lifecycle, you should
+ possible to assign the <<<single>>> goal to any phase of the build
lifecycle, you should
be careful to make sure the resources included in your assembly exist before
that
assembly is created.
