- * Forcibly kills Alfresco's EHCache CacheManager
*/
public void contextDestroyed(ServletContextEvent event)
{
- InternalEhCacheManagerFactoryBean.getInstance().shutdown();
+ synchronized(this)
+ {
+ if (enterpriseListener != null)
+ {
+ // Perform any extra destruction required for enterprise.
+ enterpriseListener.contextDestroyed(event);
+ }
+ }
}
/**
@@ -152,4 +188,16 @@ public class ContextListener implements ServletContextListener, HttpSessionListe
if (logger.isDebugEnabled())
logger.debug("HTTP session destroyed: " + event.getSession().getId());
}
+
+ /**
+ * Inject a different class name (from the default) for the enterprise ServletContextListener.
+ *
+ * Useful for testing.
+ *
+ * @param listenerClass Class name to use.
+ */
+ protected void setEnterpriseListenerClass(String listenerClass)
+ {
+ this.enterpriseListenerClass = listenerClass;
+ }
}
diff --git a/source/java/org/alfresco/web/app/ContextListenerTest.java b/source/java/org/alfresco/web/app/ContextListenerTest.java
new file mode 100644
index 0000000000..bc06ac112b
--- /dev/null
+++ b/source/java/org/alfresco/web/app/ContextListenerTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.web.app;
+
+import static org.junit.Assert.*;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+/**
+ * Tests for the ContextListener class.
+ *
+ * @author Matt Ward
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ContextListenerTest
+{
+ private ContextListener contextListener;
+ private @Mock ServletContextEvent event;
+
+
+ @Before
+ public void setUp() throws Exception
+ {
+ contextListener = new ContextListener();
+ contextListener.setEnterpriseListenerClass("org.alfresco.web.app.ContextListenerTest$StubEnterpriseListener");
+ StubEnterpriseListener.enterpriseDestroyed = false;
+ }
+
+ @Test
+ public void testContextDestroyed()
+ {
+ contextListener.findEnterpriseListener();
+ contextListener.contextDestroyed(event);
+
+ assertTrue("Enterprise contextDestroyed() not executed.", StubEnterpriseListener.enterpriseDestroyed);
+ }
+
+
+ /**
+ * ServletContextListener to simulate an enterprise-specific context listener.
+ */
+ protected static class StubEnterpriseListener implements ServletContextListener
+ {
+ static boolean enterpriseDestroyed;
+
+ @Override
+ public void contextDestroyed(ServletContextEvent arg0)
+ {
+ enterpriseDestroyed = true;
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent arg0)
+ {
+ // Noop
+ }
+ }
+}