You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/04/21 22:39:54 UTC

svn commit: r395998 - in /maven/maven-1/core/trunk/xdocs: ./ about/ contributing/ developers/ plugins/ project/ reference/ start/ using/

Author: ltheussl
Date: Fri Apr 21 13:39:51 2006
New Revision: 395998

URL: http://svn.apache.org/viewcvs?rev=395998&view=rev
Log:
Site updates: fix links, fix table widths for the pdf, merge 'Maven for Ant Users' and 'Migrating from Ant'.

Added:
    maven/maven-1/core/trunk/xdocs/developers/index.xml   (with props)
    maven/maven-1/core/trunk/xdocs/project/related.xml   (with props)
    maven/maven-1/core/trunk/xdocs/reference/links.xml   (with props)
    maven/maven-1/core/trunk/xdocs/start/index.xml   (with props)
Removed:
    maven/maven-1/core/trunk/xdocs/start/maven-for-ant-users.xml
Modified:
    maven/maven-1/core/trunk/xdocs/about/features.xml
    maven/maven-1/core/trunk/xdocs/about/powered.xml
    maven/maven-1/core/trunk/xdocs/about/whatismaven.xml
    maven/maven-1/core/trunk/xdocs/contributing/help.xml
    maven/maven-1/core/trunk/xdocs/developers/apache.xml
    maven/maven-1/core/trunk/xdocs/developers/building-from-source.xml
    maven/maven-1/core/trunk/xdocs/faq.fml
    maven/maven-1/core/trunk/xdocs/index.xml
    maven/maven-1/core/trunk/xdocs/plugins/3rdparty.xml
    maven/maven-1/core/trunk/xdocs/reference/command-line.xml
    maven/maven-1/core/trunk/xdocs/reference/glossary.xml
    maven/maven-1/core/trunk/xdocs/reference/internal-repositories.xml
    maven/maven-1/core/trunk/xdocs/reference/project-descriptor.xml
    maven/maven-1/core/trunk/xdocs/reference/properties.xml
    maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml
    maven/maven-1/core/trunk/xdocs/start/download.xml
    maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml
    maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml
    maven/maven-1/core/trunk/xdocs/using/index.xml
    maven/maven-1/core/trunk/xdocs/using/migrating.xml
    maven/maven-1/core/trunk/xdocs/using/multiproject.xml

Modified: maven/maven-1/core/trunk/xdocs/about/features.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/about/features.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/about/features.xml (original)
+++ maven/maven-1/core/trunk/xdocs/about/features.xml Fri Apr 21 13:39:51 2006
@@ -34,8 +34,8 @@
 
       <table>
         <tr>
-          <th>Feature</th>
-          <th>Description</th>
+          <th width="30%">Feature</th>
+          <th width="70%">Description</th>
         </tr>
         <tr>
           <td>Model based builds</td>
@@ -102,7 +102,7 @@
       </p>
       <p>
         If you currently use Ant, you might be interested to read about
-        <a href="../start/maven-for-ant-users.html">Maven from an Ant perspective</a>.
+        <a href="../using/migrating.html#Maven_for_Ant_Users">Maven from an Ant perspective</a>.
       </p>
     </section>
   </body>

Modified: maven/maven-1/core/trunk/xdocs/about/powered.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/about/powered.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/about/powered.xml (original)
+++ maven/maven-1/core/trunk/xdocs/about/powered.xml Fri Apr 21 13:39:51 2006
@@ -36,8 +36,8 @@
       <subsection name="Apache Software Foundation">
       <table>
         <tr>
-          <td><a href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
-          <td>Several reusable Java libraries from the Apache Jakarta community.</td>
+          <td width="20%"><a href="http://jakarta.apache.org/commons/">Jakarta Commons</a></td>
+          <td width="80%">Several reusable Java libraries from the Apache Jakarta community.</td>
         </tr>
         <tr>
           <td><a href="http://jakarta.apache.org/bcel/">Jakarta BCEL</a></td>
@@ -79,8 +79,8 @@
       <subsection name="Other Projects">
       <table>
         <tr>
-          <td><a href="http://arara.sourceforge.net/">Arara Organizer</a></td>
-          <td>
+          <td width="20%"><a href="http://arara.sourceforge.net/">Arara Organizer</a></td>
+          <td width="80%">
             An organizer application.
           </td>
         </tr>
@@ -116,7 +116,7 @@
           </td>
         </tr>
         <tr>
-          <td><a href="http://displaytag.sourceforge.net/">DisplayTag</a></td>
+          <td><a href="http://displaytag.sourceforge.net/11/">DisplayTag</a></td>
           <td>
             The display tag library is an open source suite of custom tags that provide high level web 
             presentation patterns which will work in a MVC model, and provide a significant amount of 
@@ -165,12 +165,14 @@
             Servlets-based Content Management Framework.
           </td>
         </tr>
+        <!--
         <tr>
           <td><a href="http://www.javablogs.com/">Java.Blogs</a></td>
           <td>
             A portal of Java Web Logs
           </td>
         </tr>
+        -->
         <tr>
           <td><a href="http://jaimbot.sourceforge.net">JAIMBot (Java AIM Bot)</a></td>
           <td>
@@ -222,6 +224,7 @@
 			Turns your database into EJBs and JDOs with the help of JDBC, XDoclet and Velocity.
           </td>
         </tr>
