aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2014-02-08 12:02:49 +0000
committerOlivier Lamy <olamy@apache.org>2014-02-08 12:02:49 +0000
commitc6f7c48f2bdd6d0835dfa7556712289aa9f96d77 (patch)
treea546af1483efafedacf2ffc03d0340d4fa263c83
parent011370858e2888ab4cb1cd15c5bb50b557c16b90 (diff)
downloadarchiva-c6f7c48f2bdd6d0835dfa7556712289aa9f96d77.tar.gz
archiva-c6f7c48f2bdd6d0835dfa7556712289aa9f96d77.zip
note in upgrade guide regarding webapp context changed
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565995 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-docs/src/site/apt/adminguide/upgrade.apt8
1 files changed, 2 insertions, 6 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/upgrade.apt b/archiva-docs/src/site/apt/adminguide/upgrade.apt
index cff33e804..973cf53c1 100644
--- a/archiva-docs/src/site/apt/adminguide/upgrade.apt
+++ b/archiva-docs/src/site/apt/adminguide/upgrade.apt
@@ -65,7 +65,7 @@ Upgrading 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.
+ <<<jetty.xml>>>, note that it has been upgraded to Jetty 8 as of Archiva 1.4-M2.
You will need to recreate your customisations using the <<<jetty.xml>>> shipped
with Archiva.
@@ -73,10 +73,6 @@ Upgrading Archiva
inside the Archiva application base directory (alongside <<<conf>>>, <<<data>>>
and <<<logs>>>).
-* Upgrading Archiva to 1.2.2
+ The default webapp context is now / (see {{{./adminguide/standalone.html} Standalone Distribution}})
- Since Archiva 1.2.2, the Jetty version has been upgraded to 6.1.19.
- If upgrading to Archiva 1.2.2 (or higher versions), there is a need to update the library contents listed in
- <<<ARCHIVA_BASE/conf/wrapper.conf>>> with the ones included in the new distribution if the <<<ARCHIVA_BASE>>>
- directory is separate from the installation.