diff --git a/apps/meta-war/src/main/webapp/WEB-INF/web.xml b/apps/meta-war/src/main/webapp/WEB-INF/web.xml
index 1c2915ffe..50a78a646 100644
--- a/apps/meta-war/src/main/webapp/WEB-INF/web.xml
+++ b/apps/meta-war/src/main/webapp/WEB-INF/web.xml
@@ -1,24 +1,29 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
         "http://java.sun.com/dtd/
         web-app_2_4.dtd">
 
 <web-app>
 
     <listener>
         <listener-class>spray.servlet.Initializer</listener-class>
     </listener>
+    <listener>
+        <listener-class>
+            net.shrine.hornetqmom.HornetQShutdownContextListener
+        </listener-class>
+    </listener>
 
     <servlet>
         <servlet-name>SprayConnectorServlet</servlet-name>
         <servlet-class>spray.servlet.Servlet30ConnectorServlet</servlet-class>
         <async-supported>true</async-supported>
     </servlet>
 
     <servlet-mapping>
         <servlet-name>SprayConnectorServlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 
 </web-app>
diff --git a/messagequeue/hornetqmom/pom.xml b/messagequeue/hornetqmom/pom.xml
index 80d9c8ae6..d846e7829 100644
--- a/messagequeue/hornetqmom/pom.xml
+++ b/messagequeue/hornetqmom/pom.xml
@@ -1,80 +1,86 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <name>SHRINE HornetQMom</name>
     <artifactId>shrine-hornetqmom</artifactId>
     <packaging>jar</packaging>
     <parent>
         <groupId>net.shrine</groupId>
         <artifactId>shrine-base</artifactId>
  
         <version>1.23.5.1-SNAPSHOT</version>
  
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <build>
         <sourceDirectory>src/main/scala</sourceDirectory>
         <testSourceDirectory>src/test/scala</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
                             <goal>test-jar</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
     <dependencies>
         <dependency>
             <groupId>net.shrine</groupId>
             <artifactId>shrine-test-commons</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.shrine</groupId>
             <artifactId>shrine-config</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.spray</groupId>
             <artifactId>spray-routing_2.11</artifactId>
             <version>${spray-version}</version>
         </dependency>
         <dependency>
             <groupId>io.spray</groupId>
             <artifactId>spray-testkit_2.11</artifactId>
             <version>${spray-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.json4s</groupId>
             <artifactId>json4s-native_2.11</artifactId>
             <version>${json4s-version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-slf4j_2.11</artifactId>
             <version>${akka-version}</version>
         </dependency>
         <dependency>
             <groupId>net.shrine</groupId>
             <artifactId>shrine-messagequeueservice</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hornetq</groupId>
             <artifactId>hornetq-server</artifactId>
             <version>2.4.7.Final</version>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQShutdownContextListener.scala b/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQShutdownContextListener.scala
new file mode 100644
index 000000000..6ac7303ea
--- /dev/null
+++ b/messagequeue/hornetqmom/src/main/scala/net/shrine/hornetqmom/HornetQShutdownContextListener.scala
@@ -0,0 +1,29 @@
+package net.shrine.hornetqmom
+import javax.servlet.{ServletContextEvent, ServletContextListener}
+
+import akka.event.Logging
+import spray.routing.directives.LogEntry
+
+/**
+  * Created by yifan on 8/31/17.
+  */
+
+class HornetQShutdownContextListener extends ServletContextListener {
+  private val hornetQServer: String = "HornetQServer"
+  private val hornetQServerStopper: String = "HornetQServerStopper"
+
+
+  override def contextInitialized(servletContextEvent: ServletContextEvent): Unit = {
+//    val ctx = servletContextEvent.getServletContext
+//    ctx.setAttribute(hornetQServer, LocalHornetQMom)
+//    ctx.setAttribute(hornetQServerStopper, LocalHornetQMomStopper)
+    LogEntry(s"Tomcat context initialized for meta-app", Logging.InfoLevel)
+
+  }
+
+  override def contextDestroyed(servletContextEvent: ServletContextEvent): Unit = {
+//    val ctx = servletContextEvent.getServletContext
+    LocalHornetQMomStopper.stop()
+    LogEntry(s"Tomcat context destroyed and HornetQ server is stopped for meta-app", Logging.InfoLevel)
+  }
+}
\ No newline at end of file