From 86c5cf1fc619bf9bd456e9ebbd9317c0bc92f940 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 20 Nov 2005 05:40:09 +0000
Subject: [PATCH] PR: MPGENAPP-22 Make generated POMs conform to
 maven-project-3.xsd

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@345724 13f79535-47bb-0310-9956-ffa450edef68
---
 genapp/project.xml                            | 13 +++-
 .../complex/template-resources/maven.xml      |  2 +-
 .../complex/template-resources/project.xml    | 55 ++++++++++++----
 .../default/template-resources/project.xml    | 38 ++++++-----
 .../ejb/template-resources/maven.xml          |  2 +-
 .../ejb/template-resources/project.xml        | 50 +++++++++------
 .../struts-jstl/template-resources/maven.xml  |  2 +-
 .../template-resources/project.xml            | 64 +++++++++++--------
 .../struts/template-resources/maven.xml       |  2 +-
 .../struts/template-resources/project.xml     | 47 ++++++++------
 .../tapestry/template-resources/maven.xml     |  2 +-
 .../tapestry/template-resources/project.xml   | 53 ++++++++-------
 .../web-jstl/template-resources/maven.xml     |  2 +-
 .../web-jstl/template-resources/project.xml   | 61 ++++++++++--------
 .../web-velocity/template-resources/maven.xml |  2 +-
 .../template-resources/project.xml            | 50 +++++++++------
 .../web/template-resources/maven.xml          |  2 +-
 .../web/template-resources/project.xml        | 57 ++++++++++-------
 genapp/xdocs/changes.xml                      |  1 +
 19 files changed, 306 insertions(+), 199 deletions(-)

diff --git a/genapp/project.xml b/genapp/project.xml
index 4fcdda04..037a480d 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -24,7 +24,8 @@
   <id>maven-genapp-plugin</id>
   <name>Maven Genapp Plugin</name>
   <currentVersion>2.3-SNAPSHOT</currentVersion>
-  <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
+  <description>A collection of example projects showing how to use maven in different situations</description>
+  <shortDescription>A collection of example projects</shortDescription>
   <url>http://maven.apache.org/maven-1.x/reference/plugins/genapp/</url>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/genapp/</siteDirectory>
   <issueTrackingUrl>http://jira.codehaus.org/browse/MPGENAPP</issueTrackingUrl>
@@ -88,7 +89,15 @@
         <role>Java Developer</role>
       </roles>
       <timezone>-3</timezone>
-    </developer>     
+    </developer>
+    <developer>
+      <name>Lukas Theussl</name>
+      <id>ltheussl</id>
+      <email>ltheussl@apache.org</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
   </developers>
   <contributors>
     <contributor>
diff --git a/genapp/src/plugin-resources/complex/template-resources/maven.xml b/genapp/src/plugin-resources/complex/template-resources/maven.xml
index 0d52a587..daab264e 100644
--- a/genapp/src/plugin-resources/complex/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/maven.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" default="multiproject:build">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
   <goal name="multiproject:build">
     <attainGoal name="multiproject:ejb-install" />
     <attainGoal name="multiproject:war-install" />
diff --git a/genapp/src/plugin-resources/complex/template-resources/project.xml b/genapp/src/plugin-resources/complex/template-resources/project.xml
index eb220db8..e073f35d 100644
--- a/genapp/src/plugin-resources/complex/template-resources/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/project.xml
@@ -1,30 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2005 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.
+ */
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
 
-<project>
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
+
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-SNAPSHOT -->
-
   <currentVersion>1.0</currentVersion>
-  <!-- details about the organization that 'owns' the project -->
 
+  <!-- details about the organization that 'owns' the project -->
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2002</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>This is an example of an application with a complex architecture that uses XDoclet, EJB, EAR and servlets that can be used as a basis for your applications.</description>
@@ -39,25 +61,30 @@
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
-
   <developers/>
+
   <!-- jar files the project is dependent on -->
-
   <dependencies/>
-  <!-- build information for the project -->
 
+  <!-- build information for the project -->
+  <build>
+    <defaultGoal>multiproject:build</defaultGoal>
+  </build>
+
+  <!-- reports to build for the project -->
   <reports>
     <report>maven-changelog-plugin</report>
     <report>maven-developer-activity-plugin</report>
diff --git a/genapp/src/plugin-resources/default/template-resources/project.xml b/genapp/src/plugin-resources/default/template-resources/project.xml
index b0be35b3..e445bbf1 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.xml
+++ b/genapp/src/plugin-resources/default/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 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.
@@ -18,62 +18,68 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
+
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-SNAPSHOT -->
-
   <currentVersion>1.0</currentVersion>
-  <!-- details about the organization that 'owns' the project -->
 
+  <!-- details about the organization that 'owns' the project -->
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2002</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
-
   <developers/>
+
   <!-- jar files the project is dependent on -->
-
   <dependencies/>
-  <!-- build information for the project -->
 
+  <!-- build information for the project -->
   <build>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
