adding tomcat7 support and some initial required changes