+        <!--
         <tr>
           <td><a href="http://millionenklick.sourceforge.net/intro.html">Millionenklicker</a></td>
           <td>
@@ -232,6 +235,7 @@
              fills in the online forms automagically and plays the game daily.
           </td>
         </tr>
+        -->
         <tr>
           <td><a href="http://openjms.sourceforge.net">OpenJMS</a></td>
           <td>
@@ -265,6 +269,7 @@
             Test coverage tool.
           </td>
         </tr>
+        <!--
         <tr>
           <td><a href="http://raccoon.sourceforge.net/">Raccoon</a></td>
           <td>
@@ -273,6 +278,7 @@
             for us.
           </td>
         </tr>
+        -->
         <tr>
           <td><a href="http://rvtest.sourceforge.net">RVTEST</a></td>
           <td>
@@ -289,13 +295,13 @@
           </td>
         </tr>
         <tr>
-          <td><a href="http://wicket.sf.net/">Wicket</a></td>
+          <td><a href="http://wicket.sourceforge.net/">Wicket</a></td>
           <td>
             A component oriented web framework.
           </td>
         </tr>
         <tr>
-          <td><a href="http://jwebunit.sf.net/">jWebUnit</a></td>
+          <td><a href="http://jwebunit.sourceforge.net/">jWebUnit</a></td>
           <td>
             A testing framework for web applications.
           </td>

Modified: maven/maven-1/core/trunk/xdocs/about/whatismaven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/about/whatismaven.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/about/whatismaven.xml (original)
+++ maven/maven-1/core/trunk/xdocs/about/whatismaven.xml Fri Apr 21 13:39:51 2006
@@ -173,7 +173,7 @@
     <section name="How Does Maven Compare to Ant?">
       <p>
         More information on this topic can be found in 
-        <a href="../start/maven-for-ant-users.html">Maven for Ant Users</a>.
+        <a href="../using/migrating.html#Maven_for_Ant_Users">Maven for Ant Users</a>.
       </p>
     </section>
   </body>

Modified: maven/maven-1/core/trunk/xdocs/contributing/help.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/contributing/help.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/contributing/help.xml (original)
+++ maven/maven-1/core/trunk/xdocs/contributing/help.xml Fri Apr 21 13:39:51 2006
@@ -33,8 +33,11 @@
         <li>Join the <a href="../mail-lists.html">mailing list</a> and answer other user's questions</li>
         <li>Report bugs, feature requests and other issues in the <a href="../issue-tracking.html">issue tracking</a>
           application.</li>
-        <li><a href="patches.html">Submit patches</a> to reported issues (both those you find, or that others have
-          filed)</li>
+        <li>
+          <a href="../developers/building-from-source.html">Build Maven from sources</a> and
+          <a href="patches.html">submit patches</a> to reported issues
+          (both those you find, or that others have filed)
+        </li>
       </ul>
       <p>
         Your participation in the community is much appreciated!

Modified: maven/maven-1/core/trunk/xdocs/developers/apache.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/developers/apache.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/developers/apache.xml (original)
+++ maven/maven-1/core/trunk/xdocs/developers/apache.xml Fri Apr 21 13:39:51 2006
@@ -33,8 +33,8 @@
         <li><a href="http://www.apache.org/dev/">Developer Resources</a></li>
         <li><a href="http://www.apache.org/foundation/">About the Apache Software Foundation</a></li>
         <li><a href="http://www.apache.org/dev/committers.html">Committer FAQ</a></li>
-        <li><a href="http://www.apache.org/~vgritsenko/stats/projects/maven.html">Web Stats</a></li>
-        <li><a href="http://wiki.apache.org">Apache Wiki</a></li>
+        <li><a href="http://people.apache.org/~vgritsenko/stats/projects/maven.html">Web Stats</a></li>
+        <li><a href="http://wiki.apache.org/general/">Apache Wiki</a></li>
       </ul>
     </section>
   </body>

Modified: maven/maven-1/core/trunk/xdocs/developers/building-from-source.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/developers/building-from-source.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/developers/building-from-source.xml (original)
+++ maven/maven-1/core/trunk/xdocs/developers/building-from-source.xml Fri Apr 21 13:39:51 2006
@@ -117,8 +117,8 @@
         </p>
         <table>
           <tr>
-            <td><code>maven:build-install</code></td>
-            <td>
+            <td width="20%"><code>maven:build-install</code></td>
+            <td width="80%">
               This builds a complete install in the <code>target/installer/maven-X.Y.Z</code> directory.
               Note that you must copy this to your desired location yourself as it cannot delete and
               overwrite <code>MAVEN_HOME</code> as that is the location of the currently running version
@@ -152,8 +152,8 @@
         </p>
         <table>
           <tr>
-            <td><code>maven:jar-install</code></td>
-            <td>
+            <td width="20%"><code>maven:jar-install</code></td>
+            <td width="80%">
               This builds <code>maven.jar</code> from the sources, runs all of the unit tests, and installs it
               into the same directory as the running version of Maven (<code>MAVEN_HOME/lib</code>).
             </td> 
@@ -187,8 +187,8 @@
         </p>
         <table>
           <tr>
-            <td>plugins:install-all</td>
-            <td>
+            <td width="20%">plugins:install-all</td>
+            <td width="80%">
               Clean, build and install each Maven plugin into the running Maven installation (though they will not
               be utilised until next execution). This is the most commonly used goal.
             </td>

