moving towards the new site

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

9 files changed, 124 insertions, 191 deletions

diff --git a/archiva-base/archiva-transaction/pom.xml b/archiva-base/archiva-transaction/pom.xml
index 24086580e..d64fd20f9 100644
--- a/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-base/archiva-transaction/pom.xml
@@ -41,5 +41,9 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/archiva-site/pom.xml b/archiva-site/pom.xml
index b1f3ded32..80ee374b2 100644
--- a/archiva-site/pom.xml
+++ b/archiva-site/pom.xml
@@ -27,6 +27,28 @@
   <artifactId>archiva-site</artifactId>
   <packaging>pom</packaging>
   <name>Archiva Documentation</name>
+  <url>http://maven.apache.org/archiva/docs/${project.version}/</url>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <descriptor>src/site/assembly/docs.xml</descriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <finalName>apache-archiva-${project.version}</finalName>
+  </build>
 
   <reporting>
     <excludeDefaults>true</excludeDefaults>
@@ -40,7 +62,6 @@
             <reports>
               <report>license</report>
               <report>project-team</report>
-              <report>scm</report>
             </reports>
           </reportSet>
         </reportSets>
@@ -57,11 +78,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <!-- prevent automatic artifactId appending -->
-<!-- TODO: we haven't switched yet, and we need .htaccess in place for current docs first too
-      <url>scp://people.apache.org/www/maven.apache.org/archiva/docs/${project.version}</url>
- -->
-      <url>scp://people.apache.org/www/maven.apache.org/archiva/</url>
+      <url>${siteBaseDeployment}/docs/${project.version}</url>
     </site>
   </distributionManagement>
 </project>
