Changed server to use Apache Tomcat