Update Java 6 to Java 7 and update Tomcat 6 to Tomcat 7