Removed DODI and Updated common to use Jndi datasource