Added: maven/maven-1/core/trunk/xdocs/developers/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/developers/index.xml?rev=395998&view=auto
==============================================================================
--- maven/maven-1/core/trunk/xdocs/developers/index.xml (added)
+++ maven/maven-1/core/trunk/xdocs/developers/index.xml Fri Apr 21 13:39:51 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<document>
+  <properties>
+    <title>Developers</title>
+    <author email="ltheussl@apache.org">Lukas Theussl</author>
+  </properties>
+  <body>
+    <section name="Resources for Maven Developers">
+      <p>
+        Here is a short collection of links to relevant
+        information for Maven developers.
+      </p>
+      <ul>
+        <!--<li><a href="documentation-conventions.html">Documenting</a></li>-->
+        <li><a href="making-releases.html">Making Releases</a></li>
+        <li><a href="apache.html">Apache Resources</a></li>
+      </ul>
+    </section>
+  </body>
+</document>

Propchange: maven/maven-1/core/trunk/xdocs/developers/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/core/trunk/xdocs/developers/index.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: maven/maven-1/core/trunk/xdocs/developers/index.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/maven-1/core/trunk/xdocs/faq.fml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/faq.fml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/faq.fml (original)
+++ maven/maven-1/core/trunk/xdocs/faq.fml Fri Apr 21 13:39:51 2006
@@ -71,8 +71,8 @@
       <answer>
         <p>
           All Maven goals are provided by plugins. For example, the goals <code>jar</code> and <code>jar:install</code>
-          are provided by the <a href="http://maven.apache.org/maven-1.x/reference/plugins/jar/index.html">jar plugin</a>. You can find a list of
-          plugins and there documentation <a href="http://maven.apache.org/maven-1.x/reference/plugins/index.html">here</a>.
+          are provided by the <a href="http://maven.apache.org/maven-1.x/plugins/jar/index.html">jar plugin</a>. You can find a list of
+          plugins and there documentation <a href="http://maven.apache.org/maven-1.x/plugins/index.html">here</a>.
         </p>
       </answer>
     </faq>
@@ -263,7 +263,7 @@
       <question>How do I make my build complete even with broken tests?</question>
       <answer>
         <p>
-          See the <a href="http://maven.apache.org/maven-1.x/reference/plugins/test/properties.html">Test Plugin Reference</a>.
+          See the <a href="http://maven.apache.org/maven-1.x/plugins/test/properties.html">Test Plugin Reference</a>.
           Most notably, <code>maven.test.skip</code> and <code>maven.test.failure.ignore</code>.
           <b>Heed the warnings!</b>
         </p>
@@ -329,7 +329,7 @@
       <question>Maven takes a long time to load. Is there anyway to speed things up?</question>
       <answer>
         <p>You can use the
-        <a href="http://maven.apache.org/maven-1.x/reference/plugins/console/">Console Plugin</a> to
+        <a href="http://maven.apache.org/maven-1.x/plugins/console/">Console Plugin</a> to
         get an interactive shell that will let load Maven once and run as many
         goals as you want. On average machines it takes something like
         ten seconds to compile and run unit tests, so that you can build often
@@ -485,8 +485,8 @@
       <answer>
         <p>
         A list of plugins is maintained by the maven team 
-        <a href='http://maven.apache.org/maven-1.x/reference/plugins/index.html'>here</a> but developers of third party
-        plugins are <a href='reference/sharing-plugins.html'>encouraged</a> to host
+        <a href="http://maven.apache.org/maven-1.x/plugins/index.html">here</a> but developers of third party
+        plugins are <a href="reference/sharing-plugins.html">encouraged</a> to host
         the plugin themselves so you may also need to search the web.
         </p>
       </answer>
@@ -495,7 +495,7 @@
       <question>How Do I Install A Third Party Plugin?</question>
       <answer>
         <p>
-        See <a href='reference/sharing-plugins.html#Step_4__So_now_that_they_found_my_plugin__how_do_users_install_it_'>Sharing Plugins</a>
+        See <a href="reference/sharing-plugins.html#Step_4__So_now_that_they_found_my_plugin__how_do_users_install_it_">Sharing Plugins</a>
         </p>
       </answer>
     </faq>
@@ -673,7 +673,7 @@
         <p>It is possible that the XML parser included with Maven is
         interfering with the XML parser included in Java 1.4. Please set
         the <code>${maven.junit.fork}</code>
-        <a href="http://maven.apache.org/maven-1.x/reference/plugins/test/properties.html">property</a> to
+        <a href="http://maven.apache.org/maven-1.x/plugins/test/properties.html">property</a> to
         <code>yes</code>.</p>
         <b>Note:</b> This may not be necessary under Maven 1.1 as it no longer includes
         an XML parser, using the one provided by the JDK by default.

Modified: maven/maven-1/core/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/index.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/index.xml (original)
+++ maven/maven-1/core/trunk/xdocs/index.xml Fri Apr 21 13:39:51 2006
@@ -36,6 +36,13 @@
         (<a href="reference/glossary.html#POM">POM</a>), Maven can manage a project's build, reporting and 
         documentation from a central piece of information.
       </p>
+      <p>
+        These pages are all about Maven 1.x. The latest version of Maven is the
+        2.0 tree, which is a complete rewrite of the original Maven application.
+        For more information on Maven 2, see the main
+        <a href="http://maven.apache.org/">Maven</a> site.
+      </p>
+
 
       <subsection name="Maven 1.x News">
         <p style="font-size: larger; font-weight: bold">
