Author: markt
Date: Sat Aug 11 19:27:52 2012
New Revision: 1372003
URL: http://svn.apache.org/viewvc?rev=1372003&view=rev
Log:
Update comments and change-log post clarification from the Servlet EG
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1371999
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1372003&r1=1372002&r2=1372003&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Sat Aug 11 19:27:52 2012
@@ -1216,9 +1216,9 @@ public class ContextConfig implements Li
* - As per http://java.net/jira/browse/SERVLET_SPEC-36, if the main
* web.xml is marked as metadata-complete, JARs are still processed
* for SCIs.
- * - TBD. If metadata-complete=true and an absolute ordering is
- * specified, are JARs excluded from the ordering also excluded from
- * the SCI processing? Current assumption is that they are.
+ * - If metadata-complete=true and an absolute ordering is specified,
+ * JARs excluded from the ordering are also excluded from the SCI
+ * processing.
* - If an SCI has a @HandlesType annotation then all classes (except
* those in JARs excluded from an absolute ordering) need to be
* scanned to check if they match.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1372003&r1=1372002&r2=1372003&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Aug 11 19:27:52 2012
@@ -238,9 +238,12 @@
declared in web.xml - unless metadata complete is set to true. (markt)
</fix>
<fix>
- As per clarification from the Servlet Expert Group, JARs are always
- checked for ServletContainerInitializers regardless of the setting of
- metadata complete. (markt)
+ <bug>53619</bug>As per clarification from the Servlet Expert Group,
+ JARs will always be scanned for ServletContainerInitializers regardless
+ of the setting of metadata complete. However, if an absolute ordering
is
+ specified and a JAR is excluded from that ordering it will not be
+ scanned for ServletContainerInitializers nor will it be scanned for
+ matches to any HandleTypes annotations. (markt)
</fix>
<add>
<bug>53465</bug>: Populate mapped-name property for resources defined
in
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
