Major refactoring to support jdbc persistence adapter + latest version of activemq