[jboss-cvs] JBossAS SVN: r91082 - in projects/kernel/trunk/dependency/src: main/java/org/jboss/dependency/spi and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 10 10:58:54 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-07-10 10:58:54 -0400 (Fri, 10 Jul 2009)
New Revision: 91082
Added:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/asynchronous/
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/asynchronous/AsynchronousController.java
Modified:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AsynchronousTestCase.java
Log:
[JBKERNEL-46] Mechanism to determine if an asynchronous context is currently in progress
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2009-07-10 14:55:52 UTC (rev 91081)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2009-07-10 14:58:54 UTC (rev 91082)
@@ -49,6 +49,7 @@
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
import org.jboss.dependency.spi.LifecycleCallbackItem;
+import org.jboss.dependency.spi.asynchronous.AsynchronousController;
import org.jboss.dependency.spi.graph.GraphController;
import org.jboss.dependency.spi.graph.LookupStrategy;
import org.jboss.dependency.spi.graph.SearchInfo;
@@ -62,7 +63,7 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision$
*/
-public class AbstractController extends JBossObject implements Controller, ControllerStateModel, GraphController, AbstractControllerMBean
+public class AbstractController extends JBossObject implements Controller, ControllerStateModel, GraphController, AbstractControllerMBean, AsynchronousController
{
/** The lock */
private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -2111,6 +2112,14 @@
return states.iterator();
}
+ public boolean isAsynchronousInstallInProgress(ControllerContext context)
+ {
+ if (context.getMode() != ControllerMode.ASYNCHRONOUS)
+ return false;
+
+ return contextsInstalledByExecutor.isBeingInstalled(context);
+ }
+
/**
* Get the state index.
*
Added: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/asynchronous/AsynchronousController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/asynchronous/AsynchronousController.java (rev 0)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/asynchronous/AsynchronousController.java 2009-07-10 14:58:54 UTC (rev 91082)
@@ -0,0 +1,42 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* 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.jboss.dependency.spi.asynchronous;
+
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+
+/**
+ * Interface implemented by {@link Controller} implementations
+ * that support asynchronous deployments
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface AsynchronousController
+{
+ /**
+ * Checks if a controller context is currently being installed asynchronously
+ * @param ctx The controller context
+ * @return true if an asynchronous context and it is currently being installed asynchronously
+ */
+ boolean isAsynchronousInstallInProgress(ControllerContext ctx);
+}
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AsynchronousTestCase.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AsynchronousTestCase.java 2009-07-10 14:55:52 UTC (rev 91081)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/AsynchronousTestCase.java 2009-07-10 14:58:54 UTC (rev 91082)
@@ -36,6 +36,7 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.asynchronous.AsynchronousController;
import org.jboss.test.dependency.controller.support.AsynchronousTestDelegate;
import org.jboss.test.dependency.controller.support.Synchronizer;
import org.jboss.test.dependency.controller.support.TestControllerContext;
@@ -735,6 +736,52 @@
}
}
+ public void testAsynchrounousContextsInProgress() throws Throwable
+ {
+ setExecutorInController(2);
+ Synchronizer installSynchronizer = new Synchronizer(2);
+ AsynchronousTestDelegate delegate1 = getAsynchronousDelegate("Bean1", installSynchronizer);
+ ControllerContext ctx1 = null;
+ AsynchronousTestDelegate delegate2 = getAsynchronousDelegate("Bean2", installSynchronizer);
+ ControllerContext ctx2 = null;
+ try
+ {
+ ctx1 = createAndInstallContext(delegate1, ControllerState.INSTALLED);
+ if (ctx1.getState() == ControllerState.INSTALLED)
+ {
+ fail("Should have been installed asynchronously");
+ }
+ ctx2 = createAndInstallContext(delegate2, ControllerState.INSTALLED);
+ if (ctx1.getState() == ControllerState.INSTALLED)
+ {
+ fail("Should have been installed asynchronously");
+ }
+
+ assertTrue(((AsynchronousController)controller).isAsynchronousInstallInProgress(ctx1));
+ assertTrue(((AsynchronousController)controller).isAsynchronousInstallInProgress(ctx2));
+ installSynchronizer.waitForWorkersAndEmitStartSignal();
+ installSynchronizer.waitForWorkersToEnd();
+ assertInstalled(ctx1);
+ assertInstalled(ctx2);
+ assertFalse(((AsynchronousController)controller).isAsynchronousInstallInProgress(ctx1));
+ assertFalse(((AsynchronousController)controller).isAsynchronousInstallInProgress(ctx2));
+ }
+ finally
+ {
+ try
+ {
+ uninstallContext(ctx1);
+ uninstallContext(ctx2);
+ assertUninstalled(ctx1);
+ assertUninstalled(ctx2);
+ }
+ finally
+ {
+ clearExecutorInController();
+ }
+ }
+ }
+
private void setExecutorInController(int threads)
{
Executor executor = null;
More information about the jboss-cvs-commits
mailing list