Moved all jndi resources from the server.xml to the context.xml