From: Olivier Lamy <olamy@apache.org>
Date: Fri, 16 Dec 2011 20:36:55 +0000 (+0000)
Subject: merge -r 1215125:1215126 from trunk just a change in site docs for this release
X-Git-Tag: archiva-1.4-M2^0
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=acea421f83291e6c4766f453065e7548d0a70e0b;p=archiva.git

merge -r 1215125:1215126 from trunk just a change in site docs for this release

git-svn-id: https://svn.apache.org/repos/asf/archiva/tags/archiva-1.4-M2@1215266 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index 4b1e28f20..208521e0f 100644
--- a/archiva-docs/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
@@ -69,7 +69,10 @@ Installing Standalone Distribution of Apache Archiva
 
   This is achieved by the following steps:
 
-   [[1]] Create the base location. For example, you might install Archiva in <<</opt/archiva-1.4>>> and the data in <<</var/archiva>>>. Create the directories <<</var/archiva/logs>>>, <<</var/archiva/data>>> and <<</var/archiva/conf>>>.
+   [[1]] Create the base location. For example, you might install Archiva in
+         <<</opt/archiva-1.4>>> and the data in <<</var/archiva>>>. Create the
+         directories <<</var/archiva/logs>>>, <<</var/archiva/data>>>,
+         <<</var/archiva/temp>>> and <<</var/archiva/conf>>>.
 
    [[2]] Move the configuration files from the Archiva installation (e.g. <<</opt/archiva-1.4/conf>>> to the new location (e.g. <<</var/archiva/conf>>>). If you've previously run Archiva, you may need to edit <<<conf/archiva.xml>>> to change the location of the repositories.
 
diff --git a/archiva-docs/src/site/apt/adminguide/upgrade.apt b/archiva-docs/src/site/apt/adminguide/upgrade.apt
index ca17bec26..cff33e804 100644
--- a/archiva-docs/src/site/apt/adminguide/upgrade.apt
+++ b/archiva-docs/src/site/apt/adminguide/upgrade.apt
@@ -62,6 +62,17 @@ Upgrading Archiva
   that in Archiva 1.4+ you must use the <<<org.apache.archiva>>> configuration search path instead of
   <<<org.apache.maven.archiva>>>.
 
+** Updated Jetty configuration
+
+  If you are using the Jetty standalone configuration with a custom
+  <<<jetty.xml>>>, note that it has been upgraded to Jetty 7 as of Archiva 1.4-M2.
+  You will need to recreate your customisations using the <<<jetty.xml>>> shipped
+  with Archiva.
+
+  In addition, you now need to ensure that a <<<temp>>> directory is created
+  inside the Archiva application base directory (alongside <<<conf>>>, <<<data>>>
+  and <<<logs>>>).
+
 * Upgrading Archiva to 1.2.2
 
    Since Archiva 1.2.2, the Jetty version has been upgraded to 6.1.19.