From 29b0fcbf82934c02195e934e510a63e87e7eba9f Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Mon, 19 Nov 2007 02:27:56 +0000
Subject: [PATCH] moving towards the new site

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@596181 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-base/archiva-transaction/pom.xml      |   4 +
 archiva-site/pom.xml                          |  29 +++++--
 archiva-site/src/site/apt/download.apt        |  71 ---------------
 archiva-site/src/site/assembly/docs.xml       |  33 +++++++
 .../resources/images/archiva-logo-banner.jpg  | Bin 19782 -> 0 bytes
 archiva-site/src/site/site.xml                |  30 ++-----
 archiva-site/src/site/xdoc/index.xml          |  81 ++++--------------
 pom.xml                                       |  36 +++-----
 src/site/site.xml                             |  31 +++++++
 9 files changed, 124 insertions(+), 191 deletions(-)
 delete mode 100644 archiva-site/src/site/apt/download.apt
 create mode 100644 archiva-site/src/site/assembly/docs.xml
 delete mode 100644 archiva-site/src/site/resources/images/archiva-logo-banner.jpg
 create mode 100644 src/site/site.xml

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 61aff60a2f71e6fd9a534d32b05d2cd8a5e4b458..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19782
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

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
@@ -22,20 +22,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <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>
-- 
2.39.5