@@ -74,7 +81,7 @@
         </p>
         <p><b>Familiar with Ant, and want to see how Maven relates to it?</b></p>
         <p>
-          Read our <a href="start/maven-for-ant-users.html">Maven for Ant Users</a> explanatory document.
+          Read our <a href="using/migrating.html#Maven_for_Ant_Users">Maven for Ant Users</a> explanatory document.
         </p>
       </subsection>
 
@@ -93,12 +100,8 @@
         </p>
         <p>
           The current development version is only available from Subversion at this point. For more information, see
-          <a href="/developers/building-from-source.html">Building from Source</a> and
-          <a href="/reference/backwards-compatibility.html">compatibility information</a>.          
-        </p>
-        <p>
-          Maven 2.0 is a rewrite of the original Maven application. For more information, see the
-          <a href="/index.html">Maven 2.0</a> section.
+          <a href="developers/building-from-source.html">Building from Source</a> and
+          <a href="reference/backwards-compatibility.html">compatibility information</a>.          
         </p>
       </subsection>
 

Modified: maven/maven-1/core/trunk/xdocs/plugins/3rdparty.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/plugins/3rdparty.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/plugins/3rdparty.xml (original)
+++ maven/maven-1/core/trunk/xdocs/plugins/3rdparty.xml Fri Apr 21 13:39:51 2006
@@ -38,86 +38,86 @@
       <subsection name="Independant Plugins">
         <table>
           <tr>
-            <td style="width:25%">
+            <td width="20%">
               <a href="http://mevenide.codehaus.org/maven-nbm-plugin/">Maven NBM plugin</a>
             </td>
-            <td style="width:75%">Plugin for creating Netbeans modules (both jars and NBMs) and autoupdate sites.</td>
+            <td width="80%">Plugin for creating Netbeans modules (both jars and NBMs) and autoupdate sites.</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://www.codeczar.com/products/maven-ejbgen-plugin/">Weblogic EJBGen plugin</a>
             </td>
-            <td style="width:75%">Plugin for Weblogic EJBGen</td>
+            <td>Plugin for Weblogic EJBGen</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://www.codeczar.com/products/maven-tomcat-plugin/">Tomcat plugin</a>
             </td>
-            <td style="width:75%">Plugin for managing webapps with Tomcat Manager</td>
+            <td>Plugin for managing webapps with Tomcat Manager</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://maven-validator.sourceforge.net/">Maven Validator</a>
             </td>
-            <td style="width:75%">Validates XHTML</td>
+            <td>Validates XHTML</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://xdoclet.sourceforge.net/xdoclet/maven-plugin.html">XDoclet plugin</a>
             </td>
-            <td style="width:75%">Plugin for XDoclet</td>
+            <td>Plugin for XDoclet</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://maven-taglib.sourceforge.net/">Maven Taglib plugin</a>
             </td>
-            <td style="width:75%">Taglib Plug-in is a maven plugin for jsp tag libraries developers</td>
+            <td>Taglib Plug-in is a maven plugin for jsp tag libraries developers</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://xframe.sourceforge.net/xsddoc/">Maven xsddoc plugin</a>
             </td>
-            <td style="width:75%">Generates documentation of W3C XML Schema</td>
+            <td>Generates documentation of W3C XML Schema</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://maven-doccheck.sourceforge.net/">Maven DocCheck Plugin</a>
             </td>
-            <td style="width:75%">Plugin for Doc Check Doclet</td>
+            <td>Plugin for Doc Check Doclet</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://www.itbrain.com.mx/ucdd/">UCDD</a>
             </td>
-            <td style="width:75%">Document Use Cases using maven and xml.</td>
+            <td>Document Use Cases using maven and xml.</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://mavenhistorical.sourceforge.net/">Maven Historical Data</a>
             </td>
-            <td style="width:75%">Record user specified values from each maven build to a database.</td>
+            <td>Record user specified values from each maven build to a database.</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://mavenosgiplugin.berlios.de/">Maven OSGi Plugin</a>
             </td>
-            <td style="width:75%">Create OSGi bundles</td>
+            <td>Create OSGi bundles</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://emma.sourceforge.net/maven-emma-plugin/">Maven EMMA Plugin</a>
             </td>
-            <td style="width:75%">Plugin using the EMMA code coverage tool</td>
+            <td>Plugin using the EMMA code coverage tool</td>
           </tr>
         </table>
       </subsection>
       <subsection name="Projects With a Maven Plugin">
         <table>
           <tr>
-            <td style="width:25%">
+            <td width="20%">
               <a href="http://cargo.codehaus.org/">Cargo</a>
             </td>
-            <td style="width:75%">
+            <td width="80%">
               <p>Cargo is a thin wrapper around existing containers (e.g. J2EE containers). It provides different APIs to easily manipulate containers.</p>
               <p>Cargo provides the following APIs:</p>
               <ul>
@@ -128,34 +128,34 @@
             </td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://jakarta.apache.org/cactus/integration/maven/">Cactus plugin</a>
             </td>
-            <td style="width:75%">Plugin for Jakarta Cactus</td>
+            <td>Plugin for Jakarta Cactus</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://jakarta.apache.org/turbine/meta/">Turbine plugin</a>
             </td>
