svn commit: r1516168 - /tomcat/tc7.0.x/trunk/conf/catalina.properties

[ma...@apache.org]

Author: markt
Date: Wed Aug 21 14:14:46 2013
New Revision: 1516168

URL: http://svn.apache.org/r1516168
Log:
WebSocket API has neither SCIs nor TLDs
WebSocket Impl has no TLDs

Modified:
    tomcat/tc7.0.x/trunk/conf/catalina.properties

Modified: tomcat/tc7.0.x/trunk/conf/catalina.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.properties?rev=1516168&r1=1516167&r2=1516168&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.properties Wed Aug 21 14:14:46 2013
@@ -89,7 +89,7 @@ shared.loader=
 # - Common non-Tomcat JARs
 tomcat.util.scan.DefaultJarScanner.jarsToSkip=\
 bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,\
-annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,\
+annotations-api.jar,el-api.jar,jsp-api.jar,servlet-api.jar,websocket-api.jar,\
 catalina.jar,catalina-ant.jar,catalina-ha.jar,catalina-tribes.jar,\
 jasper.jar,jasper-el.jar,ecj-*.jar,\
 tomcat-api.jar,tomcat-util.jar,tomcat-coyote.jar,tomcat-dbcp.jar,\
@@ -117,7 +117,7 @@ org.apache.catalina.startup.ContextConfi
 
 # Additional JARs (over and above the default JARs listed above) to skip when
 # scanning for TLDs. The list must be a comma separated list of JAR file names.
-org.apache.catalina.startup.TldConfig.jarsToSkip=
+org.apache.catalina.startup.TldConfig.jarsToSkip=tomcat7-websocket.jar
 
 #
 # String cache configuration.



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