SRAMP-562 Tomcat support