Follow-up to r1635154. When scanning the class path, exclude WEB-INF/classes if it has already been scanned and exclude JARs from WEB-INF/lib that have been scanned.
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java