summaryrefslogtreecommitdiffstats
path: root/aai-resources
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2018-02-22 18:27:46 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-22 18:27:46 +0000
commit83bb2d67518d10568df85c8165c5ede4eaafc027 (patch)
tree3a3f3415c69a6f9714b22c074f23e8d47ce341f8 /aai-resources
parent45f4ef849632b00e0177c97c688314a129eaf65f (diff)
parenta4d7ff28f1f0470648efbe777fbe925810053c35 (diff)
Merge "Update DmaapConfig and AAIAppServlet to start"
Diffstat (limited to 'aai-resources')
-rw-r--r--aai-resources/src/main/java/org/onap/aai/util/AAIAppServletContextListener.java14
1 files changed, 0 insertions, 14 deletions
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
--- 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.");
}
});