From 21eac1d88cc5d803b077dfa0b14ebce61fa88946 Mon Sep 17 00:00:00 2001
From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 29 Oct 2010 23:34:37 +0000
Subject: [PATCH] Document jspIdleTimeout.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1028944 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/web.xml                  | 4 ++++
 webapps/docs/changelog.xml    | 8 ++++++++
 webapps/docs/jasper-howto.xml | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/conf/web.xml b/conf/web.xml
index 4206d438a..e4a871300 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -193,6 +193,10 @@
   <!--                       this limit. A value of zero or less indicates  -->
   <!--                       no limit. [-1]                                 -->
   <!--                                                                      -->
+  <!--   jspIdleTimeout      The amount of time in seconds a JSP can be     -->
+  <!--                       idle before it is unloaded. A value of zero    -->
+  <!--                       or less indicates never unload. [-1]           -->
+  <!--                                                                      -->
   <!--   modificationTestInterval                                           -->
   <!--                       Causes a JSP (and its dependent files) to not  -->
   <!--                       be checked for modification during the         -->
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6b8c9b953..6861747ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -101,6 +101,14 @@
         <code>Enum.name()</code> rather than <code>Enum.toString()</code> as
         required by the EL specification. (markt)
       </fix>
+      <fix>
+        Fix minor thread-safety and performance issues in the implementation
+        of <code>maxLoadedJsps</code>. (rjung)
+      </fix>
+      <add>
+        Add support for unloading JSPs that have not been requested for a
+        long time using the new parameter <code>jspIdleTimeout</code>. (rjung)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Cluster">
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index c85669bc8..5a22688f4 100644
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -163,6 +163,10 @@ least recently used JSPs will be unloaded so that the number of JSPs loaded at
 any one time does not exceed this limit. A value of zero or less indicates no
 limit. Default <code>-1</code></li>
 
+<li><strong>jspIdleTimeout</strong> - The amount of time in seconds a JSP can be
+idle before it is unloaded. A value of zero or less indicates never unload.
+Default <code>-1</code></li>
+
 <li><strong>modificationTestInterval</strong> - Causes a JSP (and its dependent
 files) to not be checked for modification during the specified time interval
 (in seconds) from the last time the JSP was checked for modification. A value of
-- 
2.11.0