Includes usage of JNDI now, sample adjusted for tomcat and jetty