1) Implemented security configuration
2) Moved to jndi dataSource
Merge fixed