Author: kkolinko
Date: Tue Feb 12 12:18:20 2013
New Revision: 1445129
URL: http://svn.apache.org/r1445129
Log:
Merged revision 1445125 from tomcat/trunk:
Document possible value for closeMethod attribute
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1445125
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1445129&r1=1445128&r2=1445129&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Tue Feb 12 12:18:20
2013
@@ -1091,6 +1091,8 @@
This attribute is ignored if the <code>singleton</code> attribute is
false. If not specificed, no default is defined and no close method
will
be called.</p>
+ <p>For Apache Commons DBCP and Apache Tomcat JDBC connection pools
+ you can use <code>closeMethod="close"</code>.</p>
</attribute>
<attribute name="description" required="false">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml?rev=1445129&r1=1445128&r2=1445129&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml Tue Feb 12
12:18:20 2013
@@ -195,6 +195,8 @@
This attribute is ignored if the <code>singleton</code> attribute is
false. If not specificed, no default is defined and no close method
will
be called.</p>
+ <p>For Apache Commons DBCP and Apache Tomcat JDBC connection pools
+ you can use <code>closeMethod="close"</code>.</p>
</attribute>
<attribute name="description" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
