1 files changed, 20 insertions, 20 deletions

diff --git a/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java b/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java
index 97b7edb..8c5a4aa 100644
--- a/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.apache.activemq.broker.BrokerService;
+//import org.apache.activemq.broker.BrokerService;
 
 import org.openecomp.aai.dbmap.AAIGraph;
 import org.openecomp.aai.exceptions.AAIException;
@@ -38,7 +38,7 @@ public class AAIAppServletContextListener implements ServletContextListener {
 
 	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIAppServletContextListener.class.getName());	
 	
-	private BrokerService broker = new BrokerService();
+	//private BrokerService broker = new BrokerService();
 
 	/**
 	 * Destroys Context
@@ -50,12 +50,12 @@ public class AAIAppServletContextListener implements ServletContextListener {
 		AAIGraph.getInstance().graphShutdown();
 		LOGGER.info("AAIGraph shutdown");
 
-		try {
-			broker.stop();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		//try {
+			////broker.stop();
+		//} catch (Exception e) {
+			//// TODO Auto-generated catch block
+			//e.printStackTrace();
+		//}
 	}
 
 	/**
@@ -80,25 +80,25 @@ public class AAIAppServletContextListener implements ServletContextListener {
 			ModelInjestor.getInstance();
 
 			// Jsm internal broker for aai events
-			broker = new BrokerService();
-			broker.addConnector("tcp://localhost:61446");
-			broker.setPersistent(false);
-			broker.setUseJmx(false);
-			broker.setSchedulerSupport(false);
-			broker.start();
-
-			LOGGER.info("A&AI Server initialization succcessful.");
+			//broker = new BrokerService();
+			//broker.addConnector("tcp://localhost:61446");
+			//broker.setPersistent(false);
+			//broker.setUseJmx(false);
+			//broker.setSchedulerSupport(false);
+			//broker.start();
+
+			LOGGER.info("AAI Server initialization succcessful.");
 			System.setProperty("org.openecomp.aai.serverStarted", "true");
 
 		} catch (AAIException e) {
 			ErrorLogHelper.logException(e);
-			throw new RuntimeException("AAIException caught while initializing A&AI server", e);
+			throw new RuntimeException("AAIException caught while initializing AAI server", e);
 		} catch (IOException e) {
 			ErrorLogHelper.logError("AAI_4000", e.getMessage());
-			throw new RuntimeException("IOException caught while initializing A&AI server", e);
+			throw new RuntimeException("IOException caught while initializing AAI server", e);
 		} catch (Exception e) {
-			LOGGER.error("Unknown failure while initializing A&AI Server", e);
-			throw new RuntimeException("Unknown failure while initializing A&AI server", e);
+			LOGGER.error("Unknown failure while initializing AAI Server", e);
+			throw new RuntimeException("Unknown failure while initializing AAI server", e);
 		}
 	}
 }