From 232935ba650cb2f2351e4d99071d435b45d520ef Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Thu, 29 Sep 2005 01:49:28 +0000
Subject: [PATCH] rename packages and mojos class names

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292371 13f79535-47bb-0310-9956-ffa450edef68
---
 .../site/SiteDeployMojo.java}                       |   4 ++--
 .../DoxiaMojo.java => plugins/site/SiteMojo.java}   |  10 +++++-----
 .../{doxia => plugins/site}/css/maven-base.css      |   0
 .../{doxia => plugins/site}/css/maven-theme.css     |   0
 .../maven/{doxia => plugins/site}/css/print.css     |   0
 .../maven/{doxia => plugins/site}/images/add.gif    | Bin
 .../{doxia => plugins/site}/images/collapsed.gif    | Bin
 .../{doxia => plugins/site}/images/expanded.gif     | Bin
 .../site}/images/external-classic.png               | Bin
 .../{doxia => plugins/site}/images/external.png     | Bin
 .../maven/{doxia => plugins/site}/images/file.gif   | Bin
 .../maven/{doxia => plugins/site}/images/fix.gif    | Bin
 .../site}/images/folder-closed.gif                  | Bin
 .../{doxia => plugins/site}/images/folder-open.gif  | Bin
 .../{doxia => plugins/site}/images/help_logo.gif    | Bin
 .../{doxia => plugins/site}/images/icon_alert.gif   | Bin
 .../site}/images/icon_alertsml.gif                  | Bin
 .../site}/images/icon_arrowfolder1_sml.gif          | Bin
 .../site}/images/icon_arrowfolder2_sml.gif          | Bin
 .../site}/images/icon_arrowfolderclosed1_sml.gif    | Bin
 .../site}/images/icon_arrowfolderopen2_sml.gif      | Bin
 .../site}/images/icon_arrowmembers1_sml.gif         | Bin
 .../site}/images/icon_arrowmembers2_sml.gif         | Bin
 .../site}/images/icon_arrowusergroups1_sml.gif      | Bin
 .../site}/images/icon_arrowusergroups2_sml.gif      | Bin
 .../site}/images/icon_arrowwaste1_sml.gif           | Bin
 .../site}/images/icon_arrowwaste2_sml.gif           | Bin
 .../site}/images/icon_confirmsml.gif                | Bin
 .../{doxia => plugins/site}/images/icon_doc_lrg.gif | Bin
 .../{doxia => plugins/site}/images/icon_doc_sml.gif | Bin
 .../site}/images/icon_error_lrg.gif                 | Bin
 .../site}/images/icon_error_sml.gif                 | Bin
 .../site}/images/icon_folder_lrg.gif                | Bin
 .../site}/images/icon_folder_sml.gif                | Bin
 .../site}/images/icon_help_lrg.gif                  | Bin
 .../site}/images/icon_help_sml.gif                  | Bin
 .../site}/images/icon_info_lrg.gif                  | Bin
 .../site}/images/icon_info_sml.gif                  | Bin
 .../{doxia => plugins/site}/images/icon_infosml.gif | Bin
 .../site}/images/icon_members_lrg.gif               | Bin
 .../site}/images/icon_members_sml.gif               | Bin
 .../site}/images/icon_sortdown.gif                  | Bin
 .../site}/images/icon_sortleft.gif                  | Bin
 .../site}/images/icon_sortright.gif                 | Bin
 .../{doxia => plugins/site}/images/icon_sortup.gif  | Bin
 .../site}/images/icon_success_lrg.gif               | Bin
 .../site}/images/icon_success_sml.gif               | Bin
 .../site}/images/icon_usergroups_lrg.gif            | Bin
 .../site}/images/icon_usergroups_sml.gif            | Bin
 .../site}/images/icon_warning_lrg.gif               | Bin
 .../site}/images/icon_warning_sml.gif               | Bin
 .../site}/images/icon_waste_lrg.gif                 | Bin
 .../site}/images/icon_waste_sml.gif                 | Bin
 .../site}/images/logos/maven-feather.png            | Bin
 .../site}/images/newwindow-classic.png              | Bin
 .../{doxia => plugins/site}/images/newwindow.png    | Bin
 .../maven/{doxia => plugins/site}/images/none.png   | Bin
 .../maven/{doxia => plugins/site}/images/nw_maj.gif | Bin
 .../{doxia => plugins/site}/images/nw_maj_hi.gif    | Bin
 .../{doxia => plugins/site}/images/nw_maj_rond.gif  | Bin
 .../maven/{doxia => plugins/site}/images/nw_med.gif | Bin
 .../{doxia => plugins/site}/images/nw_med_hi.gif    | Bin
 .../{doxia => plugins/site}/images/nw_med_rond.gif  | Bin
 .../maven/{doxia => plugins/site}/images/nw_min.gif | Bin
 .../{doxia => plugins/site}/images/nw_min_036.gif   | Bin
 .../{doxia => plugins/site}/images/nw_min_hi.gif    | Bin
 .../maven/{doxia => plugins/site}/images/pdf.gif    | Bin
 .../site}/images/poweredby_036.gif                  | Bin
 .../{doxia => plugins/site}/images/product_logo.gif | Bin
 .../maven/{doxia => plugins/site}/images/remove.gif | Bin
 .../{doxia => plugins/site}/images/se_maj_rond.gif  | Bin
 .../maven/{doxia => plugins/site}/images/strich.gif | Bin
 .../{doxia => plugins/site}/images/sw_maj_rond.gif  | Bin
 .../{doxia => plugins/site}/images/sw_med_rond.gif  | Bin
 .../maven/{doxia => plugins/site}/images/sw_min.gif | Bin
 .../maven/{doxia => plugins/site}/images/update.gif | Bin
 .../maven/{doxia => plugins/site}/maven-site.vm     |   0
 .../maven/{doxia => plugins/site}/resources.txt     |   0
 78 files changed, 7 insertions(+), 7 deletions(-)
 rename maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/{doxia/ScpSiteDeployMojo.java => plugins/site/SiteDeployMojo.java} (99%)
 rename maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/{doxia/DoxiaMojo.java => plugins/site/SiteMojo.java} (99%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/css/maven-base.css (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/css/maven-theme.css (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/css/print.css (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/add.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/collapsed.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/expanded.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/external-classic.png (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/external.png (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/file.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/fix.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/folder-closed.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/folder-open.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/help_logo.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_alert.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_alertsml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowfolder1_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowfolder2_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowfolderclosed1_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowfolderopen2_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowmembers1_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowmembers2_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowusergroups1_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowusergroups2_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowwaste1_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_arrowwaste2_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_confirmsml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_doc_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_doc_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_error_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_error_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_folder_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_folder_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_help_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_help_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_info_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_info_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_infosml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_members_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_members_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_sortdown.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_sortleft.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_sortright.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_sortup.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_success_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_success_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_usergroups_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_usergroups_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_warning_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_warning_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_waste_lrg.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/icon_waste_sml.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/logos/maven-feather.png (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/newwindow-classic.png (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/newwindow.png (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/none.png (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_maj.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_maj_hi.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_maj_rond.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_med.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_med_hi.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_med_rond.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_min.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_min_036.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/nw_min_hi.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/pdf.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/poweredby_036.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/product_logo.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/remove.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/se_maj_rond.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/strich.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/sw_maj_rond.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/sw_med_rond.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/sw_min.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/images/update.gif (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/maven-site.vm (100%)
 rename maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/{doxia => plugins/site}/resources.txt (100%)

diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
similarity index 99%
rename from maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
rename to maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
index cc7b5271c8..a35a3e286f 100644
--- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
+++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia;
+package org.apache.maven.plugins.site;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -48,7 +48,7 @@ import java.util.zip.ZipOutputStream;
  * @version $Id$
  * @goal deploy
  */
-public class ScpSiteDeployMojo
+public class SiteDeployMojo
     extends AbstractMojo
 {
     /**
diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
similarity index 99%
rename from maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
rename to maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
index 2a77990cdb..c3cfed8118 100644
--- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
+++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia;
+package org.apache.maven.plugins.site;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
@@ -61,10 +61,10 @@ import java.util.StringTokenizer;
  * @goal site
  * @requiresDependencyResolution test
  */
-public class DoxiaMojo
+public class SiteMojo
     extends AbstractMojo
 {
-    private static final String RESOURCE_DIR = "org/apache/maven/doxia";
+    private static final String RESOURCE_DIR = "org/apache/maven/plugins/site";
 
     private static final String DEFAULT_TEMPLATE = RESOURCE_DIR + "/maven-site.vm";
 
@@ -211,7 +211,7 @@ public class DoxiaMojo
     {
         if ( templateDirectory == null )
         {
-            siteRenderer.setTemplateClassLoader( DoxiaMojo.class.getClassLoader() );
+            siteRenderer.setTemplateClassLoader( SiteMojo.class.getClassLoader() );
         }
         else
         {
@@ -1052,7 +1052,7 @@ public class DoxiaMojo
      */
     private InputStream getStream( String name )
     {
-        return DoxiaMojo.class.getClassLoader().getResourceAsStream( name );
+        return SiteMojo.class.getClassLoader().getResourceAsStream( name );
     }
 
     /**
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/maven-base.css b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/maven-base.css
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-base.css
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/maven-theme.css b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-theme.css
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/maven-theme.css
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/maven-theme.css
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/print.css b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/print.css
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/css/print.css
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/css/print.css
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/add.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/add.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/add.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/add.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/collapsed.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/collapsed.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/collapsed.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/collapsed.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/expanded.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/expanded.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/expanded.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/expanded.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/external-classic.png b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/external-classic.png
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/external-classic.png
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/external-classic.png
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/external.png b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/external.png
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/external.png
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/external.png
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/file.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/file.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/file.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/file.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/fix.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/fix.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/fix.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/fix.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/folder-closed.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/folder-closed.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/folder-closed.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/folder-closed.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/folder-open.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/folder-open.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/folder-open.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/folder-open.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/help_logo.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/help_logo.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/help_logo.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/help_logo.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_alert.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_alert.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_alert.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_alert.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_alertsml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_alertsml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_alertsml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_alertsml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolder1_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolder1_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolder1_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolder1_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolder2_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolder2_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolder2_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolder2_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolderclosed1_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolderclosed1_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolderclosed1_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolderclosed1_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolderopen2_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolderopen2_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowfolderopen2_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowfolderopen2_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowmembers1_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowmembers1_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowmembers1_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowmembers1_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowmembers2_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowmembers2_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowmembers2_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowmembers2_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowusergroups1_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowusergroups1_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowusergroups1_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowusergroups1_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowusergroups2_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowusergroups2_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowusergroups2_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowusergroups2_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowwaste1_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowwaste1_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowwaste1_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowwaste1_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowwaste2_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowwaste2_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_arrowwaste2_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_arrowwaste2_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_confirmsml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_confirmsml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_confirmsml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_confirmsml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_doc_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_doc_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_doc_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_doc_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_doc_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_doc_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_doc_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_doc_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_error_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_error_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_error_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_error_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_error_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_error_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_error_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_error_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_folder_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_folder_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_folder_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_folder_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_folder_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_folder_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_folder_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_folder_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_help_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_help_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_help_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_help_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_help_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_help_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_help_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_help_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_info_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_info_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_info_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_info_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_info_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_info_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_info_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_info_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_infosml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_infosml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_infosml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_infosml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_members_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_members_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_members_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_members_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_members_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_members_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_members_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_members_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortdown.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortdown.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortdown.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortdown.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortleft.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortleft.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortleft.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortleft.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortright.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortright.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortright.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortright.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortup.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortup.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_sortup.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_sortup.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_success_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_success_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_success_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_success_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_success_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_success_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_success_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_success_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_usergroups_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_usergroups_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_usergroups_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_usergroups_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_usergroups_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_usergroups_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_usergroups_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_usergroups_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_warning_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_warning_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_warning_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_warning_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_warning_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_warning_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_warning_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_warning_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_waste_lrg.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_waste_lrg.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_waste_lrg.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_waste_lrg.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_waste_sml.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_waste_sml.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/icon_waste_sml.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/icon_waste_sml.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/logos/maven-feather.png b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/logos/maven-feather.png
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/logos/maven-feather.png
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/logos/maven-feather.png
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/newwindow-classic.png b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/newwindow-classic.png
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/newwindow-classic.png
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/newwindow-classic.png
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/newwindow.png b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/newwindow.png
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/newwindow.png
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/newwindow.png
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/none.png b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/none.png
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/none.png
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/none.png
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_maj.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_maj.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_maj.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_maj.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_maj_hi.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_maj_hi.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_maj_hi.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_maj_hi.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_maj_rond.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_maj_rond.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_maj_rond.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_maj_rond.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_med.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_med.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_med.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_med.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_med_hi.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_med_hi.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_med_hi.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_med_hi.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_med_rond.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_med_rond.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_med_rond.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_med_rond.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_min.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_min.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_min.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_min.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_min_036.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_min_036.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_min_036.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_min_036.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_min_hi.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_min_hi.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/nw_min_hi.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/nw_min_hi.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/pdf.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/pdf.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/pdf.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/pdf.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/poweredby_036.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/poweredby_036.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/poweredby_036.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/poweredby_036.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/product_logo.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/product_logo.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/product_logo.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/product_logo.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/remove.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/remove.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/remove.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/remove.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/se_maj_rond.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/se_maj_rond.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/se_maj_rond.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/se_maj_rond.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/strich.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/strich.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/strich.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/strich.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/sw_maj_rond.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/sw_maj_rond.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/sw_maj_rond.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/sw_maj_rond.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/sw_med_rond.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/sw_med_rond.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/sw_med_rond.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/sw_med_rond.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/sw_min.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/sw_min.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/sw_min.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/sw_min.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/update.gif b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/update.gif
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/images/update.gif
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/images/update.gif
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/maven-site.vm
diff --git a/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/resources.txt b/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/resources.txt
similarity index 100%
rename from maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/resources.txt
rename to maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/plugins/site/resources.txt