svn commit: r609329 - in /maven/plugins/trunk/maven-ant-plugin/src: main/java/org/apache/maven/plugin/ant/AntMojo.java site/apt/examples/using.apt site/apt/usage.apt

[de...@apache.org]

Author: dennisl
Date: Sun Jan  6 07:33:08 2008
New Revision: 609329

URL: http://svn.apache.org/viewvc?rev=609329&view=rev
Log:
o Improve documentation.

Modified:
    maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt
    maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt

Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java?rev=609329&r1=609328&r2=609329&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java Sun Jan  6 07:33:08 2008
@@ -51,21 +51,21 @@
     private MavenProject project;
 
     /**
-     * Used for resolving artifacts
+     * Used for resolving artifacts.
      *
      * @component
      */
     private ArtifactResolver resolver;
 
     /**
-     * Factory for creating artifact objects
+     * Factory for creating artifact objects.
      *
      * @component
      */
     private ArtifactFactory factory;
 
     /**
-     * The local repository where the artifacts are located
+     * The local repository where the artifacts are located.
      *
      * @parameter expression="${localRepository}"
      * @required
@@ -73,7 +73,7 @@
     private ArtifactRepository localRepository;
 
     /**
-     * The remote repositories where artifacts are located
+     * The remote repositories where artifacts are located.
      *
      * @parameter expression="${project.remoteArtifactRepositories}"
      */
@@ -89,7 +89,7 @@
     private Settings settings;
 
     /**
-     * Overwrite or not the <code>build.xml</code>
+     * Whether or not to overwrite the <code>build.xml</code> file.
      *
      * @parameter expression="${overwrite}" default-value="false"
      */

Modified: maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt?rev=609329&r1=609328&r2=609329&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/examples/using.apt Sun Jan  6 07:33:08 2008
@@ -26,10 +26,10 @@
 
 Using generated Ant build files
 
- <<Note>>: You should update the <<<build.xml>>> and <<NOT>> the <<<maven-build.xml>>>.
+ <<Note>>: If you want to add your own Ant targets, you should add them to <<<build.xml>>> and <<NOT>> <<<maven-build.xml>>>.
 
- The <<<build.xml>>> uses the {{{http://ant.apache.org/manual/CoreTasks/import.html}import task}} of Ant.
- So, you could overwrite generated targets in the <<<build.xml>>>. For instance:
+ The <<<build.xml>>> file uses the {{{http://ant.apache.org/manual/CoreTasks/import.html}import task}} of Ant.
+ So, you can override the generated targets in the <<<build.xml>>> file. For instance:
 
 +-----+
 <?xml version="1.0" encoding="UTF-8"?>
@@ -55,7 +55,7 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Overwrite the jar target from maven-build.xml                          -->
+  <!-- Override the jar target from maven-build.xml                           -->
   <!-- ====================================================================== -->
 
   <target name="jar">

Modified: maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt?rev=609329&r1=609328&r2=609329&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/apt/usage.apt Sun Jan  6 07:33:08 2008
@@ -31,7 +31,7 @@
 
 * Generate Ant build files
 
- To generate files, you should execute the ant goal of the Ant Plugin, i.e.:
+ To generate files, you execute the <<<ant>>> goal of the Ant Plugin, i.e.:
 
 +-----+
 mvn ant:ant
@@ -41,14 +41,15 @@
 
 +-----+
 yourProjectBaseDir
-  |-- build.xml
-  `-- maven-build.xml
-  `-- maven-build.properties
+|-- build.xml
+|-- maven-build.xml
+`-- maven-build.properties
 +-----+
 
 ** build.xml
 
- The <<<build.xml>>> is a generic Ant build file. It could be updated by the user. Here is the out-of-box <<<build.xml>>>:
+ The <<<build.xml>>> file is a generic Ant build file. It can be updated by the user.
+ Here is the out-of-box <<<build.xml>>>:
 
 +-----+
 <?xml version="1.0" encoding="UTF-8"?>
@@ -75,8 +76,9 @@
 </project>
 +-----+
 
- <<Note>>: By default, the <<<build.xml>>> is not overwrited when calling <<<mvn ant:ant>>>. If you want to overwrite it,
- you should execute the ant goal with the <<<overwrite>>> parameter, i.e.:
+ <<Note>>: By default, the <<<build.xml>>> file is not overwritten when calling <<<mvn ant:ant>>>.
+ If you want to overwrite it,
+ you should execute the <<<ant>>> goal with the <<<overwrite>>> parameter, i.e.:
 
 +-----+
 mvn ant:ant -Doverwrite=true
@@ -84,13 +86,17 @@
 
 ** maven-build.xml
 
- The <<<maven-build.xml>>> is an Ant build file for the Maven project. It contains several targets to clean, compile,
- test, packaging the Ant project and the associated javadoc.
+ The <<<maven-build.xml>>> file is an Ant build file for your project. It contains several targets to clean, compile,
+ test and package your project and also to create javadoc. To see which Ant targets are available execute this command:
 
- <<Note>>: <<DO NOT EDIT maven-build.xml!>> It could be overwrite when calling <<<mvn ant:ant>>>.
++-----+
+ant -projecthelp
++-----+
+
+ <<Note>>: <<DO NOT EDIT maven-build.xml!>> It will be overwritten when calling <<<mvn ant:ant>>>.
 
 ** maven-build.properties
 
- The <<<maven-build.properties>>> contains several properties used by the <<<maven-build.xml>>> build file.
+ The <<<maven-build.properties>>> file contains several properties used by the <<<maven-build.xml>>> build file.
 
- <<Note>>: <<DO NOT EDIT maven-build.properties!>> It could be overwrite when calling <<<mvn ant:ant>>>.
+ <<Note>>: <<DO NOT EDIT maven-build.properties!>> It will be overwritten when calling <<<mvn ant:ant>>>.