Author: markt
Date: Wed Jan 15 12:24:13 2014
New Revision: 1558357
URL: http://svn.apache.org/r1558357
Log:
Simplify configuration now that the SCI does not use the JarScanner for
container JARs.
Modified:
tomcat/trunk/conf/catalina.properties
tomcat/trunk/conf/context.xml
tomcat/trunk/webapps/docs/config/jar-scan-filter.xml
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1558357&r1=1558356&r2=1558357&view=diff
==============================================================================
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Wed Jan 15 12:24:13 2014
@@ -97,9 +97,9 @@ bootstrap.jar,commons-daemon.jar,tomcat-
annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-storeconfig.jar,\
catalina-tribes.jar,\
-jasper-el.jar,ecj-*.jar,\
+jasper.jar,jasper-el.jar,ecj-*.jar,\
tomcat-api.jar,tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,\
-tomcat-dbcp.jar,tomcat-jni.jar,tomcat-spdy.jar,\
+tomcat-dbcp.jar,tomcat-jni.jar,tomcat-spdy.jar,tomcat-websocket.jar,\
tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar,\
tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,\
tomcat-jdbc.jar,\
Modified: tomcat/trunk/conf/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/context.xml?rev=1558357&r1=1558356&r2=1558357&view=diff
==============================================================================
--- tomcat/trunk/conf/context.xml (original)
+++ tomcat/trunk/conf/context.xml Wed Jan 15 12:24:13 2014
@@ -33,17 +33,4 @@
<!--
<Valve className="org.apache.catalina.valves.CometConnectionManagerValve"
/>
-->
-
- <!-- Tomcat uses SCIs to initialise both JSP and WebSocket support.
-->
- <!-- This means that neither jasper.jar nor tomcat-websocket.jar can be
-->
- <!-- excluded from SCI scanning. Therefore, they do not appear in the
-->
- <!-- default list of JARs to skip. However, they do not contain TLDs so
-->
- <!-- they can be skipped for TLD scanning. The JarScanFilter below
-->
- <!-- configures a custom TLD skip list that is all the default JARs plus
-->
- <!-- these two.
-->
- <JarScanner>
- <JarScanFilter
- tldSkip="${tomcat.util.scan.StandardJarScanFilter.jarsToSkip},
- jasper.jar,tomcat-websocket.jar"/>
- </JarScanner>
</Context>
Modified: tomcat/trunk/webapps/docs/config/jar-scan-filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/jar-scan-filter.xml?rev=1558357&r1=1558356&r2=1558357&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/jar-scan-filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/jar-scan-filter.xml Wed Jan 15 12:24:13
2014
@@ -141,6 +141,13 @@
</attributes>
+ <p>Note that excluding a JAR from the pluggability scan will prevent a
+ ServletContainerInitializer from being loaded from a web application JAR
+ (i.e. one located in <code>/WEB-INF/lib</code>) but it will not prevent
+ a ServletContainerInitializer from being loaded from the container. To
+ prevent a ServletContainerInitializer from being loaded from the container,
+ use the <code>containerSciFilter</code> property of the Context.</p>
+
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
