Author: hboutemy
Date: Tue May 12 20:32:06 2009
New Revision: 774068
URL: http://svn.apache.org/viewvc?rev=774068&view=rev
Log:
fixed typos
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/pom.apt
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt?rev=774068&r1=774067&r2=774068&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/dependencies.apt
Tue May 12 20:32:06 2009
@@ -30,7 +30,7 @@
Basic Example
- The following example declares three dependencies and adds them to the
pathId <<<dependency.classpath>>>.
+ The following example declares three dependencies and adds them to the
<<<dependency.classpath>>> pathId.
-----
<artifact:dependencies pathId="dependency.classpath">
@@ -40,8 +40,8 @@
</artifact:dependencies>
-----
- The pathId can be used in the ant build file for example in the <<<javac>>>
task.
-
+ The pathId can be used in the Ant build file for example in the <<<javac>>>
task.
+
-----
<javac ...>
<classpath refid="dependency.classpath" />
@@ -133,11 +133,11 @@
Filtering Dependencies by Scope
- There are two options available for filtering POM dependencies by scope, the
<<<useScope>>>
+ There are two options available for filtering POM dependencies by scope: the
<<<useScope>>>
attribute, and the <<<scopes>>> attribute. One or the other of these
attributes should be used
but not both.
-
- The <<<useScopes>>> follows the Maven conventions for scoping behaviour.
This means the attribute
+
+ The <<<useScopes>>> follows the Maven conventions for scoping behaviour.
This means the attribute
can be set to one of three possible scopes: compile, runtime, or test.
These scopes will
behave as follows.
@@ -147,21 +147,21 @@
* test - Includes scopes system, provided, compile, runtime, and test
- For example, using the scope <<<runtime>>>, any dependencies defined with
compile,
- runtime, or nothing (defaults to compile) in the scope field will be
included in
+ For example, using the scope <<<runtime>>>, any dependencies defined with
compile,
+ runtime, or nothing (defaults to compile) in the scope field will be
included in
the resulting fileset.
-
+
-----
<artifact:dependencies filesetId="deps.fileset" useScope="runtime">
<pom file="mypom.xml"/>
</artifact:dependencies>
-----
- <(Since 2.0.10)> The <<<scopes>>> attribute accepts a comma separated list
of scopes to
+ <(Since 2.0.10)> The <<<scopes>>> attribute accepts a comma separated list
of scopes to
include in the filtering. Only dependencies with these specific scopes
will be
- included in the resulting fileset. If no value is specified, all scopes are
included.
+ included in the resulting fileset. If no value is specified, all scopes are
included.
The following example includes only dependencies with a scope of either
"provided" or "test".
-
+
-----
<artifact:dependencies filesetId="deps.fileset" scopes="provided, test">
<pom file="mypom.xml"/>
@@ -171,7 +171,7 @@
Filtering Dependencies by Type
- Dependencies can be filterd by type by using the <<<type>>> attribute. This
can be set to a
+ Dependencies can be filterd by type by using the <<<type>>> attribute. This
can be set to a
comma separate list of the types to select. The following example will only
include artifacts of the jar type.
-----
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt?rev=774068&r1=774067&r2=774068&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/mvn.apt
Tue May 12 20:32:06 2009
@@ -30,11 +30,11 @@
<<Note: This task is only available since version 2.0.10>>
- The maven ant tasks have some limited support for calling a full maven build
from ant.
+ The Maven Ant Tasks have some limited support for calling a full Maven build
from Ant.
The <<<mvn>>> task is a subclass of the Ant
{{{http://ant.apache.org/manual/CoreTasks/java.html}java}}
- task and supports all of it's options such as args, fork, resultproperty,
etc.
-
- If maven is already installed on the local system the maven build can be
called using
+ task and supports all of its options such as args, fork, resultproperty, etc.
+
+ If Maven is already installed on the local system, the Maven build can be
called using
this local installation by specifying the <<<mavenHome>>> parameter.
-----
@@ -44,10 +44,10 @@
-----
Maven will search for a pom.xml file in the current directory and run the
<<<install>>> goal.
-
+
If the pom file is not located in the current directory, an alternate path
to the pom can
be specified.
-
+
-----
<artifact:mvn pom="path/to/my-pom.xml" mavenHome="/path/to/maven-2.0.x">
<arg value="install"/>
@@ -56,12 +56,12 @@
Running the Mvn Task without a Maven Installation
- If no local maven installation is available, the mvn task will attempt to
resolve (download)
- the necessary jar files from the central maven repository and run the maven
build using
+ If no local Maven installation is available, the mvn task will attempt to
resolve (download)
+ the necessary jar files from the central Maven repository and run the Maven
build using
these jar files.
-
+
When the <<<mavenHome>>> attribute is not set, the <<<mvn>>> task will
attempt to automatically
- resolve the required jar files.
+ resolve the required jar files.
-----
<artifact:mvn pom="path/to/my-pom.xml">
@@ -69,15 +69,15 @@
</artifact:mvn>
-----
- <<Note: this will use version 2.0.10 of the core maven jar files>>
-
+ <<Note: this will use version 2.0.10 of the core Maven jar files>>
+
Using the Java Task
- The java task can be used directly without any need for the maven ant tasks.
However,
- this method requires that Maven is already installed on the system. A
- property called <<<maven.home>>> must be set to point to the local maven
installation,
- then an ant macro can be defined for calling maven.
-
+ The java task can be used directly without any need for the Maven Ant Tasks.
However,
+ this method requires that Maven is already installed on the system. A
+ property called <<<maven.home>>> must be set to point to the local Maven
installation,
+ then an Ant macro can be defined for calling Maven.
+
-----
<macrodef name="maven">
<attribute name="options" default="" />
@@ -86,7 +86,7 @@
<attribute name="resultproperty" default="maven.result" />
<element name="args" implicit="true" optional="true" />
<sequential>
- <java classname="org.codehaus.classworlds.Launcher" fork="true"
+ <java classname="org.codehaus.classworlds.Launcher" fork="true"
dir="@{basedir}" resultproperty="@{resultproperty}">
<jvmarg value="-Xmx512m"/>
<classpath>
@@ -105,13 +105,13 @@
</macrodef>
-----
- This example defines an ant macro called <<<maven>>>. The macro can then be
used in
+ This example defines an Ant macro called <<<maven>>>. The macro can then be
used in
the build like this:
-
+
-----
- <maven basedir="${basedir}"
- options="${maven.opts}"
+ <maven basedir="${basedir}"
+ options="${maven.opts}"
goal="install"
resultproperty="maven.build.result"/>
-----
-
+
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/pom.apt
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/pom.apt?rev=774068&r1=774067&r2=774068&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/pom.apt
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/site/apt/examples/pom.apt
Tue May 12 20:32:06 2009
@@ -104,10 +104,10 @@
Accessing dependencies in the POM
The <<<pom>>> task can be used in combination with the <<<dependencies>>>
task to declare a list of dependencies.
-
+
-----
<artifact:pom id="mypom" file="pom.xml" />
-
+
<artifact:dependencies filesetId="mydeps" pomRefId="mypom" />
-----
@@ -118,15 +118,15 @@
POM profiles can be activated or deactivated using the nested profile
element. For example
to activate a profile called <<<my-profile>>>.
-
+
-----
<artifact:pom id="maven.project" file="pom.xml">
<profile id="my-profile"/>
</artifact:pom>
-----
-
+
This can also be used to deactivate a POM profile that is active by default.
-
+
-----
<artifact:pom id="maven.project" file="pom.xml">
<profile id="my-default-profile" active="false"/>
