Fix URL

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113142 13f79535-47bb-0310-9956-ffa450edef68

antlr/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/antlr/</url>
+  <url>http://maven.apache.org/reference/plugins/antlr/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/antlr/</siteDirectory>
 

appserver/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>A Maven plugin that can be used to install and control a J2EE application server instance.</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/appserver/</url>
+  <url>http://maven.apache.org/reference/plugins/appserver/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/appserver/</siteDirectory>
 

ashkelon/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/ashkelon/</url>
+  <url>http://maven.apache.org/reference/plugins/ashkelon/</url>
   <package>org.apache.maven.ashkelon</package>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/linkcheck/</siteDirectory>

aspectj/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Eclipse Plugin for AspectJ</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/aspectj/</url>
+  <url>http://maven.apache.org/reference/plugins/aspectj/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
 

cactus/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>Plugin for Cactus (http://jakarta.apache.org/cactus) that allows to automatically start containers, run Cactus tests and stop the containers.</description>
   <shortDescription>Cactus plugin</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/cactus/</url>
+  <url>http://maven.apache.org/reference/plugins/cactus/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/cactus/</siteDirectory>
 

castor/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/castor/</url>
+  <url>http://maven.apache.org/reference/plugins/castor/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/castor/</siteDirectory>
   

changelog/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/changelog/</url>
+  <url>http://maven.apache.org/reference/plugins/changelog/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/changelog/</siteDirectory>
   

changes/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
   
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/changes/</url>
+  <url>http://maven.apache.org/reference/plugins/changes/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/changes/</siteDirectory>
   

checkstyle/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/checkstyle/</url>
+  <url>http://maven.apache.org/reference/plugins/checkstyle/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/checkstyle/</siteDirectory>
   

clover/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/clover/</url>
+  <url>http://maven.apache.org/reference/plugins/clover/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/clover/</siteDirectory>
   

codeswitcher/project.xml

@@ -8,13 +8,13 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/codeswitcher/</url>
+  <url>http://maven.apache.org/reference/plugins/codeswitcher/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/codeswitcher/</siteDirectory>
   
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/codeswitcher/</connection>

console/project.xml

@@ -7,13 +7,13 @@
   <name>Maven Console Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>Console for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/console/</url>
+  <url>http://maven.apache.org/reference/plugins/console/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/console/</siteDirectory>
   
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
   
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/console/</connection>

deploy/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/deploy/</url>
+  <url>http://maven.apache.org/reference/plugins/deploy/</url>
   
   <siteDirectory>/www/maven.apache.org/reference/plugins/deploy/</siteDirectory>
   

developer-activity/project.xml

@@ -9,7 +9,7 @@
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by developer.</description>
   <shortDescription/>
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/developer-activity/</url>
+  <url>http://maven.apache.org/reference/plugins/developer-activity/</url>
   
   <siteDirectory>/www/maven.apache.org/reference/plugins/developer-activity/</siteDirectory>
 

dist/project.xml

@@ -7,7 +7,7 @@
   <name>Maven Distribution Plug-in</name>
   <currentVersion>1.2</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/dist/</url>
+  <url>http://maven.apache.org/reference/plugins/dist/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/dist/</siteDirectory>
 

docbook/project.xml

@@ -7,7 +7,7 @@
   <name>Maven DocBook Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/docbook/</url>
+  <url>http://maven.apache.org/reference/plugins/docbook/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/docbook/</siteDirectory>
 

ear/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>Ear Plugin for Maven</description>
   <shortDescription>Ear Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/ear/</url>
+  <url>http://maven.apache.org/reference/plugins/ear/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/ear/</siteDirectory>
 

eclipse/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>A plugin to generate various files for the Eclipse IDE and ease the use of Maven within that environment</description>
   <shortDescription>Eclipse Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/eclipse/</url>
+  <url>http://maven.apache.org/reference/plugins/eclipse/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/eclipse/</siteDirectory>
 

ejb/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>EJB Plugin for Maven</description>
   <shortDescription>EJB Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/ejb/</url>
+  <url>http://maven.apache.org/reference/plugins/ejb/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/ejb/</siteDirectory>
 

examples/project.xml

@@ -34,11 +34,11 @@
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <!-- the project home page -->
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/examples/</url>
+  <url>http://maven.apache.org/reference/plugins/examples/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <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> -->

faq/project.xml

@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from an FAQ XML document.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/faq/</url>
+  <url>http://maven.apache.org/reference/plugins/faq/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/faq/</siteDirectory>
 

file-activity/project.xml

@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by file.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/file-activity/</url>
+  <url>http://maven.apache.org/reference/plugins/file-activity/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/file-activity/</siteDirectory>
 

genapp/project.xml

@@ -20,7 +20,7 @@
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <!-- the project home page -->
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/genapp/</url>
+  <url>http://maven.apache.org/reference/plugins/genapp/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
 

genapp/src/plugin-resources/src/pom/project.xml

@@ -17,14 +17,14 @@
   <!-- details about the organization that 'owns' the project -->
   <organization>
     <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
+    <url>http://www.apache.org/</url>
-    <logo>http://jakarta.apache.org/turbine/maven/images/jakarta-logo-blue.gif</logo>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   
   <!-- the year the project started -->
   <inceptionYear>2002</inceptionYear>
   <package>@PACKAGE@</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
   <description>
     A collection of example projects showing how to use maven in different
     situations   

gump/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/gump/</url>
+  <url>http://maven.apache.org/reference/plugins/gump/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/gump/</siteDirectory>
 

html2xdoc/project.xml

@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from normal HTML documentation.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/html2xdoc/</url>
+  <url>http://maven.apache.org/reference/plugins/html2xdoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/html2xdoc/</siteDirectory>
 

idea/project.xml

@@ -7,7 +7,7 @@
   <name>Maven IDEA Plug-in</name>
   <currentVersion>1.2-SNAPSHOT</currentVersion>
   <shortDescription>IDEA Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/idea/</url>
+  <url>http://maven.apache.org/reference/plugins/idea/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/idea/</siteDirectory>
 

j2ee/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/j2ee/</url>
+  <url>http://maven.apache.org/reference/plugins/j2ee/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/j2ee/</siteDirectory>
 

jalopy/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jalopy/</url>
+  <url>http://maven.apache.org/reference/plugins/jalopy/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jalopy/</siteDirectory>
 

java/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/java/</url>
+  <url>http://maven.apache.org/reference/plugins/java/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/java/</siteDirectory>
 

javadoc/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/javadoc/</url>
+  <url>http://maven.apache.org/reference/plugins/javadoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
 

jbuilder/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>JBuilder Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jbuilder/</url>
+  <url>http://maven.apache.org/reference/plugins/jbuilder/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jbuilder/</siteDirectory>
 

jdepend/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jdepend/</url>
+  <url>http://maven.apache.org/reference/plugins/jdepend/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdepend/</siteDirectory>
 

jdeveloper/project.xml

@@ -9,7 +9,7 @@
   <inceptionYear>2002</inceptionYear>
   <description>A plugin to generate various files for Oracle's JDeveloper IDE and ease the use of Maven within that environment</description>
   <shortDescription>JDeveloper Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jdeveloper/</url>
+  <url>http://maven.apache.org/reference/plugins/jdeveloper/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdeveloper/</siteDirectory>
 

jdiff/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jdiff/</url>
+  <url>http://maven.apache.org/reference/plugins/jdiff/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdiff/</siteDirectory>
 

jellydoc/project.xml

@@ -11,7 +11,7 @@
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates a JavaDoc like report for any Jelly Tags used in a project.</description>
   <shortDescription/>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jellydoc/</url>
+  <url>http://maven.apache.org/reference/plugins/jellydoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jellydoc/</siteDirectory>
 

jnlp/project.xml

@@ -7,7 +7,7 @@
   <name>Maven JNLP Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>JNLP Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jnlp/</url>
+  <url>http://maven.apache.org/reference/plugins/jnlp/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
 

junit-report/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/junit-report/</url>
+  <url>http://maven.apache.org/reference/plugins/junit-report/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/junit-report/</siteDirectory>
 

junitdoclet/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>A plugin to generate test cases use JUnitDoclet</description>
   <shortDescription>JUnitDoclet test generator</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/junitdoclet/</url>
+  <url>http://maven.apache.org/reference/plugins/junitdoclet/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/junitdoclet/</siteDirectory>
 

jxr/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/jxr/</url>
+  <url>http://maven.apache.org/reference/plugins/jxr/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/jxr/</siteDirectory>
 

latex/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/latex/</url>
+  <url>http://maven.apache.org/reference/plugins/latex/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/latex/</siteDirectory>
 

latka/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/latka/</url>
+  <url>http://maven.apache.org/reference/plugins/latka/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/latka/</siteDirectory>
 

license/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/license/</url>
+  <url>http://maven.apache.org/reference/plugins/license/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/license/</siteDirectory>
 

linkcheck/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/linkcheck/</url>
+  <url>http://maven.apache.org/reference/plugins/linkcheck/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/linkcheck/</siteDirectory>
 

pdf/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/pdf/</url>
+  <url>http://maven.apache.org/reference/plugins/pdf/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/pdf/</siteDirectory>
 

perforce/project.xml

@@ -8,10 +8,9 @@
   <currentVersion>1.1</currentVersion>
   <inceptionYear>2001</inceptionYear>
   <package>org.apache.maven</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/perforce/</url>
+  <url>http://maven.apache.org/reference/plugins/perforce/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/perforce/</siteDirectory>
 

plugin/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Maven Plugin plugin</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/plugin/</url>
+  <url>http://maven.apache.org/reference/plugins/plugin/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/plugin/</siteDirectory>
 

pom/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/pom/</url>
+  <url>http://maven.apache.org/reference/plugins/pom/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/pom/</siteDirectory>
 

project.xml

@@ -8,22 +8,22 @@
   <currentVersion>1.0</currentVersion>
   <organization>
     <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
+    <url>http://www.apache.org/</url>
-    <logo>http://jakarta.apache.org/turbine/maven/images/jakarta-logo-blue.gif</logo>
+    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   <inceptionYear>2001</inceptionYear>
   <package>org.apache.maven</package>
-  <logo>http://jakarta.apache.org/turbine/maven/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.jpg</logo>
 
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
-  <siteAddress>jakarta.apache.org</siteAddress>
+  <siteAddress>maven.apache.org</siteAddress>
 
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
 
 
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven/src/plugins-build/plexus/</connection>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/plexus/</connection>
-    <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/src/plugins-build/plexus/</url>
+    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/plexus/</url>
   </repository>
 
   <build>

release/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/deploy/</url>
+  <url>http://maven.apache.org/reference/plugins/deploy/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/deploy/</siteDirectory>
 

repository/project.xml

@@ -8,11 +8,11 @@
   <currentVersion>1.0-SNAPSHOT</currentVersion>
   <shortDescription>Tools to work with the central repo</shortDescription>
   
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/repository/</url>
+  <url>http://maven.apache.org/reference/plugins/repository/</url>
   
   <siteDirectory>/www/maven.apache.org/reference/plugins/repository/</siteDirectory>
   
-  <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
+  <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
 
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/repository/</connection>

sea/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/deploy/</url>
+  <url>http://maven.apache.org/reference/plugins/deploy/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/deploy/</siteDirectory>
 

shell/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description>A plugin to generate various files for different shells to allow tab completion for maven goals</description>
   <shortDescription>Shell Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/shell/</url>
+  <url>http://maven.apache.org/reference/plugins/shell/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/shell/</siteDirectory>
 

site/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/site/</url>
+  <url>http://maven.apache.org/reference/plugins/site/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/site/</siteDirectory>
 

statcvs/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Provides CVS statistics</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/statcvs/</url>
+  <url>http://maven.apache.org/reference/plugins/statcvs/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/statcvs/</siteDirectory>
 

struts/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/struts/</url>
+  <url>http://maven.apache.org/reference/plugins/struts/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/struts/</siteDirectory>
 

summit/project.xml

@@ -9,7 +9,7 @@
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
   
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/summit/</url>
+  <url>http://maven.apache.org/reference/plugins/summit/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/summit/</siteDirectory>
 

tasklist/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>2.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/tasklist/</url>
+  <url>http://maven.apache.org/reference/plugins/tasklist/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/tasklist/</siteDirectory>
 

test/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/test/</url>
+  <url>http://maven.apache.org/reference/plugins/test/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/test/</siteDirectory>
 

torque/project.xml

@@ -7,7 +7,7 @@
   <currentVersion>3.1</currentVersion>
   <description>Maven Plugin for Torque</description>
   <shortDescription>Maven Plugin for Torque</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/torque/</url>
+  <url>http://maven.apache.org/reference/plugins/torque/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/torque/</siteDirectory>
 

touchstone-partner/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/touchstone-partner/</url>
+  <url>http://maven.apache.org/reference/plugins/touchstone-partner/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/touchstone-partner/</siteDirectory>
 

touchstone/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.0</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/touchstone/</url>
+  <url>http://maven.apache.org/reference/plugins/touchstone/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/touchstone/</siteDirectory>
 

uberjar/project.xml

@@ -20,7 +20,7 @@
   <shortDescription>Uberjar packages your project as well as its dependencies into a single jar file. In addition, bootstrap code is added that enables a main class to be invoked by simply typing: java -jar your.jar</shortDescription>
   <!-- the project home page -->
 
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/uberjar/</url>
+  <url>http://maven.apache.org/reference/plugins/uberjar/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/uberjar/</siteDirectory>
 

vdoclet/project.xml

@@ -11,7 +11,7 @@
     source code using velocity driven templates
   </description>
   <shortDescription>VDoclet plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/vdoclet/</url>
+  <url>http://maven.apache.org/reference/plugins/vdoclet/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/vdoclet/</siteDirectory>
 

war/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>War Plugin for Maven</description>
   <shortDescription>War Plugin for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/war/</url>
+  <url>http://maven.apache.org/reference/plugins/war/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/war/</siteDirectory>
 

webserver/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/webserver/</url>
+  <url>http://maven.apache.org/reference/plugins/webserver/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/webserver/</siteDirectory>
 

wizard/project.xml

@@ -7,7 +7,7 @@
   <name>Maven Wizard Plug-in</name>
   <currentVersion>1.0</currentVersion>
   <shortDescription>Wizard for Maven</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/wizard/</url>
+  <url>http://maven.apache.org/reference/plugins/wizard/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/wizard/</siteDirectory>
 

word2html/project.xml

@@ -8,7 +8,7 @@
   <currentVersion>1.2</currentVersion>
   <description>A Maven plugin to convert word docs into html for project usage</description>
   <shortDescription>Convert Word docs to HTML</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/word2html/</url>
+  <url>http://maven.apache.org/reference/plugins/word2html/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/word2html/</siteDirectory>
 

xdoc/project.xml

@@ -7,7 +7,7 @@
   <name>Maven XDoc Plug-in</name>
   <currentVersion>1.3</currentVersion>
   <shortDescription>Java Project Management Tools</shortDescription>
-  <url>http://jakarta.apache.org/turbine/maven/reference/plugins/xdoc/</url>
+  <url>http://maven.apache.org/reference/plugins/xdoc/</url>
 
   <siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>