Author: brett
Date: Sun Nov 18 21:07:44 2007
New Revision: 596203
URL: http://svn.apache.org/viewvc?rev=596203&view=rev
Log:
rationalise the navigation based on my email to archiva-dev@
Added:
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration-files.apt
- copied, changed from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/webapp.apt
- copied, changed from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/tomcat.apt
maven/archiva/trunk/archiva-site/src/site/apt/customising/
maven/archiva/trunk/archiva-site/src/site/apt/customising/writing-consumer.apt
maven/archiva/trunk/archiva-site/src/site/apt/quick-start.apt
- copied unchanged from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/quickstart.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy.apt
- copied, changed from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-maven2.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/find-artifact.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-repository.apt
- copied, changed from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-maven2.apt
Removed:
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/derby.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/geronimo.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/jetty.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/mysql.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/postgres.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/quickstart.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/repository-sync.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/tomcat.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/webdav.apt
maven/archiva/trunk/archiva-site/src/site/apt/repository-sync.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-ant.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-maven1.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-maven2.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-ivy.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-maven1.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-maven2.apt
maven/archiva/trunk/archiva-site/src/site/apt/userguide/webdav.apt
Modified:
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/databases.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/installing.apt
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/standalone.apt
maven/archiva/trunk/archiva-site/src/site/site.xml
maven/archiva/trunk/archiva-site/src/site/xdoc/index.xml
Copied:
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration-files.apt
(from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration.apt)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration-files.apt?p2=maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration-files.apt&p1=maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration.apt&r1=596188&r2=596203&rev=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration.apt
(original)
+++
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/configuration-files.apt
Sun Nov 18 21:07:44 2007
@@ -1,8 +1,8 @@
------
- Runtime Configuration of Apache Archiva
+ Configuration Files of Apache Archiva
------
-Runtime Configuration of Apache Archiva
+Configuration Files of Apache Archiva
:STUB: This is a documentation stub.
Modified: maven/archiva/trunk/archiva-site/src/site/apt/adminguide/databases.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/adminguide/databases.apt?rev=596203&r1=596202&r2=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/adminguide/databases.apt
(original)
+++ maven/archiva/trunk/archiva-site/src/site/apt/adminguide/databases.apt Sun
Nov 18 21:07:44 2007
@@ -6,3 +6,6 @@
:STUB: This is a documentation stub.
+~~TODO: give general information on configuration for an external database
+~~TODO: use mysql or external derby as an example
+~~TODO: link to wiki location that does others
Modified:
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/installing.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/adminguide/installing.apt?rev=596203&r1=596202&r2=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/adminguide/installing.apt
(original)
+++ maven/archiva/trunk/archiva-site/src/site/apt/adminguide/installing.apt Sun
Nov 18 21:07:44 2007
@@ -6,3 +6,4 @@
:STUB: This is a documentation stub.
+~~TODO: ensure upgrading is covered - does it need to be a separate doc
Modified:
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/standalone.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/adminguide/standalone.apt?rev=596203&r1=596202&r2=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/adminguide/standalone.apt
(original)
+++ maven/archiva/trunk/archiva-site/src/site/apt/adminguide/standalone.apt Sun
Nov 18 21:07:44 2007
@@ -6,3 +6,6 @@
:STUB: This is a documentation stub.
+~~TODO: link to quick start as it covers the most basic scenario
+~~TODO: ensure to refer to advanced configuration options, such as PLEXUS_BASE
+
Copied: maven/archiva/trunk/archiva-site/src/site/apt/adminguide/webapp.apt
(from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/adminguide/tomcat.apt)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/adminguide/webapp.apt?p2=maven/archiva/trunk/archiva-site/src/site/apt/adminguide/webapp.apt&p1=maven/archiva/trunk/archiva-site/src/site/apt/adminguide/tomcat.apt&r1=596188&r2=596203&rev=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/adminguide/tomcat.apt
(original)
+++ maven/archiva/trunk/archiva-site/src/site/apt/adminguide/webapp.apt Sun Nov
18 21:07:44 2007
@@ -1,8 +1,11 @@
------
- Installing Apache Archiva on Tomcat
+ Installing Apache Archiva as a Web Application
------
-Installing Apache Archiva on Tomcat
+Installing Apache Archiva as a Web Application
:STUB: This is a documentation stub.
+
+~~TODO: show example using Tomcat 6.
+~~TODO: link to wiki location for other application servers
Added:
maven/archiva/trunk/archiva-site/src/site/apt/customising/writing-consumer.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/customising/writing-consumer.apt?rev=596203&view=auto
==============================================================================
---
maven/archiva/trunk/archiva-site/src/site/apt/customising/writing-consumer.apt
(added)
+++
maven/archiva/trunk/archiva-site/src/site/apt/customising/writing-consumer.apt
Sun Nov 18 21:07:44 2007
@@ -0,0 +1,8 @@
+ ------
+ Writing a Custom Repository Consumer
+ ------
+
+Writing a Custom Repository Consumer
+
+ :STUB: This is a documentation stub.
+
Copied: maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy.apt
(from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-maven2.apt)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy.apt?p2=maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy.apt&p1=maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-maven2.apt&r1=596188&r2=596203&rev=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy-maven2.apt
(original)
+++ maven/archiva/trunk/archiva-site/src/site/apt/userguide/deploy.apt Sun Nov
18 21:07:44 2007
@@ -1,8 +1,8 @@
------
- Deploying to Repository using Maven 2
+ Deploying to Repository
------
-Deploying to Repository using Maven 2
+Deploying to Repository
:STUB: This is a documentation stub.
Added: maven/archiva/trunk/archiva-site/src/site/apt/userguide/find-artifact.apt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/userguide/find-artifact.apt?rev=596203&view=auto
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/userguide/find-artifact.apt
(added)
+++ maven/archiva/trunk/archiva-site/src/site/apt/userguide/find-artifact.apt
Sun Nov 18 21:07:44 2007
@@ -0,0 +1,8 @@
+ ------
+ Identifying an Artifact
+ ------
+
+Identifying an Artifact
+
+ :STUB: This is a documentation stub.
+
Copied:
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-repository.apt
(from r596188,
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-maven2.apt)
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-repository.apt?p2=maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-repository.apt&p1=maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-maven2.apt&r1=596188&r2=596203&rev=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-maven2.apt
(original)
+++
maven/archiva/trunk/archiva-site/src/site/apt/userguide/using-repository.apt
Sun Nov 18 21:07:44 2007
@@ -1,8 +1,8 @@
------
- Using Repository as a Apache Maven 2 Repository
+ Using as a Repository
------
-Using Repository as a Apache Maven 2 Repository
+Using as a Repository
:STUB: This is a documentation stub.
Modified: maven/archiva/trunk/archiva-site/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/site.xml?rev=596203&r1=596202&r2=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/site.xml (original)
+++ maven/archiva/trunk/archiva-site/src/site/site.xml Sun Nov 18 21:07:44 2007
@@ -28,69 +28,41 @@
</breadcrumbs>
<menu name="Introduction">
- <item name="Welcome" href="/index.html" />
- <item name="License" href="/license.html" /> <!-- Generated -->
- <item name="Download" href="/download.html" />
- <item name="Quick Start" href="/adminguide/quickstart.html" />
+ <item name="Quick Start" href="/quick-start.html" />
+ <item name="Feature Tour" href="/tour/index.html" />
</menu>
<menu name="Users Guide">
<item name="Browsing" href="/userguide/browsing.html" />
<item name="Searching" href="/userguide/searching.html"
/>
- <item name="WebDAV Features" href="/userguide/webdav.html" />
- <item name="Using Repository ..." collapse="false">
- <item name="As a Maven 2 repository"
href="/userguide/using-maven2.html" />
- <item name="As a Maven 1 repository"
href="/userguide/using-maven1.html" />
- <item name="As an Ivy repository" href="/userguide/using-ivy.html"
/>
- </item>
- <item name="Deploying to Repository" collapse="false">
- <item name="Using Maven 2"
href="/userguide/deploy-maven2.html" />
- <item name="Using Maven 1"
href="/userguide/deploy-maven1.html" />
- <item name="Using Ant" href="/userguide/deploy-ant.html"
/>
- </item>
+ <item name="Identifying an Artifact"
href="/userguide/find-artifact.html" />
+ <item name="Using as a repository"
href="/userguide/using-repository.html" />
+ <item name="Deploying to repository" href="/userguide/deploy.html" />
</menu>
- <menu name="System Admin Guide">
+ <menu name="Administrators Guide">
<item name="Structure of Archiva" href="/adminguide/structure.html"
/>
- <item name="Installing"
href="/adminguide/installing.html" collapse="false">
+ <item name="Installing"
href="/adminguide/installing.html" collapse="true">
<item name="Installing Standalone"
href="/adminguide/standalone.html" />
- <item name="Installing on Jetty" href="/adminguide/jetty.html" />
- <item name="Installing on Tomcat" href="/adminguide/tomcat.html" />
- <item name="Installing on Geronimo" href="/adminguide/geronimo.html"
/>
+ <item name="Installing as a WAR" href="/adminguide/webapp.html" />
</item>
- <item name="Databases" href="/adminguide/databases.html"
collapse="false">
- <item name="Embedded Derby DB" href="/adminguide/derby.html" />
- <item name="External MySQL" href="/adminguide/mysql.html" />
- <item name="External PostgreSQL" href="/adminguide/postgres.html"
/>
- </item>
- <item name="Security" href="/adminguide/security.html"
collapse="false">
+ <item name="Databases" href="/adminguide/databases.html"
/>
+ <item name="Security" href="/adminguide/security.html"
collapse="true">
<item name="Roles" href="/adminguide/roles.html" />
<item name="Using LDAP" href="/adminguide/ldap.html" />
</item>
- <item name="Runtime Configuration"
href="/adminguide/configuration.html" collapse="false">
+ <item name="Runtime Configuration"
href="/adminguide/configuration.html" collapse="true">
<item name="Repositories"
href="/adminguide/repositories.html" />
<item name="Proxy Connectors"
href="/adminguide/proxy-connectors.html" />
<item name="Network Proxies"
href="/adminguide/network-proxies.html" />
<item name="Consumers" href="/adminguide/consumers.html"
/>
</item>
+ <item name="Configuration Files"
href="/adminguide/configuration-files.html" />
<item name="Reports" href="/adminguide/reports.html" />
- <item name="WebDAV Server" href="/adminguide/webdav.html" />
- <item name="Repository Synch"
href="/adminguide/repository-sync.html" />
</menu>
- <menu name="Reference">
- <item name="FAQ"
href="http://docs.codehaus.org/display/MAVENUSER/Archiva+FAQ"; />
- <item name="Community" collapse="false">
- <item name="How to Contribute" href="/contributing.html" />
- <item name="Development Team" href="/team-list.html" />
<!-- Generated -->
- <item name="Mailing Lists" href="/mail-lists.html" />
<!-- Generated -->
- <item name="Issue Tracking"
href="http://jira.codehaus.org/browse/MRM"; />
- <item name="Subversion Repository" href="/source-repository.html" />
<!-- Generated -->
- </item>
- <item name="Building / Hacking" href="/hacking/index.html" />
- <item name="Java APIDoc (javadoc)" href="/ref/1.0/apidoc/" />
<!-- Generated -->
- <item name="Source Cross Reference" href="/ref/1.0/xref/" />
<!-- Generated -->
- <item name="Test Cross Reference" href="/ref/1.0/test-xref/" />
<!-- Generated -->
+ <menu name="Customising Archiva">
+ <item name="Write a Consumer Plugin"
href="/customising/writing-consumers.html" />
</menu>
<!-- to be removed later, once content has been shifted to permanent home
-->
Modified: maven/archiva/trunk/archiva-site/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-site/src/site/xdoc/index.xml?rev=596203&r1=596202&r2=596203&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-site/src/site/xdoc/index.xml (original)
+++ maven/archiva/trunk/archiva-site/src/site/xdoc/index.xml Sun Nov 18
21:07:44 2007
@@ -39,8 +39,15 @@
maintenance on your repositories.
</p>
-<!-- TODO: link to other content - quick start, guides, etc -->
-
+<!-- TODO: improve appearance of these links -->
+<p>
+ To get started with Archiva, read the following documentation:
+</p>
+<ul>
+<li><a href="/quick-start.html">A Quick Getting Started Guide</a></li>
+<li><a href="/userguide/index.html">User's Guide</a></li>
+<li><a href="/adminguide/index.html">Administrator's Guide</a></li>
+</ul>
<!-- TODO: move to the feature tour
<ul>
