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 4b1e28f20441756407a2f9359df109ee78ddd9f3..208521e0f40ec58e009c257025a584c987a5f64d 100644 (file)
--- 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 ca17bec261e02a52dcd9a6e78d4c024f1119ca82..cff33e8040e367409ae0a628115005edff4b82a4 100644 (file)
--- 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.