From: Venkata Harish K Kajur <vk250x@att.com>
Date: Thu, 22 Feb 2018 18:10:21 +0000 (-0500)
Subject: Update DmaapConfig and AAIAppServlet to start
X-Git-Tag: v1.2.0~27
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=11ce21200a43bbbe189261c3002215b1b1ca2989;p=aai%2Ftraversal.git

Update DmaapConfig and AAIAppServlet to start

broker service

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

diff --git a/aai-traversal/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java b/aai-traversal/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java
index 86fefdd..4c88d68 100644
--- a/aai-traversal/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java
+++ b/aai-traversal/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java
@@ -27,8 +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,7 +43,6 @@ public class AAIAppServletContextListener implements ServletContextListener {
 	private static final String MICRO_SVC="aai-traversal";
 	private static final String ACTIVEMQ_TCP_URL = "tcp://localhost:61446";
 	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIAppServletContextListener.class.getName());	
-	private BrokerService broker = new BrokerService();
 
 	/**
 	 * Destroys Context
@@ -85,14 +82,6 @@ public class AAIAppServletContextListener implements ServletContextListener {
 			AAIGraph.getInstance();
 			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);
 			System.setProperty("org.onap.aai.serverStarted", "true");
@@ -102,11 +91,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.");
 				}
 			});