Author: kkolinko
Date: Wed Nov 7 04:37:34 2012
New Revision: 1406459
URL: http://svn.apache.org/viewvc?rev=1406459&view=rev
Log:
Merged revision 1406456 from tomcat/trunk:
Move JAR Scanning-related properties into separate section.
Correct a typo: the file is conf/catalina.properties.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1406456
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml?rev=1406459&r1=1406458&r2=1406459&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Wed Nov 7
04:37:34 2012
@@ -523,6 +523,39 @@
</section>
+<section name="JAR Scanning">
+
+ <properties>
+ <property name="tomcat.util.scan. DefaultJarScanner.jarsToSkip">
+ <p>The comma-separated list of filenames of JARs that Tomcat will not
scan
+ for configuration information when using the
+ <a href="jar-scanner.html">JarScanner</a> functionality. Note that
+ there are additional system properties that enable JARs to be excluded
+ from specific scans rather than all scans.</p>
+ <p>The coded default is that no JARs are skipped however the system
+ property is set in a default Tomcat installation via the
+ <code>$CATALINA_BASE/conf/catalina.properties</code> file.</p>
+ </property>
+
+ <property name="org.apache.catalina.startup. ContextConfig.jarsToSkip">
+ <p>The comma-separated list of additional filenames of JARs that Tomcat
+ will not scan for Servlet 3.0 pluggability features.</p>
+ <p>The coded default is that no JARs are skipped however the system
+ property is set in a default Tomcat installation via the
+ <code>$CATALINA_BASE/conf/catalina.properties</code> file.</p>
+ </property>
+
+ <property name="org.apache.catalina.startup. TldConfig.jarsToSkip">
+ <p>The comma-separated list of additional filenames of JARs that Tomcat
+ will not scan for TLDs.</p>
+ <p>The coded default is that no JARs are skipped however the system
+ property is set in a default Tomcat installation via the
+ <code>$CATALINA_BASE/conf/catalina.properties</code> file.</p>
+ </property>
+ </properties>
+
+</section>
+
<section name="Other">
<properties>
@@ -610,33 +643,6 @@
<p>If not specified, the default value of <code>false</code> will be
used.</p>
</property>
- <property name="tomcat.util.scan. DefaultJarScanner.jarsToSkip">
- <p>The comma-separated list of filenames of JARs that Tomcat will not
scan
- for configuration information when using the
- <a href="jar-scanner.html">JarScanner</a> functionality. Note that
- there are additional system properties that enable JARs to be excluded
- from specific scans rather than all scans.</p>
- <p>The coded default is that no JARs are skipped however the system
- property is set in a default Tomcat installation via the
- <code>$CATALINA_BASE/catalina.properties</code> file.</p>
- </property>
-
- <property name="org.apache.catalina.startup. ContextConfig.jarsToSkip">
- <p>The comma-separated list of additional filenames of JARs that Tomcat
- will not scan for Servlet 3.0 pluggability features.</p>
- <p>The coded default is that no JARs are skipped however the system
- property is set in a default Tomcat installation via the
- <code>$CATALINA_BASE/catalina.properties</code> file.</p>
- </property>
-
- <property name="org.apache.catalina.startup. TldConfig.jarsToSkip">
- <p>The comma-separated list of additional filenames of JARs that Tomcat
- will not scan for TLDs.</p>
- <p>The coded default is that no JARs are skipped however the system
- property is set in a default Tomcat installation via the
- <code>$CATALINA_BASE/catalina.properties</code> file.</p>
- </property>
-
</properties>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
