Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54740
Fix @HandlesTypes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1460866 13f79535-47bb-0310-9956-ffa450edef68
Fix extras logging build broken by upgrade to CL 1.1.2. The change of source path needed to replicated in more places.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1460873 13f79535-47bb-0310-9956-ffa450edef68