-            <td style="width:75%">Plugin for Jakarta Turbine</td>
+            <td>Plugin for Jakarta Turbine</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://csdl.ics.hawaii.edu/Tools/JBlanket/maven-plugin/">JBlanket plugin</a>
             </td>
-            <td style="width:75%">Plugin for JBlanket test coverage tool</td>
+            <td>Plugin for JBlanket test coverage tool</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://statcvs-xml.berlios.de/">StatCvs-XML plugin</a>
             </td>
-            <td style="width:75%">Plugin for StatCvs-XML</td>
+            <td>Plugin for StatCvs-XML</td>
           </tr>
           <tr>
-            <td style="width:25%">
+            <td>
               <a href="http://www.jutils.com">Lint4j</a>
             </td>
-            <td style="width:75%">Lint4j, the static Java source and bytecode analyzer and bug pattern detector</td>
+            <td>Lint4j, the static Java source and bytecode analyzer and bug pattern detector</td>
           </tr>
         </table>
       </subsection>

Added: maven/maven-1/core/trunk/xdocs/project/related.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/project/related.xml?rev=395998&view=auto
==============================================================================
--- maven/maven-1/core/trunk/xdocs/project/related.xml (added)
+++ maven/maven-1/core/trunk/xdocs/project/related.xml Fri Apr 21 13:39:51 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<document>
+  <properties>
+    <title>Related Projects</title>
+    <author email="ltheussl@apache.org">Lukas Theussl</author>
+  </properties>
+  <body>
+    <section name="Related Projects">
+      <p>
+        Here is a short collection of links to Maven-related projects.
+      </p>
+      <ul>
+        <li><a href="http://mevenide.codehaus.org/">Mevenide</a></li>
+        <li><a href="http://maven-proxy.codehaus.org/">Maven Proxy</a></li>
+        <li><a href="http://ant.apache.org/">Ant</a></li>
+        <li><a href="http://jakarta.apache.org/commons/jelly/">Jelly</a></li>
+      </ul>
+    </section>
+  </body>
+</document>

Propchange: maven/maven-1/core/trunk/xdocs/project/related.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/core/trunk/xdocs/project/related.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: maven/maven-1/core/trunk/xdocs/project/related.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/maven-1/core/trunk/xdocs/reference/command-line.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/command-line.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/command-line.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/command-line.xml Fri Apr 21 13:39:51 2006
@@ -56,7 +56,7 @@
       </p>
       <table>
         <tr>
-          <th>Option</th><th>Usage</th>
+          <th width="10%">Option</th><th width="90%">Usage</th>
         </tr>
         <tr>
           <td><a name="-D">-D</a></td>

Modified: maven/maven-1/core/trunk/xdocs/reference/glossary.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/glossary.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/glossary.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/glossary.xml Fri Apr 21 13:39:51 2006
@@ -34,7 +34,7 @@
         sometimes be confusing for newcomers.
       </p>
       <table>
-        <tr><th>Term</th><th>Description</th></tr>
+        <tr><th width="20%">Term</th><th width="80%">Description</th></tr>
         <tr>
           <td>Project</td>
           <td>

Modified: maven/maven-1/core/trunk/xdocs/reference/internal-repositories.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/internal-repositories.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/internal-repositories.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/internal-repositories.xml Fri Apr 21 13:39:51 2006
@@ -74,8 +74,8 @@
           your project's properties:
         </p>
         <source>maven.repo.remote=http://repository.company.com/
-        <em>or</em>
-        maven.repo.remote=file:///shared/repository</source>
+  <em>or</em>
+maven.repo.remote=file:///shared/repository</source>
       </subsection>
       <subsection name="Deploying to the Internal Repository">
         <p>

Added: maven/maven-1/core/trunk/xdocs/reference/links.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/links.xml?rev=395998&view=auto
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/links.xml (added)
+++ maven/maven-1/core/trunk/xdocs/reference/links.xml Fri Apr 21 13:39:51 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<document>
+  <properties>
+    <title>Links</title>
+    <author email="ltheussl@apache.org">Lukas Theussl</author>
+  </properties>
+  <body>
+    <section name="Related Links">
+      <p>
+        Here is a short collection of links to Maven-related material.
+      </p>
+      <ul>
+        <li><a href="articles.html">Books and Articles</a></li>
+        <li><a href="http://blogs.codehaus.org/projects/maven/">Maven Diaries</a></li>
+        <li><a href="http://www.mavenbook.org/">MavenBook.org</a></li>
+      </ul>
+    </section>
+  </body>
+</document>

Propchange: maven/maven-1/core/trunk/xdocs/reference/links.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/core/trunk/xdocs/reference/links.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: maven/maven-1/core/trunk/xdocs/reference/links.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/maven-1/core/trunk/xdocs/reference/project-descriptor.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/project-descriptor.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/project-descriptor.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/project-descriptor.xml Fri Apr 21 13:39:51 2006
@@ -173,8 +173,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -560,8 +560,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -628,8 +628,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -704,8 +704,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -775,8 +775,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -823,8 +823,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -870,8 +870,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -893,8 +893,8 @@
         </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -914,8 +914,8 @@
       <subsection name="repository">
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -1028,8 +1028,8 @@
         <p>Specifies the organization who produces this project.</p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -1061,8 +1061,8 @@
       <subsection name="build">
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="40%">Element</th>
+            <th width="60%">Description</th>
           </tr>
           <tr>
             <td>
