Updated to work with Tomcat 7. Note that the unit tests are failing due to the lifecycle changes.