Additional commits to support Tomcat 7 in Eclipse.