@@ -1178,8 +1178,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -1225,8 +1225,8 @@
       <subsection name="unitTest">
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -1259,8 +1259,8 @@
       </p>
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>
@@ -1306,8 +1306,8 @@
       <subsection name="dependency">
         <table>
           <tr>
-            <th>Element</th>
-            <th>Description</th>
+            <th width="20%">Element</th>
+            <th width="80%">Description</th>
           </tr>
           <tr>
             <td>

Modified: maven/maven-1/core/trunk/xdocs/reference/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/properties.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/properties.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/properties.xml Fri Apr 21 13:39:51 2006
@@ -68,8 +68,8 @@
         </p>
         <table>
           <tr>
-            <td><code>${basedir}/project.properties</code></td>
-            <td>
+            <td width="30%"><code>${basedir}/project.properties</code></td>
+            <td width="70%">
               These are properties specific to the project and can be used to set the values for
               plugin and Maven properties that are appropriate for that project.
               This file should be checked into your source repository and distributed.

Modified: maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml (original)
+++ maven/maven-1/core/trunk/xdocs/reference/repository-upload.xml Fri Apr 21 13:39:51 2006
@@ -92,8 +92,9 @@
         <p>
           You can request a upload for a maven 2 project just using the maven 2 pom.xml instead of 
           the maven 1 project.xml referenced previously.
-          The jar will be uploaded to both maven 1 and maven 2 repos.<br/>
-          <a href="http://maven.apache.org/guides/mini/guide-ibiblio-upload.html">More information</a>
+          The jar will be uploaded to both maven 1 and maven 2 repos. Check this
+          <a href="http://maven.apache.org/guides/mini/guide-ibiblio-upload.html">mini guide</a>
+          for more information.
         </p>
 
       </subsection>

Modified: maven/maven-1/core/trunk/xdocs/start/download.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/download.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/start/download.xml (original)
+++ maven/maven-1/core/trunk/xdocs/start/download.xml Fri Apr 21 13:39:51 2006
@@ -32,7 +32,7 @@
   </head>
 
   <body>
-    <section name="Latest Stable Release">
+    <section name="Latest Stable Release of Maven 1.x">
       <subsection name="Download Maven 1.0.2">
         <p>
           Maven is currently distributed in several formats for your convenience. For instructions on

Added: maven/maven-1/core/trunk/xdocs/start/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/index.xml?rev=395998&view=auto
==============================================================================
--- maven/maven-1/core/trunk/xdocs/start/index.xml (added)
+++ maven/maven-1/core/trunk/xdocs/start/index.xml Fri Apr 21 13:39:51 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<document>
+  <properties>
+    <title>Quick Start</title>
+    <author email="ltheussl@apache.org">Lukas Theussl</author>
+  </properties>
+  <body>
+    <section name="Getting Started">
+      <p>
+        This guide will give you quick instructions on how to
+        get Maven up and running on your system.
+      </p>
+      <ul>
+        <li><a href="install.html">Installing</a> - Installation instructions</li>
+        <li><a href="quick-start.html">Building a Project</a> - How to use Maven to build a given project</li>
+        <li><a href="ten-minute-test.html">Creating a Project</a> - A 'Ten Minute Test' on how to create a project with Maven</li>
+        <li><a href="adapting.html">Adapting a Project</a> - How to adapt an existing project to use Maven</li>
+        <li><a href="../using/migrating.html">Migrating from Ant</a> - How to migrate an existing Ant build to Maven</li>
+      </ul>
+    </section>
+  </body>
+</document>

Propchange: maven/maven-1/core/trunk/xdocs/start/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/core/trunk/xdocs/start/index.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: maven/maven-1/core/trunk/xdocs/start/index.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml (original)
+++ maven/maven-1/core/trunk/xdocs/start/ten-minute-test.xml Fri Apr 21 13:39:51 2006
@@ -42,7 +42,7 @@
       </p>
       <p>
         If you are already very familiar with Ant, you may also like to refer to the
-        <a href="maven-for-ant-users.html">Maven for Ant Users</a> guide.
+        <a href="../using/migrating.html">Migrating from Ant</a> guide.
       </p>
       <subsection name="Step 1: Setting up the directory structure">
         <p>
@@ -83,8 +83,8 @@
         </p>
         <table>
           <tr>
-            <td><code>src</code></td>
-            <td>
+            <td width="20%"><code>src</code></td>
+            <td width="80%">
               This will contain all types of source files under the following subdirectories.
             </td>
           </tr>

Modified: maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/developing-plugins.xml Fri Apr 21 13:39:51 2006
@@ -284,8 +284,8 @@
         </p>
           <table>
             <tr>
-              <td>pluginName</td>
-              <td>
+              <td width="20%">pluginName</td>
+              <td width="80%">
                 This is the start of the goal name to run, and represents this plugin.
                 The report goal run will be <code>${pluginName}:report</code>.
               </td>

Modified: maven/maven-1/core/trunk/xdocs/using/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/index.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/index.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/index.xml Fri Apr 21 13:39:51 2006
@@ -43,6 +43,7 @@
         <li><a href="managing-dependencies.html">Handling Dependencies</a> - Managing the dependencies of your build</li>
         <li><a href="migrating.html">Migrating from Ant</a> - Where to start if you already have <code>build.xml</code></li>
         <li><a href="bestpractices.html">Best Practices</a> - Why Maven encourages what it does, and how to take advantage of it</li>