diff --git a/genapp/src/plugin-resources/ejb/template-resources/maven.xml b/genapp/src/plugin-resources/ejb/template-resources/maven.xml
index 36faa230..ab4c409d 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/ejb/template-resources/maven.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="ejb">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
   <preGoal name="java:compile">
   	<attainGoal name="xdoclet:ejbdoclet" />
   </preGoal>
diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.xml b/genapp/src/plugin-resources/ejb/template-resources/project.xml
index 9407e7f9..df8b850d 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/project.xml
+++ b/genapp/src/plugin-resources/ejb/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 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.
@@ -18,72 +18,79 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
+
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-SNAPSHOT -->
-
   <currentVersion>1.0</currentVersion>
-  <!-- details about the organization that 'owns' the project -->
 
+  <!-- details about the organization that 'owns' the project -->
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2004</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
     <dependency>
-      <id>ejb</id>
+      <groupId>ejb</groupId>
+      <artifactId>ejb</artifactId>
       <version>2.1</version>
     </dependency>
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2</version>
     </dependency>
     <dependency>
@@ -151,9 +158,10 @@
       <version>3.2.1</version>
     </dependency>
   </dependencies>
-  <!-- build information for the project -->
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>ejb</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
index d40cc6f5..fe72b2b9 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/maven.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
   <preGoal name="java:compile">
     <mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
   	<attainGoal name="xdoclet:webdoclet" />
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
index 0d580c4d..39bf26c1 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 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.
@@ -18,16 +18,20 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -40,67 +44,70 @@
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2004</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
-    
+
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
     <dependency>
-      <id>jstl</id>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
       <version>1.0.2</version>
       <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
       <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>cactus</groupId>
       <artifactId>cactus</artifactId>
@@ -194,7 +201,8 @@
 
     <!-- XDoclet dependencies -->
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2</version>
     </dependency>
 
@@ -204,7 +212,7 @@
       <version>1.2</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-    
+
     <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xdoclet-ejb-module</artifactId>
@@ -243,7 +251,7 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
@@ -252,10 +260,12 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
   </dependencies>
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/src/plugin-resources/struts/template-resources/maven.xml b/genapp/src/plugin-resources/struts/template-resources/maven.xml
index d40cc6f5..fe72b2b9 100644
--- a/genapp/src/plugin-resources/struts/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/struts/template-resources/maven.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
   <preGoal name="java:compile">
     <mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
   	<attainGoal name="xdoclet:webdoclet" />
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml
index b5b315df..2fe4b1b4 100644
--- a/genapp/src/plugin-resources/struts/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 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.
@@ -18,16 +18,20 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -40,47 +44,49 @@
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2004</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
-    
+
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
@@ -177,7 +183,8 @@
 
     <!-- XDoclet dependencies -->
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2</version>
     </dependency>
 
@@ -238,7 +245,9 @@
     
   </dependencies>
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/src/plugin-resources/tapestry/template-resources/maven.xml b/genapp/src/plugin-resources/tapestry/template-resources/maven.xml
index d3054519..a4916fc1 100755
--- a/genapp/src/plugin-resources/tapestry/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/tapestry/template-resources/maven.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
   <preGoal name="java:compile">
     <mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
   	<attainGoal name="xdoclet:webdoclet" />
diff --git a/genapp/src/plugin-resources/tapestry/template-resources/project.xml b/genapp/src/plugin-resources/tapestry/template-resources/project.xml
index d68e14ba..36c8f1ac 100755
--- a/genapp/src/plugin-resources/tapestry/template-resources/project.xml
+++ b/genapp/src/plugin-resources/tapestry/template-resources/project.xml
@@ -18,16 +18,20 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -40,47 +44,49 @@
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
+  <!-- the year the project started -->
   <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
-    
+
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
@@ -211,7 +217,8 @@
 
     <!-- XDoclet dependencies -->
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2.3</version>
     </dependency>
 
@@ -221,7 +228,7 @@
       <version>1.2.3</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-    
+
     <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xdoclet-ejb-module</artifactId>
@@ -235,14 +242,14 @@
       <version>1.1</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-    
+
     <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>maven-xdoclet-plugin</artifactId>
       <version>1.2.3</version>
       <type>plugin</type>
       <url>http://xdoclet.sf.net/</url>
-    </dependency>    
+    </dependency>
 
     <!-- HttpUnit dependencies -->
    <dependency>
@@ -253,7 +260,7 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
@@ -262,10 +269,12 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
   </dependencies>
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml b/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
index d40cc6f5..fe72b2b9 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/maven.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
   <preGoal name="java:compile">
     <mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
   	<attainGoal name="xdoclet:webdoclet" />
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
index e1f57bea..80e7397f 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 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.
@@ -18,16 +18,21 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
 
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -40,65 +45,68 @@
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2004</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
-    
+
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
     <dependency>
-      <id>jstl</id>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
       <version>1.0.2</version>
       <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
       <version>1.0.4</version>
       <properties>
         <war.bundle>true</war.bundle>
-      </properties>      
+      </properties>
     </dependency>
     
     <dependency>
