FYI -- the Tomcat team is planning to create a new trunk next week
copied from the 6.0.15 tag. That tag includes the security fix for
the Webdav servlet. IIUC they should also be agreeable to applying
the annotation support patch developed by David Jencks and Remy to
this new trunk, though we haven't discussed the exact timing of that
yet.
http://www.nabble.com/Time-to-organise-svn---Take-3-p13077171.html
Best wishes,
Paul