+        <li><a href="../reference/ide/index.html">IDE Integration</a> - How to use Maven with your IDE</li>
       </ul>
     </section>
     <section name="Further Reading">
@@ -53,7 +54,13 @@
         <li><a href="customising.html">Customising Maven</a> - how to change behaviour, add scripting and create
           your own plugins</li>
         <li><a href="repositories.html">Repositories</a> - how to manage your own artifact repository</li>
-        <li><a href="../reference/index.html">Reference</a> - some quick reference documents</li>
+        <li>
+          <a href="../reference/index.html">Reference</a> - some quick reference documents,
+          in particular Maven <a href="../reference/conventions.html">Conventions</a> and a
+          <a href="../reference/command-line.html">Command Line Reference</a>.
+        </li>
+        <li><a href="../plugins/index.html">Plugins</a> - describes the various plugins available for Maven 1</li>
+        <li><a href="../contributing/help.html">Contributing</a> - what to do if you want to help us make Maven even better!</li>
       </ul>
     </section>
   </body>

Modified: maven/maven-1/core/trunk/xdocs/using/migrating.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/migrating.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/migrating.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/migrating.xml Fri Apr 21 13:39:51 2006
@@ -21,15 +21,22 @@
 
   <properties>
     <title>Migrating from Ant</title>
+    <author email="maven@walding.com">Ben Walding</author>
+    <author email="dion@apache.org">dIon Gillard</author>
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
 
   <body>
     <section name="Migrating from Ant">
       <p>
-        A common question is how to migrate an existing Ant build to Maven. This guide will help in some small ways to
+        A common question is how to migrate an existing Ant build to Maven.
+        The first section of this guide will help in some small ways to
         do that. It will not touch on the reasons for using Maven over Ant, or whether Maven or Ant is better for your
-        project - these issues are discussed in <a href="../start/maven-for-ant-users.html">Maven for Ant Users.</a>
+        project - these issues are discussed below in <a href="#Maven_for_Ant_Users">Maven for Ant Users</a>.
+      </p>
+      <p>
+        If you are looking for some tips on how to do certain things you may
+        have been doing in Ant, see the relevant section of the <a href="../faq.html#Ant">FAQ</a>.
       </p>
       <subsection name="Getting Started - Creating a Project Descriptor">
         <p>
@@ -115,6 +122,191 @@
           do this, see <a href="customising.html">Customising Maven</a> and the
           <a href="../reference/scripting.html">Scripting Reference</a>, as well as other sections in this User's
           Guide.
