svn commit: r597534 - in /maven/archiva/trunk/archiva-docs/src/site: apt/adminguide/standalone.apt apt/adminguide/webapp.apt apt/guides/configuration.apt apt/quick-start.apt site.xml

[br...@apache.org]

Author: brett
Date: Thu Nov 22 19:49:56 2007
New Revision: 597534

URL: http://svn.apache.org/viewvc?rev=597534&view=rev
Log:
move the old configuration documentation

Removed:
    maven/archiva/trunk/archiva-docs/src/site/apt/guides/configuration.apt
Modified:
    maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt
    maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
    maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt
    maven/archiva/trunk/archiva-docs/src/site/site.xml

Modified: maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt?rev=597534&r1=597533&r2=597534&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt (original)
+++ maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt Thu Nov 22 19:49:56 2007
@@ -10,6 +10,26 @@
 ~~TODO: ensure to refer to advanced configuration options, such as PLEXUS_BASE
 ~~TODO: upgrading
 
+  Archiva's configuration is loaded from the following files, in order of most precedent:
+
+    * <<<~/.m2/archiva.xml>>>
+
+    * <<<$ARCHIVA_BASE/conf/archiva.xml>>>
+
+    * <<<$ARCHIVA_HOME/conf/archiva.xml>>>
+
+  When Archiva saves it's configuration, all configuration is stored to a single file. The file chosen is by the following rules:
+
+    * If <<<~/.m2/archiva.xml>>> exists, it is saved there
+
+    * Otherwise, it is saved to <<<$ARCHIVA_BASE/conf/archiva.xml>>>, regardless of whether it previously existed.
+
+  The configuration will never be saved in <<<$ARCHIVA_HOME>>>.
+
+  Note that the configuration can be edited, but only when Archiva is not running as it will not reload a changed configuration file, and will save over it
+  if something is changed in the web interface.
+
+
 {Upgrading Archiva}
 
    ...

Modified: maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt?rev=597534&r1=597533&r2=597534&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt (original)
+++ maven/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt Thu Nov 22 19:49:56 2007
@@ -77,5 +77,5 @@
 
 Configuring and Running Archiva
 
-  Once Archiva is running, it is configured in the same way as the standalone instance. See the {{{../quick-start.html#Configuring%20and%20Running%20Archiva} quick start}} guide for more information.
+  Once Archiva is running, it is configured in the same way as the standalone instance. See the {{{../quick-start.html#Setting%20up%20your%20Archiva%20instance} quick start}} guide for more information.
 

Modified: maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt?rev=597534&r1=597533&r2=597534&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt (original)
+++ maven/archiva/trunk/archiva-docs/src/site/apt/quick-start.apt Thu Nov 22 19:49:56 2007
@@ -44,15 +44,12 @@
 
   Archiva is now running on <<<http://localhost:8080/archiva/>>>
 
-Setting up your Archiva instance
+{Setting up your Archiva instance}
 
   You can now browse the web administration of Archiva. There will be a few basic setup tasks to get started.
 
-   * On the first page - setup your administration user. The password requires a numerical character and must not be
-   longer than 8 chars. You'll then need to log in. User 'admin' as the username and the password you've entered.
+  The first step is to setup your administration user. The password requires a numerical character and must not be
+  longer than 8 chars. You'll then need to log in. User 'admin' as the username and the password you've entered.
 
-   * On the second page - setup your first repository. It can be both an m1 and an m2 repository.
-
-   * On the third page - setup your indexing. Mostly this means choosing a directory to put the index in. It'll
-   re-index every hour.
+~~TODO...
 

Modified: maven/archiva/trunk/archiva-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-docs/src/site/site.xml?rev=597534&r1=597533&r2=597534&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-docs/src/site/site.xml (original)
+++ maven/archiva/trunk/archiva-docs/src/site/site.xml Thu Nov 22 19:49:56 2007
@@ -75,7 +75,6 @@
       <item name="FAQ" href="http://docs.codehaus.org/display/MAVENUSER/Archiva+FAQ"/>
       <item name="Maven Configuration" href="/guides/maven-configuration.html"/>
       <item name="Security Configuration" href="/guides/security-configuration.html"/>
-      <item name="Other Configuration" href="/guides/configuration.html"/>
       <item name="Hacking Archiva" href="/hacking/index.html"/>
     </menu>
   </body>