From 3fe173232fff78e6037d775fd816208318f2f3b9 Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Wed, 23 Nov 2016 15:43:11 -0500 Subject: [PATCH] Misc doc updates/fixes. Signed-off-by: WalkerWatch --- .../session-configuration-memory.adoc | 27 +++++++++---------- .../sessions/session-hierarchy.adoc | 1 + .../configuring/jsp/configuring-jsp.adoc | 2 +- .../upgrading/upgrading-9.3-to-9.4.adoc | 7 +++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc index 9e4f09edc2a..214fb01d11c 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc @@ -18,22 +18,19 @@ === Non-Clustered Session Management: Memory -Non-clustered, in-memory-only is the default style of session management. -In previous versions of jetty this was referred to as "hash" sessions, as they were stored in a HashMap in memory. +Non-clustered, in-memory-only is the default style of Session Management. +In previous versions of Jetty this was referred to as "hash" sessions, as they were stored in a `HashMap` in memory. When using the Jetty distribution, if you do not configure any session module, this will be enabled by default. -Specifically, jetty will hook up: +Specifically, Jetty will hook up: -[horizontal] -*a DefaultSessionIdManager*:: -- produces unique session ids and supports cross-context dispatch re-use of session ids -*a HouseKeeper*:: -- scavenges expired sessions every 10 mins -*a DefaultSessionCache per context*:: -- keeps session objects in memory -*a NullSessionDataStore per context*:: -- no persistence of sessions - - -If you wish to change any of the default configuration, enable the *session-cache-hash* module. +A `DefaultSessionIdManager`:: +* Produces unique session ids and supports cross-context dispatch re-use of session ids +A `HouseKeeper`:: +* Scavenges for expired sessions every 10 mins +A `DefaultSessionCache` per context:: +* Keeps session objects in memory +A `NullSessionDataStore` per context:: +* No persistence of sessions +If you wish to change any of the default configuration, enable the `session-cache-hash` module. diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc index 4723c707170..33d8b272ae8 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc @@ -17,6 +17,7 @@ [[jetty-sessions-architecture]] === Session Architecture +// TODO: Remove in Jetty 9.5/10 - This paragraph is dated and only really useful for upgrading into 9.4 from prior versions. ==== Changes in Session Architecture The architecture of Session Management Jetty changed significantly in Jetty 9.4. These changes have resulted in Sessions not only being easier to configure but making them much more pluggable for various technologies. diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc b/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc index dd124d4bdcf..f943de97fbc 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc @@ -28,7 +28,7 @@ By default the Jetty distribution enables the JSP link:#startup-modules[module], [source, plain, subs="{sub-order}"] ---- -include::{SRCDIR}/jetty-distribution/src/main/resources/modules/jsp.mod[] +include::{SRCDIR}/jetty-home/src/main/resources/modules/jsp.mod[] ---- Note that the availability of some JSP features may depend on which JSP container implementation you are using. diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc index 4e0bbfe7c30..85af1b81807 100644 --- a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc +++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc @@ -14,9 +14,12 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== -=== Upgrading from Jetty 9.3 to Jetty 9.4 +=== Upgrading from Jetty 9.3.x to Jetty 9.4.0 -==== jetty.sh +The purpose of this guide is to assist users migrating from Jetty 9.3.x to 9.4.0. +It is not comprehensive, but covers many of the major changes included in the release that may prove as problem areas for users. + +==== The jetty.sh Script The file `jetty.sh`, typically used to start Jetty as a service in Linux/Unix machines underwent only small changes, such as the addition of https://wiki.debian.org/LSBInitScripts[LSB tags].