Not sure, could we restore the saved (Tomcat) TCCL for the org.hibernate.engine.jndi.internal.JndiServiceImpl.locate() call perhaps?