@@ -118,7 +126,8 @@
 
     <!-- XDoclet dependencies -->
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2</version>
     </dependency>
 
@@ -135,7 +144,7 @@
       <version>1.2</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-    
+
     <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xjavadoc</artifactId>
@@ -160,7 +169,7 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
@@ -169,10 +178,12 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
   </dependencies>
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/maven.xml b/genapp/src/plugin-resources/web-velocity/template-resources/maven.xml
index 23d461a2..0c050b6d 100644
--- a/genapp/src/plugin-resources/web-velocity/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/web-velocity/template-resources/maven.xml
@@ -17,6 +17,6 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
 </project>
 
diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
index e9b832d3..82c4de57 100644
--- a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2005 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.
@@ -18,16 +18,20 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -40,47 +44,50 @@
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2004</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
+
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
     
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
@@ -125,7 +132,7 @@
         <war.bundle>true</war.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
@@ -162,7 +169,6 @@
       </properties>
     </dependency>
 
- 
     <!-- HttpUnit dependencies -->
    <dependency>
       <groupId>httpunit</groupId>
@@ -172,7 +178,7 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
@@ -181,10 +187,12 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
   </dependencies>
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/src/plugin-resources/web/template-resources/maven.xml b/genapp/src/plugin-resources/web/template-resources/maven.xml
index d40cc6f5..fe72b2b9 100644
--- a/genapp/src/plugin-resources/web/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/web/template-resources/maven.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war">
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant">
   <preGoal name="java:compile">
     <mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
   	<attainGoal name="xdoclet:webdoclet" />
diff --git a/genapp/src/plugin-resources/web/template-resources/project.xml b/genapp/src/plugin-resources/web/template-resources/project.xml
index 840c0b57..27f4f50d 100644
--- a/genapp/src/plugin-resources/web/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web/template-resources/project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 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.
@@ -18,16 +18,20 @@
  -->
 
 
-<project>
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
+
   <!-- the version of maven's project object model -->
-
   <pomVersion>3</pomVersion>
+
   <!-- a unique name for this project -->
-
   <id>@ID@</id>
-  <groupId>@ID@</groupId>
-  <!-- a short but descriptive name for the project -->
 
+  <!--  The short name of the project group.
+        This value is used to group all jars for a project in one directory. -->
+  <groupId>@ID@</groupId>
+
+  <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -40,47 +44,49 @@
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  <!-- the year the project started -->
 
-  <inceptionYear>2004</inceptionYear>
+  <!-- the year the project started -->
+  <inceptionYear>2005</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>A collection of example projects showing how to use maven in different situations</description>
+
   <!-- a short description of what the project does -->
-
   <shortDescription>How to use maven in different situations</shortDescription>
-  <!-- the project home page -->
 
+  <!-- the project home page -->
   <url>http://maven.apache.org/maven-1.x/reference/plugins/examples/</url>
+
   <issueTrackingUrl>http://issues.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/maven-1.x/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
+
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
-
   <repository>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/examples</connection>
     <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/examples/</url>
   </repository>
+
   <!-- any mailing lists for the project -->
-
   <mailingLists/>
+
   <!-- who the developers are for the project -->
+  <developers/>
 
-  <developers>
-  </developers>
   <!-- jar files the project is dependent on -->
-
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
-    
+
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
@@ -101,7 +107,8 @@
 
     <!-- XDoclet dependencies -->
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2</version>
     </dependency>
 
@@ -111,14 +118,14 @@
       <version>1.2</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-    
+
     <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xdoclet-ejb-module</artifactId>
       <version>1.2</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-    
+
     <dependency>
       <groupId>xdoclet</groupId>
       <artifactId>xjavadoc</artifactId>
@@ -132,7 +139,7 @@
       <version>1.2</version>
       <type>plugin</type>
       <url>http://xdoclet.sf.net/</url>
-    </dependency>    
+    </dependency>
 
     <!-- HttpUnit dependencies -->
    <dependency>
@@ -143,7 +150,7 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
     <dependency>
       <groupId>jtidy</groupId>
       <artifactId>jtidy</artifactId>
@@ -152,10 +159,12 @@
         <cactus.bundle>true</cactus.bundle>
       </properties>
     </dependency>
-    
+
   </dependencies>
 
+  <!-- build information for the project -->
   <build>
+    <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml
index 6ed847e9..bd0bc48e 100644
--- a/genapp/xdocs/changes.xml
+++ b/genapp/xdocs/changes.xml
@@ -22,6 +22,7 @@
   </properties>
   <body>
     <release version="2.3-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPGENAPP-22">Make generated POMs conform to maven-project-3.xsd.</action>
       <action dev="felipeal" type="add" issue="MPGENAPP-3" due-to="Sri Sankaran">Added prompt for project root.</action>
       <action dev="felipeal" type="add" issue="MPGENAPP-10" due-to="Archimedes Trajano">Added Tapestry template.</action>
       <action dev="felipeal" type="fix" issue="MPGENAPP-17">Using <code>${maven.home.local}</code> instead of <code>${user.home}/.maven</code> for templates.</action>