Changing app to use Tomcat and Java 7