diff --git a/archiva-site/src/site/apt/download.apt b/archiva-site/src/site/apt/download.apt
deleted file mode 100644
index 526e487fa..000000000
--- a/archiva-site/src/site/apt/download.apt
+++ /dev/null
@@ -1,71 +0,0 @@
- ------
- Download
- ------
-
-Download Archiva
-
-  Archiva is distributed under the {{{http://maven.apache.org/archiva/license.html} Apache License, version 2.0}}.
-
-  You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24
-  hours to reach all mirrors.
-
-* Archiva 1.0 Beta 4
-
-  This version is considered an early beta release of the database backed, scalable, and stability improved archiva.
-  
-  (See {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&&pid=10980&resolution=-1&sorter/field=priority&sorter/order=DESC} full list of issues}} for details)
-
-*-------------------------------+---------+----------+-----------+
-|                               | Mirrors | Checksum | Signature |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.0-beta-4 (bin.tar.gz)     | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-archiva-1.0-beta-4-bin.tar.gz} apache-archiva-1.0-beta-4-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/apache-archiva-1.0-beta-4-bin.tar.gz.md5} apache-archiva-1.0-beta-4-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/apache-archiva-1.0-beta-4-bin.tar.gz.asc} apache-archiva-1.0-beta-4-bin.tar.gz.asc}} |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.0-beta-4 (src)     | {{{http://www.apache.org/dyn/closer.cgi/maven/source/apache-archiva-1.0-beta-4-src.zip} apache-archiva-1.0-beta-4-src.zip}} | {{{http://www.apache.org/dist/maven/source/apache-archiva-1.0-beta-4-src.zip.md5} apache-archiva-1.0-beta-4-src.zip.md5}} | {{{http://www.apache.org/dist/maven/source/apache-archiva-1.0-beta-4-src.zip.asc} apache-archiva-1.0-beta-4-src.zip.asc}} |
-*-------------------------------+---------+----------+-----------+
-
-* Archiva 0.9 Alpha 2
-
-  This version is considered a proof of concept, useful for demonstration purposes, small repositories, and low user
-  counts.  We look forward to significant scalability and stability improvements coming soon in Archiva 1.0.
-
-*-------------------------------+---------+----------+-----------+
-|                               | Mirrors | Checksum | Signature |
-*-------------------------------+---------+----------+-----------+
-| Archiva 0.9-alpha-2 (bin)     | {{{http://www.apache.org/dyn/closer.cgi/maven/binaries/archiva-0.9-alpha-2-bin.tar.gz} archiva-0.9-alpha-2-bin.tar.gz}} | {{{http://www.apache.org/dist/maven/binaries/archiva-0.9-alpha-2-bin.tar.gz.md5} archiva-0.9-alpha-2-bin.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/binaries/archiva-0.9-alpha-2-bin.tar.gz.asc} archiva-0.9-alpha-2-bin.tar.gz.asc}} |
-*-------------------------------+---------+----------+-----------+
-| Archiva 0.9-alpha-2 (src)     | {{{http://www.apache.org/dyn/closer.cgi/maven/source/archiva-0.9-alpha-2-src.tar.gz} archiva-0.9-alpha-2-src.tar.gz}} | {{{http://www.apache.org/dist/maven/source/archiva-0.9-alpha-2-src.tar.gz.md5} archiva-0.9-alpha-2-src.tar.gz.md5}} | {{{http://www.apache.org/dist/maven/source/archiva-0.9-alpha-2-src.tar.gz.asc} archiva-0.9-alpha-2-src.tar.gz.asc}} |
-*-------------------------------+---------+----------+-----------+
-
-* System {Requirements}
-
-*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-|  <<JDK>>             | 1.4 or above                                                                                                                   |
-*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-| <<Memory>>           | No minimum requirement                                                                                                         |
-*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-| <<Disk>>             | The Archiva application is in itself about 20MB but will use more disk space to store repository contents |
-*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-| <<Operating System>> | Support for Linux, Mac OS, Solaris and Windows.  Tested on Windows XP SP2, Ubuntu Linux, and Mac OS X. |
-*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-
-* {Installation} Instructions
-
- The installation of Archiva consists solely of unpacking the archive in the desired directory. It's that simple!
-
-** NOTE: If you have installed archiva-0.9, backup your $HOME/.m2/archiva.xml file.
-
- For example:
-
-+------+
- tar -xzvf archiva-1.0-beta-4-bin.tar.gz
-+------+
-
- To start the app, use the appropriate platform-specific startup script found under the "bin" directory of your
- installation.  If your platform is not included, use the plexus.bat script found in the "bin" directory.
-
- For example:
-
-+------+
- cd archiva-1.0-beta-4/bin/linux-x86-32
- ./run.sh start
-+------+
diff --git a/archiva-site/src/site/assembly/docs.xml b/archiva-site/src/site/assembly/docs.xml
new file mode 100644
index 000000000..e19dfb70a
--- /dev/null
+++ b/archiva-site/src/site/assembly/docs.xml
@@ -0,0 +1,33 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly>
+  <id>docs</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>/docs/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
+
diff --git a/archiva-site/src/site/resources/images/archiva-logo-banner.jpg b/archiva-site/src/site/resources/images/archiva-logo-banner.jpg
deleted file mode 100644
index 61aff60a2..000000000
--- a/archiva-site/src/site/resources/images/archiva-logo-banner.jpg
+++ /dev/null
diff --git a/archiva-site/src/site/site.xml b/archiva-site/src/site/site.xml
index 44c6b2233..1e4f26323 100644
--- a/archiva-site/src/site/site.xml
+++ b/archiva-site/src/site/site.xml
@@ -20,11 +20,12 @@
 
 <project>
   <body>
-    <links>
-      <item name="Apache"     href="http://www.apache.org/"/>
-      <item name="Maven"      href="http://maven.apache.org/"/>
-      <item name="Continuum"  href="http://maven.apache.org/continuum/"/>
-    </links>
+    <breadcrumbs>
+      <item name="1.0-SNAPSHOT" href="/docs/1.0-SNAPSHOT/" />
+<!-- TODO in beta-6
+      <item name="${project.version}" href="/docs/${project.version}" />
+-->
+    </breadcrumbs>
 
     <menu name="Introduction">
       <item name="Welcome"      href="/index.html" />
@@ -101,24 +102,5 @@
       <item name="Other Configuration" href="/guides/configuration.html"/>
       <item name="Hacking Archiva" href="/hacking/index.html"/>
     </menu>
-
-    <!--
-    Current generated reports are always empty when executed in archiva-site
-    Prefer to add useful generated reports to sections above.
-    <menu ref="reports" inherit="bottom"/>
-      -->
   </body>
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-stylus-skin</artifactId>
-  </skin>
-  <publishDate format="dd MMM yyyy"/>
-  <bannerLeft>
-    <name>Apache Maven</name>
-    <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
-    <href>http://maven.apache.org/</href>
-  </bannerLeft>
-  <bannerRight>
-    <src>images/archiva-logo-banner.jpg</src>
-  </bannerRight>
 </project>
diff --git a/archiva-site/src/site/xdoc/index.xml b/archiva-site/src/site/xdoc/index.xml
index 7ecc10cc7..89ac53f57 100644
--- a/archiva-site/src/site/xdoc/index.xml
+++ b/archiva-site/src/site/xdoc/index.xml
@@ -23,50 +23,26 @@
     <title>Welcome to Maven Archiva</title>
   </properties>
   <body>
-    <div id="downloadbox">
-      <h5>Get Archiva 1.0 Beta 4</h5>
+    <section name="Welcome to Maven Archiva">
+<!-- TODO: convert back to APT -->
       <p>
-        <a href="download.html">
-          <img valign="top" src="http://maven.apache.org/images/folder-open.gif" border="0" alt="" title="download"/>
-          Download
-        </a>
-        Archiva
-        <small>(23MB)</small>
+         Archiva is a build artifact repository manager for use with
+         build tools such as <a href="http://maven.apache.org">Maven</a>,
+         <a href="http://maven.apache.org/continuum/">Continuum</a>,
+         and <a href="http://ant.apache.org/">ANT</a>.
       </p>
-      <ul>
-        <li>
-          <a href="download.html#requirements">System Requirements</a>
-        </li>
-        <li>
-          <a href="download.html#installation">Installation Instructions</a>
-        </li>
-        <li>        
-          <a href="http://jira.codehaus.org/secure/ReleaseNote.jspa?version=13818&amp;styleName=Text&amp;projectId=10980&amp;Create=Create">Release Notes</a>
-        </li>
-        <!--
-        <li>
-          <a href="guides/getting-started/index.html">Getting Started</a>
-        </li>
-        <li>
-          <a href="guides/index.html">Documentation</a>
-        </li>
-        -->
-      </ul>
-    </div>
 
-    <section name="Welcome to Maven Archiva">
-      <div class="p">
-         Archiva is currently under development.</div>
+      <p>
+        With Archiva, you can share artifacts with other developers and manage the associated
+        security required, aggregate (proxy) content from remote artifact repositories, visualise
+        your artifact utilisation with search, browse and reporting, and perform routine
+        maintenance on your repositories.
+      </p>
 
-      <div class="p">
-         Archiva is a build artifact repository manager for use with
-         build tools such as <a href="http://maven.apache.org">maven</a>,
-         <a href="http://maven.apache.org/continuum/">continuum</a>,
-         and <a href="http://ant.apache.org/">ant</a>.</div>
+<!-- TODO: link to other content - quick start, guides, etc -->
 
-      <div class="p">
-         It provides the following benefits:</div>
 
+<!-- TODO: move to the feature tour
       <ul>
         <li>A place for like-minded developers to share artifacts
             that are private in nature, such as found in proprietary
@@ -89,34 +65,10 @@
         <li>Reporting tools.</li>
         <li>Maintenance tools.</li>
       </ul>
+-->
     </section>
 
-    <section name="Latest News">
-      <p>
-        <ul>
-          <li>Archiva 1.0 Beta 4 Release Available - November 13, 2007</li>
-        </ul>
-        <ul>
-          <li>Archiva 1.0 Beta 3 Release Available - November 1, 2007</li>
-        </ul>
-        <ul>
-          <li>Archiva 1.0 Beta 2 Release Available - September 22, 2007</li>
-        </ul>
-        <ul>
-          <li>Archiva 1.0 Beta 1 Release Available - August 10, 2007</li>
-        </ul>
-        <ul>
-          <li>Archiva 1.0 Alpha 2 Release Available - June 29, 2007</li>
-        </ul>
-        <ul>
-          <li>Archiva 1.0 Alpha 1 Release Available - June 5, 2007</li>
-        </ul>
-        <ul>
-          <li>Archiva 0.9 Alpha 2 Release Available - May 18, 2007</li>
-        </ul>
-      </p>
-    </section>
-
+<!-- TODO: move
     <section name="Need Help?">
       <p>Join the conversation!</p>
       <ul>
@@ -159,5 +111,6 @@
          Archiva wiki</a>.
       </div>
     </section>
+-->
   </body>
 </document>
diff --git a/pom.xml b/pom.xml
index 43193ea7e..c644b93f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,19 +23,11 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>5</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
-  </parent>
-  <!-- TODO: once agreed/released, put this in place
-  <parent>
     <groupId>org.apache.maven.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
     <version>1-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
--->
   <name>Archiva</name>
   <artifactId>archiva</artifactId>
   <packaging>pom</packaging>
@@ -53,7 +45,7 @@
     repositories, including administration, artifact handling,
     browsing and searching.
   </description>
-  <url>http://maven.apache.org/archiva</url>
+  <url>http://maven.apache.org/archiva/</url>
   <issueManagement>
     <system>jira</system>
     <url>http://jira.codehaus.org/browse/MRM</url>
@@ -739,11 +731,13 @@
           <configLocation>config/maven_checks.xml</configLocation>
         </configuration>
       </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>findbugs-maven-plugin</artifactId>
-          <version>1.1.1</version>
-        </plugin>
+<!-- TODO: OOME
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>1.1.1</version>
+      </plugin>
+-->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>changelog-maven-plugin</artifactId>
@@ -862,12 +856,6 @@
           </plugin>
         </plugins>
       </build>
-      <distributionManagement>
-        <site>
-          <id>apache.website</id>
-          <url>scpexe://people.apache.org/www/maven.apache.org/archiva/reports/</url>
-        </site>
-      </distributionManagement>
     </profile>
     <profile>
       <id>release</id>
@@ -888,7 +876,7 @@
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
               <appendAssemblyId>false</appendAssemblyId>
-              <finalName>apache-archiva-${version}-src</finalName>
+              <finalName>apache-archiva-${project.version}-src</finalName>
             </configuration>
             <executions>
               <execution>
@@ -910,13 +898,9 @@
     <redback.version>1.0-alpha-4</redback.version>
   </properties>
   <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <url>scpexe://people.apache.org/www/people.apache.org/builds/maven/archiva/${version}/m2-staging-repository</url>
-    </repository>
     <site>
       <id>apache.website</id>
-      <url>scpexe://people.apache.org/www/maven.apache.org/archiva/docs/${project.version}</url>
+      <url>${siteBaseDeployment}/reports/</url>
     </site>
   </distributionManagement>
 </project>
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 000000000..8f7ecf05d
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project>
+  <body>
+    <breadcrumbs>
+<!-- TODO: need to stop them inheriting 
+      <item name="Reports" href="/reports" />
+-->
+    </breadcrumbs>
+
+    <menu ref="modules" />
+  </body>
+</project>