Switch to Spring & Tomcat 7