converted to tomcat 7.x