Updated for war and tomcat deployment