51 files changed, 2 insertions, 8 deletions
diff --git a/archiva-site/pom.xml b/archiva-docs/pom.xml
index 80ee374b2..e504ddbb5 100644
--- a/archiva-site/pom.xml
+++ b/archiva-docs/pom.xml
@@ -24,7 +24,7 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-site</artifactId>
+  <artifactId>archiva-docs</artifactId>
   <packaging>pom</packaging>
   <name>Archiva Documentation</name>
   <url>http://maven.apache.org/archiva/docs/${project.version}/</url>
@@ -68,12 +68,6 @@
       </plugin>
     </plugins>
   </reporting>
-  <!-- prevent automatic artifactId appending -->
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archiva/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archiva/trunk/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/archiva/trunk/</url>
-  </scm>
 
   <distributionManagement>
     <site>
diff --git a/archiva-site/release-readme.txt b/archiva-docs/release-readme.txt
index aceda60fd..aceda60fd 100644
--- a/archiva-site/release-readme.txt
+++ b/archiva-docs/release-readme.txt
diff --git a/archiva-site/src/site/apt/adminguide/configuration-files.apt b/archiva-docs/src/site/apt/adminguide/configuration-files.apt
index 8f9518389..8f9518389 100644
--- a/archiva-site/src/site/apt/adminguide/configuration-files.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration-files.apt
diff --git a/archiva-site/src/site/apt/adminguide/configuration.apt b/archiva-docs/src/site/apt/adminguide/configuration.apt
index 990b1a810..990b1a810 100644
--- a/archiva-site/src/site/apt/adminguide/configuration.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration.apt
diff --git a/archiva-site/src/site/apt/adminguide/consumers.apt b/archiva-docs/src/site/apt/adminguide/consumers.apt
index 20be04b49..20be04b49 100644
--- a/archiva-site/src/site/apt/adminguide/consumers.apt
+++ b/archiva-docs/src/site/apt/adminguide/consumers.apt
diff --git a/archiva-site/src/site/apt/adminguide/databases.apt b/archiva-docs/src/site/apt/adminguide/databases.apt
index b1e001231..b1e001231 100644
--- a/archiva-site/src/site/apt/adminguide/databases.apt
+++ b/archiva-docs/src/site/apt/adminguide/databases.apt
diff --git a/archiva-site/src/site/apt/adminguide/index.apt b/archiva-docs/src/site/apt/adminguide/index.apt
index 9f255f611..9f255f611 100644
--- a/archiva-site/src/site/apt/adminguide/index.apt
+++ b/archiva-docs/src/site/apt/adminguide/index.apt
diff --git a/archiva-site/src/site/apt/adminguide/installing.apt b/archiva-docs/src/site/apt/adminguide/installing.apt
index 4005854f6..4005854f6 100644
--- a/archiva-site/src/site/apt/adminguide/installing.apt
+++ b/archiva-docs/src/site/apt/adminguide/installing.apt
diff --git a/archiva-site/src/site/apt/adminguide/network-proxies.apt b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
index ba04fc4d6..ba04fc4d6 100644
--- a/archiva-site/src/site/apt/adminguide/network-proxies.apt
+++ b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
diff --git a/archiva-site/src/site/apt/adminguide/proxy-connectors.apt b/archiva-docs/src/site/apt/adminguide/proxy-connectors.apt
index 0502b0ed4..0502b0ed4 100644
--- a/archiva-site/src/site/apt/adminguide/proxy-connectors.apt
+++ b/archiva-docs/src/site/apt/adminguide/proxy-connectors.apt
diff --git a/archiva-site/src/site/apt/adminguide/reports.apt b/archiva-docs/src/site/apt/adminguide/reports.apt
index eb95a950b..eb95a950b 100644
--- a/archiva-site/src/site/apt/adminguide/reports.apt
+++ b/archiva-docs/src/site/apt/adminguide/reports.apt
diff --git a/archiva-site/src/site/apt/adminguide/repositories.apt b/archiva-docs/src/site/apt/adminguide/repositories.apt
index 0a8fc33d3..0a8fc33d3 100644
--- a/archiva-site/src/site/apt/adminguide/repositories.apt
+++ b/archiva-docs/src/site/apt/adminguide/repositories.apt
diff --git a/archiva-site/src/site/apt/adminguide/roles.apt b/archiva-docs/src/site/apt/adminguide/roles.apt
index 962303204..962303204 100644
--- a/archiva-site/src/site/apt/adminguide/roles.apt
+++ b/archiva-docs/src/site/apt/adminguide/roles.apt
diff --git a/archiva-site/src/site/apt/adminguide/security.apt b/archiva-docs/src/site/apt/adminguide/security.apt
index 33770e4b0..33770e4b0 100644
--- a/archiva-site/src/site/apt/adminguide/security.apt
+++ b/archiva-docs/src/site/apt/adminguide/security.apt
diff --git a/archiva-site/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index 85ea30a29..85ea30a29 100644
--- a/archiva-site/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
diff --git a/archiva-site/src/site/apt/adminguide/webapp.apt b/archiva-docs/src/site/apt/adminguide/webapp.apt
index 8dc32a6a5..8dc32a6a5 100644
--- a/archiva-site/src/site/apt/adminguide/webapp.apt
+++ b/archiva-docs/src/site/apt/adminguide/webapp.apt
diff --git a/archiva-site/src/site/apt/customising/writing-consumer.apt b/archiva-docs/src/site/apt/customising/writing-consumer.apt
index e61e95666..e61e95666 100644
--- a/archiva-site/src/site/apt/customising/writing-consumer.apt
+++ b/archiva-docs/src/site/apt/customising/writing-consumer.apt
diff --git a/archiva-site/src/site/apt/guides/configuration.apt b/archiva-docs/src/site/apt/guides/configuration.apt
index c307dff93..c307dff93 100644
--- a/archiva-site/src/site/apt/guides/configuration.apt
+++ b/archiva-docs/src/site/apt/guides/configuration.apt
diff --git a/archiva-site/src/site/apt/guides/getting-started.apt b/archiva-docs/src/site/apt/guides/getting-started.apt
index f8d6c42b6..f8d6c42b6 100644
--- a/archiva-site/src/site/apt/guides/getting-started.apt
+++ b/archiva-docs/src/site/apt/guides/getting-started.apt
diff --git a/archiva-site/src/site/apt/guides/maven-configuration.apt b/archiva-docs/src/site/apt/guides/maven-configuration.apt
index 26fb1447a..26fb1447a 100644
--- a/archiva-site/src/site/apt/guides/maven-configuration.apt
+++ b/archiva-docs/src/site/apt/guides/maven-configuration.apt
diff --git a/archiva-site/src/site/apt/guides/security-configuration.apt b/archiva-docs/src/site/apt/guides/security-configuration.apt
index 2263cb409..2263cb409 100644
--- a/archiva-site/src/site/apt/guides/security-configuration.apt
+++ b/archiva-docs/src/site/apt/guides/security-configuration.apt
diff --git a/archiva-site/src/site/apt/index.apt b/archiva-docs/src/site/apt/index.apt
index d5fbd1f7e..d5fbd1f7e 100644
--- a/archiva-site/src/site/apt/index.apt
+++ b/archiva-docs/src/site/apt/index.apt
diff --git a/archiva-site/src/site/apt/quick-start.apt b/archiva-docs/src/site/apt/quick-start.apt
index c50b40b29..c50b40b29 100644
--- a/archiva-site/src/site/apt/quick-start.apt
+++ b/archiva-docs/src/site/apt/quick-start.apt
diff --git a/archiva-site/src/site/apt/userguide/browsing.apt b/archiva-docs/src/site/apt/userguide/browsing.apt
index e73c11d6d..e73c11d6d 100644
--- a/archiva-site/src/site/apt/userguide/browsing.apt
+++ b/archiva-docs/src/site/apt/userguide/browsing.apt
diff --git a/archiva-site/src/site/apt/userguide/deploy.apt b/archiva-docs/src/site/apt/userguide/deploy.apt
index 30fbbdb48..30fbbdb48 100644
--- a/archiva-site/src/site/apt/userguide/deploy.apt
+++ b/archiva-docs/src/site/apt/userguide/deploy.apt
diff --git a/archiva-site/src/site/apt/userguide/find-artifact.apt b/archiva-docs/src/site/apt/userguide/find-artifact.apt
index 132636716..132636716 100644
--- a/archiva-site/src/site/apt/userguide/find-artifact.apt
+++ b/archiva-docs/src/site/apt/userguide/find-artifact.apt
diff --git a/archiva-site/src/site/apt/userguide/index.apt b/archiva-docs/src/site/apt/userguide/index.apt
index 58ef923d2..58ef923d2 100644
--- a/archiva-site/src/site/apt/userguide/index.apt
+++ b/archiva-docs/src/site/apt/userguide/index.apt
diff --git a/archiva-site/src/site/apt/userguide/searching.apt b/archiva-docs/src/site/apt/userguide/searching.apt
index dd1cf04ed..dd1cf04ed 100644
--- a/archiva-site/src/site/apt/userguide/searching.apt
+++ b/archiva-docs/src/site/apt/userguide/searching.apt
diff --git a/archiva-site/src/site/apt/userguide/using-repository.apt b/archiva-docs/src/site/apt/userguide/using-repository.apt
index 0fff28b49..0fff28b49 100644
--- a/archiva-site/src/site/apt/userguide/using-repository.apt
+++ b/archiva-docs/src/site/apt/userguide/using-repository.apt
diff --git a/archiva-site/src/site/assembly/docs.xml b/archiva-docs/src/site/assembly/docs.xml
index e19dfb70a..e19dfb70a 100644
--- a/archiva-site/src/site/assembly/docs.xml
+++ b/archiva-docs/src/site/assembly/docs.xml
diff --git a/archiva-site/src/site/resources/css/site.css b/archiva-docs/src/site/resources/css/site.css
index 3ca753781..3ca753781 100755
--- a/archiva-site/src/site/resources/css/site.css
+++ b/archiva-docs/src/site/resources/css/site.css
diff --git a/archiva-site/src/site/resources/images/archiva-report.jpg b/archiva-docs/src/site/resources/images/archiva-report.jpg
index fce00e828..fce00e828 100644
--- a/archiva-site/src/site/resources/images/archiva-report.jpg
+++ b/archiva-docs/src/site/resources/images/archiva-report.jpg
diff --git a/archiva-site/src/site/resources/images/graph-multimodule.dot b/archiva-docs/src/site/resources/images/graph-multimodule.dot
index 759dab34e..759dab34e 100644
--- a/archiva-site/src/site/resources/images/graph-multimodule.dot
+++ b/archiva-docs/src/site/resources/images/graph-multimodule.dot
diff --git a/archiva-site/src/site/resources/images/graph-multimodule.png b/archiva-docs/src/site/resources/images/graph-multimodule.png
index a7450d1c7..a7450d1c7 100644
--- a/archiva-site/src/site/resources/images/graph-multimodule.png
+++ b/archiva-docs/src/site/resources/images/graph-multimodule.png
diff --git a/archiva-site/src/site/resources/images/scheduling.svg b/archiva-docs/src/site/resources/images/scheduling.svg
index 7e255690b..7e255690b 100755
--- a/archiva-site/src/site/resources/images/scheduling.svg
+++ b/archiva-docs/src/site/resources/images/scheduling.svg
diff --git a/archiva-site/src/site/resources/images/tour/admin.png b/archiva-docs/src/site/resources/images/tour/admin.png
index 8523f32ef..8523f32ef 100644
--- a/archiva-site/src/site/resources/images/tour/admin.png
+++ b/archiva-docs/src/site/resources/images/tour/admin.png
diff --git a/archiva-site/src/site/resources/images/tour/project.png b/archiva-docs/src/site/resources/images/tour/project.png
index 025217782..025217782 100644
--- a/archiva-site/src/site/resources/images/tour/project.png
+++ b/archiva-docs/src/site/resources/images/tour/project.png
diff --git a/archiva-site/src/site/resources/images/tour/proxy.png b/archiva-docs/src/site/resources/images/tour/proxy.png
index 7a4ee1305..7a4ee1305 100644
--- a/archiva-site/src/site/resources/images/tour/proxy.png
+++ b/archiva-docs/src/site/resources/images/tour/proxy.png
diff --git a/archiva-site/src/site/resources/images/tour/reports.png b/archiva-docs/src/site/resources/images/tour/reports.png
index 29b7d926b..29b7d926b 100644
--- a/archiva-site/src/site/resources/images/tour/reports.png
+++ b/archiva-docs/src/site/resources/images/tour/reports.png
diff --git a/archiva-site/src/site/resources/images/tour/search.png b/archiva-docs/src/site/resources/images/tour/search.png
index a6bba9393..a6bba9393 100644
--- a/archiva-site/src/site/resources/images/tour/search.png
+++ b/archiva-docs/src/site/resources/images/tour/search.png
diff --git a/archiva-site/src/site/resources/images/tour/security.png b/archiva-docs/src/site/resources/images/tour/security.png
index 02c5af2be..02c5af2be 100644
--- a/archiva-site/src/site/resources/images/tour/security.png
+++ b/archiva-docs/src/site/resources/images/tour/security.png
diff --git a/archiva-site/src/site/site.xml b/archiva-docs/src/site/site.xml
index aad0f544e..aad0f544e 100644
--- a/archiva-site/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
diff --git a/archiva-site/src/site/xdoc/hacking/index.xml b/archiva-docs/src/site/xdoc/hacking/index.xml
index 75df98742..75df98742 100644
--- a/archiva-site/src/site/xdoc/hacking/index.xml
+++ b/archiva-docs/src/site/xdoc/hacking/index.xml
diff --git a/archiva-site/src/site/xdoc/tour/admin.xml b/archiva-docs/src/site/xdoc/tour/admin.xml
index 610618e6e..610618e6e 100644
--- a/archiva-site/src/site/xdoc/tour/admin.xml
+++ b/archiva-docs/src/site/xdoc/tour/admin.xml
diff --git a/archiva-site/src/site/xdoc/tour/index.xml b/archiva-docs/src/site/xdoc/tour/index.xml
index 45b222989..45b222989 100644
--- a/archiva-site/src/site/xdoc/tour/index.xml
+++ b/archiva-docs/src/site/xdoc/tour/index.xml
diff --git a/archiva-site/src/site/xdoc/tour/project.xml b/archiva-docs/src/site/xdoc/tour/project.xml
index 00300b489..00300b489 100644
--- a/archiva-site/src/site/xdoc/tour/project.xml
+++ b/archiva-docs/src/site/xdoc/tour/project.xml
diff --git a/archiva-site/src/site/xdoc/tour/proxy.xml b/archiva-docs/src/site/xdoc/tour/proxy.xml
index 9e1073b38..9e1073b38 100644
--- a/archiva-site/src/site/xdoc/tour/proxy.xml
+++ b/archiva-docs/src/site/xdoc/tour/proxy.xml
diff --git a/archiva-site/src/site/xdoc/tour/reports.xml b/archiva-docs/src/site/xdoc/tour/reports.xml
index 99800a5e8..99800a5e8 100644
--- a/archiva-site/src/site/xdoc/tour/reports.xml
+++ b/archiva-docs/src/site/xdoc/tour/reports.xml
diff --git a/archiva-site/src/site/xdoc/tour/search.xml b/archiva-docs/src/site/xdoc/tour/search.xml
index e144873e9..e144873e9 100644
--- a/archiva-site/src/site/xdoc/tour/search.xml
+++ b/archiva-docs/src/site/xdoc/tour/search.xml
diff --git a/archiva-site/src/site/xdoc/tour/security.xml b/archiva-docs/src/site/xdoc/tour/security.xml
index 1e49c9fa9..1e49c9fa9 100644
--- a/archiva-site/src/site/xdoc/tour/security.xml
+++ b/archiva-docs/src/site/xdoc/tour/security.xml
diff --git a/pom.xml b/pom.xml
index c644b93f6..40bebca4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
     <module>archiva-scheduled</module>
     <module>archiva-web</module>
     <module>archiva-cli</module>
-    <module>archiva-site</module>
+    <module>archiva-docs</module>
   </modules>
   <dependencies>
     <dependency>