Update DmaapConfig and AAIAppServlet to start

broker service properly

Issue-ID: AAI-791
Change-Id: I18be22a6627fcbd2cbeb29a6338125aa06276d50
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/aai-resources/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java b/aai-resources/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java
index e3e2d97..0fcce0b 100644 (file)
--- a/aai-resources/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java
+++ b/aai-resources/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java
@@ -27,7 +27,6 @@ import java.util.UUID;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.activemq.broker.BrokerService;
 import org.onap.aai.dbmap.AAIGraph;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.ModelInjestor;
@@ -45,8 +44,6 @@ public class AAIAppServletContextListener implements ServletContextListener {
 
        private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIAppServletContextListener.class.getName());     
        
-       private BrokerService broker = new BrokerService();
-
        /**
         * Destroys Context
         *
@@ -87,12 +84,6 @@ public class AAIAppServletContextListener implements ServletContextListener {
                        ModelInjestor.getInstance();
 
                        // Jsm internal broker for aai events
-                       broker = new BrokerService();
-                       broker.addConnector(ACTIVEMQ_TCP_URL);
-                       broker.setPersistent(false);
-                       broker.setUseJmx(false);
-                       broker.setSchedulerSupport(false);
-                       broker.start();
 
                        LOGGER.info("A&AI Server initialization succcessful.");
                        System.setProperty("activemq.tcp.url", ACTIVEMQ_TCP_URL);
@@ -107,11 +98,6 @@ public class AAIAppServletContextListener implements ServletContextListener {
                                        LOGGER.info("AAIGraph shutting down");
                                        AAIGraph.getInstance().graphShutdown();
                                        LOGGER.info("AAIGraph shutdown");
-                                       try {
-                                               broker.stop();
-                                       } catch (Exception e) {
-                                               LOGGER.error("Issue closing broker "+ LogFormatTools.getStackTop(e));
-                                       }
                                        System.out.println("Shutdown hook triggered.");
                                }
                        });