added support for encrypted password and JNDI datasource