Author: kkolinko
Date: Wed Nov 7 07:24:40 2012
New Revision: 1406481
URL: http://svn.apache.org/viewvc?rev=1406481&view=rev
Log:
* globalresources.xml:
Document the "closeMethod" and "singleton" attributes of a Resource element.
The text is copied from context.xml.
* systemprops.xml:
Add spaces and breaks to reduce horizontal scrolling.
Modified:
tomcat/trunk/webapps/docs/config/globalresources.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/webapps/docs/config/globalresources.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/globalresources.xml?rev=1406481&r1=1406480&r2=1406481&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/globalresources.xml (original)
+++ tomcat/trunk/webapps/docs/config/globalresources.xml Wed Nov 7 07:24:40
2012
@@ -192,6 +192,15 @@
application uses a <code><resource-env-ref></code> instead.</p>
</attribute>
+ <attribute name="closeMethod" required="false">
+ <p>Name of the zero-argument method to call on a singleton resource
when
+ it is no longer required. This is intended to speed up clean-up of
+ resources that would otherwise happen as part of garbage collection.
+ 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>
+ </attribute>
+
<attribute name="description" required="false">
<p>Optional, human-readable description of this resource.</p>
</attribute>
@@ -208,6 +217,19 @@
connections are assumed to be shareable.</p>
</attribute>
+ <attribute name="singleton" required="false">
+ <p>Specify whether this resource definition is for a singleton
resource,
+ i.e. one where there is only a single instance of the resource. If this
+ attribute is <code>true</code>, multiple JNDI lookups for this resource
+ will return the same object. If this attribute is <code>false</code>,
+ multiple JNDI lookups for this resource will return different objects.
+ This attribute must be <code>true</code> for
+ <code>javax.sql.DataSource</code> resources to enable JMX registration
+ of the DataSource. The value of this attribute must be
<code>true</code>
+ or <code>false</code>. By default, this attribute is <code>true</code>.
+ </p>
+ </attribute>
+
<attribute name="type" required="true">
<p>The fully qualified Java class name expected by the web
application when it performs a lookup for this resource.</p>
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1406481&r1=1406480&r2=1406481&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Wed Nov 7 07:24:40 2012
@@ -276,14 +276,14 @@
<p>The default value of this system property is <code>false</code>.</p>
<p>If this is <code>true</code> the default values will be changed for:
<ul>
-
<li><code>org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH</code></li>
-
<li><code>org.apache.catalina.core.ApplicationDispatcher.WRAP_SAME_OBJECT</code></li>
-
<li><code>org.apache.catalina.core.StandardHostValve.ACCESS_SESSION</code></li>
-
<li><code>org.apache.catalina.session.StandardSession.ACTIVITY_CHECK</code></li>
-
<li><code>org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START</code></li>
-
<li><code>org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES</code></li>
-
<li><code>org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR</code></li>
-
<li><code>org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING</code></li>
+
<li><code>org.apache.catalina.core.<br/>ApplicationContext.GET_RESOURCE_REQUIRE_SLASH</code></li>
+
<li><code>org.apache.catalina.core.<br/>ApplicationDispatcher.WRAP_SAME_OBJECT</code></li>
+
<li><code>org.apache.catalina.core.<br/>StandardHostValve.ACCESS_SESSION</code></li>
+
<li><code>org.apache.catalina.session.<br/>StandardSession.ACTIVITY_CHECK</code></li>
+
<li><code>org.apache.catalina.session.<br/>StandardSession.LAST_ACCESS_AT_START</code></li>
+
<li><code>org.apache.tomcat.util.http.<br/>ServerCookie.ALWAYS_ADD_EXPIRES</code></li>
+
<li><code>org.apache.tomcat.util.http.<br/>ServerCookie.FWD_SLASH_IS_SEPARATOR</code></li>
+
<li><code>org.apache.tomcat.util.http.<br/>ServerCookie.STRICT_NAMING</code></li>
<li>The <code>resourceOnlyServlets</code> attribute of any
<a href="context.html">Context</a> element.</li>
<li>The <code>tldNamespaceAware</code> attribute of any
@@ -460,7 +460,7 @@
<code>-Dorg.apache.juli.formatter=org.apache.juli.OneLineFormatter</code></p>
</property>
- <property name="org.apache.juli.AsyncOverflowDropType">
+ <property name="org.apache.juli. AsyncOverflowDropType">
<p>When the memory limit of records has been reached the system needs to
determine what action to take.
Currently there are three actions that can be taken:
</p>
@@ -473,7 +473,7 @@
<p>The default value is <code>1</code> (OVERFLOW_DROP_LAST).</p>
</property>
- <property name="org.apache.juli.AsyncMaxRecordCount">
+ <property name="org.apache.juli. AsyncMaxRecordCount">
<p>The max number of log records that the async logger will keep in
memory. When this limit is reached and a new record is being logged by the
JULI framework the system will take an action based on the
<code>org.apache.juli.AsyncOverflowDropType</code> setting.</p>
<p>The default value is <code>10000</code> records.
@@ -481,14 +481,14 @@
</p>
</property>
- <property name="org.apache.juli.AsyncLoggerPollInterval">
+ <property name="org.apache.juli. AsyncLoggerPollInterval">
<p>The poll interval in milliseconds for the asynchronous logger thread
in milliseconds.
If the log queue is empty, the async thread will issue a poll(poll
interval)
in order to not wake up to often.</p>
<p>The default value is <code>1000</code> milliseconds.</p>
</property>
- <property name="org.apache.juli.logging.UserDataHelper.CONFIG">
+ <property name="org.apache.juli.logging. UserDataHelper.CONFIG">
<p>The type of logging to use for errors generated by invalid input data.
The options are: <code>DEBUG_ALL</code>, <code>INFO_THEN_DEBUG</code>,
<code>INFO_ALL</code> and <code>NONE</code>. When
@@ -506,7 +506,7 @@
system in later versions.</p>
</property>
- <property name="org.apache.juli.logging.UserDataHelper.SUPPRESSION_TIME">
+ <property name="org.apache.juli.logging. UserDataHelper.SUPPRESSION_TIME">
<p>When using <code>INFO_THEN_DEBUG</code> for
<code>org.apache.juli.logging.UserDataHelper.CONFIG</code> this system
property controls how long messages are logged at DEBUG after a
message
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
