diff --git a/genapp/project.xml b/genapp/project.xml
index 252e9584..ccb35c2b 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -29,9 +29,9 @@
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
   <issueTrackingUrl>http://jira.codehaus.org/browse/MPGENAPP</issueTrackingUrl>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/genapp/</connection>
-    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/genapp/</developerConnection>
-    <url>http://cvs.apache.org/viewcvs/maven-plugins/genapp/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/genapp/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/genapp/</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/maven/maven-1/plugins/trunk/genapp/</url>
   </repository>
   <versions>
     <version>
@@ -46,6 +46,15 @@
     </version>
   </versions>
   <developers>
+    <developer>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <roles>
+        <role>Developer</role>
+        <role>Release Manager</role>
+      </roles>
+    </developer>  
     <developer>
       <name>Jason van Zyl</name>
       <id>jvanzyl</id>
@@ -53,7 +62,6 @@
       <organization>Zenplex</organization>
       <roles>
         <role>Architect</role>
-        <role>Release Manager</role>
       </roles>
     </developer>
     <developer>
diff --git a/genapp/src/plugin-resources/complex/template-resources/project.xml b/genapp/src/plugin-resources/complex/template-resources/project.xml
index 19f19e6c..ed2dc3c6 100644
--- a/genapp/src/plugin-resources/complex/template-resources/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/project.xml
@@ -44,8 +44,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/default/template-resources/project.xml b/genapp/src/plugin-resources/default/template-resources/project.xml
index 7f161c13..495f292a 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.xml
+++ b/genapp/src/plugin-resources/default/template-resources/project.xml
@@ -60,8 +60,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/ejb/template-resources/project.xml b/genapp/src/plugin-resources/ejb/template-resources/project.xml
index 14f4f92a..4c3a95b6 100644
--- a/genapp/src/plugin-resources/ejb/template-resources/project.xml
+++ b/genapp/src/plugin-resources/ejb/template-resources/project.xml
@@ -61,8 +61,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties b/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties
index b78d1c94..f2fe747e 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.properties
@@ -31,6 +31,7 @@ maven.xdoclet.webdoclet.jbosswebxml.0=true
 maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
 maven.xdoclet.webdoclet.fileset.0.include=**/*.java
 maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
 cactus.src.mergewebxml = src/conf/cactus-web.xml
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 bd4b48fb..bf248492 100644
--- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
@@ -61,8 +61,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/struts-jstl/template.properties b/genapp/src/plugin-resources/struts-jstl/template.properties
index e133814a..87d82079 100644
--- a/genapp/src/plugin-resources/struts-jstl/template.properties
+++ b/genapp/src/plugin-resources/struts-jstl/template.properties
@@ -15,6 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.genapp.repackage=java,test,test-cactus
-maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties
 
 maven.genapp.default.package=example.web
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.properties b/genapp/src/plugin-resources/struts/template-resources/project.properties
index 934072d5..2ae0a3b1 100644
--- a/genapp/src/plugin-resources/struts/template-resources/project.properties
+++ b/genapp/src/plugin-resources/struts/template-resources/project.properties
@@ -31,5 +31,6 @@ maven.xdoclet.webdoclet.jbosswebxml.0=true
 maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
 maven.xdoclet.webdoclet.fileset.0.include=**/*.java
 cactus.src.mergewebxml = src/conf/cactus-web.xml
diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml
index f1f9a8a5..90884d2b 100644
--- a/genapp/src/plugin-resources/struts/template-resources/project.xml
+++ b/genapp/src/plugin-resources/struts/template-resources/project.xml
@@ -61,8 +61,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/struts/template.properties b/genapp/src/plugin-resources/struts/template.properties
index e133814a..87d82079 100644
--- a/genapp/src/plugin-resources/struts/template.properties
+++ b/genapp/src/plugin-resources/struts/template.properties
@@ -15,6 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.genapp.repackage=java,test,test-cactus
-maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties
 
 maven.genapp.default.package=example.web
diff --git a/genapp/src/plugin-resources/web-jstl/template-resources/project.properties b/genapp/src/plugin-resources/web-jstl/template-resources/project.properties
index 41abca13..1f0b7f9e 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/project.properties
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.properties
@@ -22,5 +22,6 @@ maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.0.mergeDir=src/merge
 maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
 maven.xdoclet.webdoclet.jsptaglib.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF/tld
 cactus.src.mergewebxml = src/conf/cactus-web.xml
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 7be2081b..b1f9d75c 100644
--- a/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-jstl/template-resources/project.xml
@@ -61,8 +61,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/web-jstl/template.properties b/genapp/src/plugin-resources/web-jstl/template.properties
index 4be67c04..48b10cd4 100644
--- a/genapp/src/plugin-resources/web-jstl/template.properties
+++ b/genapp/src/plugin-resources/web-jstl/template.properties
@@ -15,6 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.genapp.repackage=java,test,test-cactus
-maven.genapp.filter=project.xml,src/conf/cactus-web.xml
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/webapp/*.jsp,project.properties
 
 maven.genapp.default.package=example.web
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 f3f7addb..072944b7 100644
--- a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml
@@ -61,8 +61,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/web/template-resources/project.properties b/genapp/src/plugin-resources/web/template-resources/project.properties
index b9bf5b9c..cdbb5161 100644
--- a/genapp/src/plugin-resources/web/template-resources/project.properties
+++ b/genapp/src/plugin-resources/web/template-resources/project.properties
@@ -22,4 +22,5 @@ maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.0.mergeDir=src/merge
 maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
 cactus.src.mergewebxml = src/conf/cactus-web.xml
diff --git a/genapp/src/plugin-resources/web/template-resources/project.xml b/genapp/src/plugin-resources/web/template-resources/project.xml
index 1632e9c5..fe4c159b 100644
--- a/genapp/src/plugin-resources/web/template-resources/project.xml
+++ b/genapp/src/plugin-resources/web/template-resources/project.xml
@@ -61,8 +61,8 @@
        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>
+    <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 -->
 
diff --git a/genapp/src/plugin-resources/web/template.properties b/genapp/src/plugin-resources/web/template.properties
index 4be67c04..48b10cd4 100644
--- a/genapp/src/plugin-resources/web/template.properties
+++ b/genapp/src/plugin-resources/web/template.properties
@@ -15,6 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.genapp.repackage=java,test,test-cactus
-maven.genapp.filter=project.xml,src/conf/cactus-web.xml
+maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/webapp/*.jsp,project.properties
 
 maven.genapp.default.package=example.web
diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml
index 8887781b..20bfc6d9 100644
--- a/genapp/xdocs/changes.xml
+++ b/genapp/xdocs/changes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,16 +16,15 @@
  * limitations under the License.
  */
  -->
-
 <document>
   <properties>
     <title>Changes</title>
-    <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
     <release version="2.3" date="in cvs">
       <action dev="felipeal" type="add" issue="MPGENAPP-20" due-to="Miguel Griffa">Added customization guide.</action>
       <action dev="felipeal" type="add" issue="MPGENAPP-19" due-to="Miguel Griffa">Added Velocity-based webapp template (named <code>web-velocity</code>).</action>
+      <action dev="aheritier" type="add" issue="MPGENAPP-18" due-to="Archimedes Trajano">Use the project's name as display-name in web.xml.</action>
     </release>
     <release version="2.2" date="2004-05-15">
       <action dev="evenisse" type="fix" issue="MPGENAPP-7">Remove Struts deprecated apis.</action>