You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2012/04/28 16:10:28 UTC

svn commit: r1331772 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/jndi-resources-howto.xml

Author: rjung
Date: Sat Apr 28 14:10:27 2012
New Revision: 1331772

URL: http://svn.apache.org/viewvc?rev=1331772&view=rev
Log:
BZ 53158: Fix documented defaults for DBCP.
Patch provided by ph.dezanneau at gmail.com.

Backport of r1331766 from trunk.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1331766

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1331772&r1=1331771&r2=1331772&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Apr 28 14:10:27 2012
@@ -93,13 +93,11 @@
       </fix>
     </changelog>
   </subsection>
-  <subsection name="Other">
+  <subsection name="Web applications">
     <changelog>
-      <update>
-        Update to Eclipse JDT Compiler 3.7.2 at maven tomcat-jasper.pom. (pero)
-      </update>
       <fix>
-        Add missing dependencies in pom files. (markt)
+        <bug>53158</bug>: Fix documented defaults for DBCP.
+        Patch provided by ph.dezanneau at gmail.com. (rjung)
       </fix>
     </changelog>
   </subsection>
@@ -111,7 +109,16 @@
       </fix>  
     </changelog>
   </subsection>
-  
+  <subsection name="Other">
+    <changelog>
+      <update>
+        Update to Eclipse JDT Compiler 3.7.2 at maven tomcat-jasper.pom. (pero)
+      </update>
+      <fix>
+        Add missing dependencies in pom files. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.27 (markt)" rtext="released 2012-04-05">
   <subsection name="Catalina">

Modified: tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1331772&r1=1331771&r2=1331772&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml Sat Apr 28 14:10:27 2012
@@ -716,13 +716,13 @@ conn.close();
     <ul>
     <li><strong>timeBetweenEvictionRunsMillis</strong> - The number of
         milliseconds between consecutive runs of the evictor.
-        Default: 30*60*1000 (30 minutes)</li>
+        Default: -1 (disabled)</li>
     <li><strong>numTestsPerEvictionRun</strong> - The number of connections
         that will be checked for idleness by the evitor during each
         run of the evictor. Default: 3</li>
     <li><strong>minEvictableIdleTimeMillis</strong> - The idle time in
         milliseconds after which a connection can be removed from the pool
-        by the evictor. Default: -1 (disabled)</li>
+        by the evictor. Default: 30*60*1000 (30 minutes)</li>
     <li><strong>testWhileIdle</strong> - true or false: whether a connection
         should be validated by the evictor thread using the validation query
         while sitting idle in the pool. Default: false</li>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org