[exo-jcr-commits] exo-jcr SVN: r5168 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container and 1 other directory.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2011-11-07 11:37:38 -0500 (Mon, 07 Nov 2011)
New Revision: 5168

Added:
   kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java
Modified:
   kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
Log:
EXOJCR-1618: Allow to use StandaloneContainer in web application with hot-redeploy

Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java	2011-11-07 08:06:08 UTC (rev 5167)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java	2011-11-07 16:37:38 UTC (rev 5168)
@@ -329,6 +329,7 @@
    {
       super.stop();
       ExoContainerContext.setTopContainer(null);
+      container = null;
    }
 
    // -------------- Helpers ----------

Added: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java	                        (rev 0)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestStandaloneContainer.java	2011-11-07 16:37:38 UTC (rev 5168)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This 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 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.container;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:nfilotto at exoplatform.com">Nicolas Filotto</a>
+ * @version $Id$
+ *
+ */
+public class TestStandaloneContainer extends TestCase
+{
+
+   public void testHotDeploy() throws Exception
+   {
+      StandaloneContainer.getInstance();
+      ExoContainer container = ExoContainerContext.getTopContainer();
+      assertEquals(container.getClass(), StandaloneContainer.class);
+      container = ExoContainerContext.getCurrentContainer();
+      assertEquals(container.getClass(), StandaloneContainer.class);
+
+      container.stop();
+
+      StandaloneContainer.getInstance();
+      container = ExoContainerContext.getTopContainer();
+      assertEquals(container.getClass(), StandaloneContainer.class);
+      container = ExoContainerContext.getCurrentContainer();
+      assertEquals(container.getClass(), StandaloneContainer.class);
+   }
+}