merge activemq.demo