Index: index.apt
===================================================================
--- index.apt	(revision 366566)
+++ index.apt	(working copy)
@@ -17,7 +17,8 @@
   Plugins are organized according to a directory structure that resembles the standard Java package naming convention.
   To see a list of available plugins from the Maven project, look in the
   {{{http://www.ibiblio.org/maven2/org/apache/maven/plugins/} <<<org/apache/maven subfolder>>>}}
-  of this directory.
+  of this directory. There are also many plug-ins available at the {{{http://mojo.codehaus.org} Mojo}} project at 
+  Codehaus.
 
   ~~ TODO: the repository manager should be able to produce a page like this. Ensure all descriptions are in the POM of these plugins.
 
@@ -34,6 +35,14 @@
 *--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-assembly-plugin} <<<assembly>>>}}                         | Build an assembly (distribution) of sources and binaries.
 *--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://cargo.codehaus.org/Maven2+plugin} <<<cargo>>>}}          | Start/stop/configure J2EE containers and deploy to them.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/castor-maven-plugin} <<<castor>>>}}    | Generate sources from an XSD using Castor.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/changlog-maven-plugin} <<<changelog>>>}} | Generate a list of recent changes from your SCM.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/changes-maven-plugin} <<<changes>>>}}  | Generate a report from issue tracking or a change document.
+*--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-checkstyle-plugin} <<<checkstyle>>>}}                     | Generate a checkstyle report.
 *--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-clean-plugin} <<<clean>>>}}                               | Clean up after the build.
@@ -56,8 +65,18 @@
 *--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-jar-plugin} <<<jar>>>}}                                   | Build a JAR from the current project.
 *--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/javacc-maven-plugin} <<<javacc>>>}}    | Generate sources from a JavaCC grammer.
+*--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-javadoc-plugin} <<<javadoc>>>}}                           | Generate Javadoc for the project.
 *--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://ws.apache.org/jaxme/mp/} <<<jaxme>>>}}                   | Use the JaxMe JAXB implementation to generate Java sources from XML schema.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/jdepend-maven-plugin} <<<jdepend>>>}}  | Generate a report on code metrics using JDepend.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://jetty.mortbay.org/jetty6/maven-plugin/howto.html} <<<jetty6>>>}} | Run a Jetty container for rapid webapp development.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/jxr-maven-plugin} <<<jxr>>>}}          | Generate a source cross reference.
+*--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-plugin-plugin} <<<plugin>>>}}                             | Create a Maven plugin descriptor for any Mojo's found in the source tree, to include in the JAR.
 *--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-pmd-plugin} <<<pmd>>>}}                                   | Generate a PMD report.
@@ -78,37 +97,13 @@
 *--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-surefire-plugin} <<<surefire>>>}}                         | Run the Junit tests in an isolated classloader.
 *--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/surefire-report-maven-plugin} <<<surefire-report>>>}} | Generate a report based on the results of unit tests.
+*--------------------------------------------------------------------+----------------------------------------------+
+| {{{http://mojo.codehaus.org/taglist-maven-plugin} <<<taglist>>>}}  | Generate a list of tasks based on tags in your code.
+*--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-verifier-plugin} <<<verifier>>>}}                         | Useful for integration tests - verifies the existence of certain conditions.
 *--------------------------------------------------------------------+----------------------------------------------+
 | {{{maven-war-plugin} <<<war>>>}}                                   | Build a WAR from the current project.
 *--------------------------------------------------------------------+----------------------------------------------+
 
-  There are also many plug-ins available at the {{{http://mojo.codehaus.org} Mojo}} project at Codehaus.
 
-*-----------------------------------------------------------------------------------+----------------------------------+
-| <<Plugin>>                                                                        | <<Description>>
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/castor-maven-plugin} <<<castor>>>}}                   | Generate sources from an XSD using Castor.
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/changlog-maven-plugin} <<<changelog>>>}}              | Generate a list of recent changes from your SCM.
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/changes-maven-plugin} <<<changes>>>}}                 | Generate a report from issue tracking or a change document.
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/javacc-maven-plugin} <<<javacc>>>}}                   | Generate sources from a JavaCC grammer.
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/jdepend-maven-plugin} <<<jdepend>>>}}                 | Generate a report on code metrics using JDepend.
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/jxr-maven-plugin} <<<jxr>>>}}                         | Generate a source cross reference.
-*-----------------------------------------------------------------------------------+----------------------------------+
-| {{{http://mojo.codehaus.org/surefire-report-maven-plugin} <<<surefire-report>>>}} | Generate a report based on the results of unit tests.
-*----------------------------------------------------------------------+----------------------------------------------+
-| {{{http://mojo.codehaus.org/taglist-maven-plugin} <<<taglist>>>}}                 | Generate a list of tasks based on tags in your code.
-*-----------------------------------------------------------------------------------+----------------------------------+
-
-  A number of other projects provide their own Maven2 plugins. This includes:
-
-*----------------------------------------------------------------------------+----------------------------------------+
-| <<Plugin>>                                                                 | <<Description>>
-*----------------------------------------------------------------------------+----------------------------------------+
-| {{{http://jetty.mortbay.org/jetty6/maven-plugin/howto.html} <<<jetty6>>>}} | Run a Jetty container for rapid webapp development.
-*----------------------------------------------------------------------------+----------------------------------------+