+        </p>
+      </subsection>
+    </section>
+    <section name="Maven for Ant Users">
+      <p>
+        This section is intended to answer the commons questions of someone
+        that is familiar with Ant, and wants to learn what the equivalent
+        concepts and the differences in Maven are, and where each product excels.
+      </p>
+      <p>
+        While there is a strong slant towards Maven, this is NOT a guide designed
+        to bash Ant, a remarkable and fine product. This guide IS for helping
+        an Ant user understand the remarkable and powerful capabilities within
+        Maven.
+      </p>
+    </section>
+    <section name="Different Objectives">
+      <p>
+        It is important to realise that Maven and Ant have different objectives. For clarification, 
+        it is worth reading <a href="../about/whatismaven.html">What is Maven?</a>
+        to learn what Maven is, and what Maven is not.
+      </p>
+      <p>
+        You may have heard that Maven is just Ant plus dependencies, or a set of reusable Ant scripted
+        plugins. But in fact, the aims of the two products are quite different.
+        There are other solutions that bring reusable fragments and dependencies to Ant 1.6 - but
+        these do not make Maven redundant because, aside from the many other features Maven also has,
+        it actually takes a different approach.
+      </p>
+      <subsection name="Build Knowledge">
+        <p>
+          One of the fundamental differences between Ant and Maven is in
+          whose responsibility it is to understand the build process and the
+          tools used therein.
+        </p>
+        <p>
+          With Ant, it's the developer who must understand what the tool is
+          and how it applies to their development. With Maven, build process 
+          knowledge is captured in <code>plugins</code>, small snippets of
+          processing that rely on you providing some information.
+        </p>
+        <p>
+          For example, to compile your java code using Ant, you must first
+          write a <code>build.xml</code> file which uses Ant's
+          <a href="http://ant.apache.org/manual/CoreTasks/javac.html">javac</a>
+          task, passing that task the correct set of parameters.
+        </p>
+        <source><![CDATA[...
+<!-- compile Java source files -->
+<target name="compile">
+  <javac srcdir="./src;./test" destdir="./bin" debug="on" optimize="off">
+    <classpath>
+      <fileset dir="lib" includes="*.jar"/>
+    </classpath>
+  </javac>
+</target>
+...]]></source>
+        <p>
+          You'd then call this <code>build.xml</code> file using ant from the command prompt:
+        </p>
+        <source>ant compile</source>
+        <p>
+          This isn't too hard to do, and as you move from project to project you
+          become better at this, and understand Ant better, learning what each
+          of the options are for and what the best way to write these snippets is.
+        </p>
+        <p>
+          Maven, however, takes a far more declarative approach. You must
+          provide Maven with some information about your project (in a file called
+          <code>project.xml</code>), one piece of which is your source directory 
+          that stores your java code.
+        </p>
+        <source><![CDATA[...
+<build>
+  <sourceDirectory>src/java</sourceDirectory>
+...]]></source>
+        <p>
+          To compile your code, you just need to specify that you have a
+          source directory and then ask Maven to compile using:
+        </p>
+        <source>maven java:compile</source>
+        <p>
+          There's no need for the developer to understand how to write a plugin
+          to use one. And several plugins can share the same information. For example
+          the plugin that checks that source code conforms to a coding standard uses
+          the same <code>sourceDirectory</code> as the plugin that compiles code.
+        </p>
+        <p>
+          This abstraction also ensures consistency. No matter what project you are
+          building, <code>java:compile</code> will compile the source code, the
+          source code is easy to find, and the output is always in the same place
+          (<code>target/classes</code>).
+        </p>
+      </subsection>
+      <subsection name="Best Practices">
+        <p>
+          Another key difference in philosophy is that of best practices. Ant is a very flexible
+          tool - because you can break your build down into targets, which is further composed of
+          discrete tasks you can combine them in many ways to build your project.
+        </p>
+        <p>
+          While Maven still allows this flexibility, because it is built around a standard set
+          of functionality and uses metadata with sensible defaults to the describe a project, it
+          attempts to enforce the use of best practices in composing the project's build.
+          These best practices have been built up from the collective experience within the
+          community.
+        </p>
+        <p>
+          Some examples of what Maven does in this regard are:
+        </p>
+          <ul>
+            <li>Standard locations for source files, documentation, and output</li>
+            <li>A common layout for project documentation to make finding information easier</li>
+            <li>Retrieves project dependencies from a shared storage area, instead of keeping multiple copies of a JAR in CVS</li>
+            <li>Encourages the use of a single source directory, but a separate unit test source directory</li>
+          </ul>
+      </subsection>
+      <subsection name="More than the Build - Project Knowledge">
+        <p>
+          Maven also aims to go beyond the building of a project from sources, and encapsulte all of the project
+          knowledge in one area. This includes the source code and the documentation, but also includes reports
+          and statistics on the code and the processes surrounding management of the code.
+        </p>
+        <p>
+          Maven not only handles building the code, but can handle the release process, integrating closely with source
+          control to get a clean copy to build before releasing a new version that is also deployed for others to use.
+        </p>
+        <p>
+          Maven is able to integrate with a large number of different products such as issue tracking, source
+          control systems, reporting systems, application servers and software development kits. While
+          Ant also has (and provides) much of this integration, Maven continues to use its declarative style of
+          set up that means there is less and sometimes no work to set up these new integrations.
+        </p>
+      </subsection>
+    </section>
+    <section name="Terminology">
+      <p>
+        This section covers what different components are called in each of Maven and Ant.
+      </p>
+      <subsection name="Project">
+        <p>
+          In Ant a <i>project</i> is what you define in your <code>build.xml</code> file.
+          This project is a collection of <i>targets</i>, which are composed
+          of <i>tasks</i>.
+        </p>
+        <p>
+          In Maven a project is what you define in your <code>project.xml</code> file.
+          It's a collection of information about the development effort that Maven
+          uses to produce an artifact such as a JAR or WAR. Only a single artifact is
+          built in a project: if you have multiple components to a project you build them
+          together as a set.
+        </p>
+      </subsection>
+      <subsection name="Target">
+        <p>
+          A <i>target</i> is the unit of execution for Ant. When you execute Ant,
+          you provide a list of targets to run, e.g.
+        </p>
+        <source>ant clean compile</source>
+        <p>
+          This executes the <code>clean</code> target followed by the <code>compile</code>
+          target that you have coded in your <code>build.xml</code> file.
+        </p>
+        <p>
+          In Maven, the <i>goal</i> is the equivalent of a target, e.g.
+        </p>
+        <source>maven clean java:compile</source>
+        <p>
+          This executes the <code>clean</code> goal of the <code>clean</code> plugin,
+          followed by the <code>java:compile</code> goal of the <code>java</code>
+          plugin.
+        </p>
+        <p>
+          Maven goals can be pre-defined in plugins as above, or you can define your own in a <code>maven.xml</code>
+          file. In Maven 1.x, goals are written in <a href="http://jakarta.apache.org/commons/jelly/">Jelly</a>,
+          and can utilise any Ant tags from the version of Ant provided with Maven.
+        </p>
+      </subsection>
+      <subsection name="Build file">
+        <p>
+          When writing your own code in Ant, you place the targets in the <code>build.xml</code> file.
+        </p>
+        <p>
+          When writing your own code in Maven, you place the <code>goal</code>s in the <code>maven.xml</code> file.
+          However, if you are only using standard Maven goals, you may not even need a <code>maven.xml</code> file.
         </p>
       </subsection>
     </section>

Modified: maven/maven-1/core/trunk/xdocs/using/multiproject.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/multiproject.xml?rev=395998&r1=395997&r2=395998&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/using/multiproject.xml (original)
+++ maven/maven-1/core/trunk/xdocs/using/multiproject.xml Fri Apr 21 13:39:51 2006
@@ -58,8 +58,8 @@
         </p>
         <table>
           <tr>
-            <td><code>multiproject:install</code></td>
-            <td>Build and install all projects into the local repository</td>
+            <td width="30%"><code>multiproject:install</code></td>
+            <td width="70%">Build and install all projects into the local repository</td>
           </tr>
           <tr>
             <td><code>multiproject:install-snapshot</code></td>