work on activemq
refactoring