[jboss-cvs] JBossAS SVN: r60558 - in projects/microcontainer/trunk: dependency/src/main/org/jboss/dependency/spi and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 15 05:13:18 EST 2007
Author: alesj
Date: 2007-02-15 05:13:17 -0500 (Thu, 15 Feb 2007)
New Revision: 60558
Added:
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java
projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/StateConsistencyUnitTestCase.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextActions.java
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/ConstructorContextualInjection.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DemandDependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java
Log:
Initial introduction of PreInstall state / action.
Fixing the tests to be PreInstall state aware.
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -77,6 +77,7 @@
public AbstractController() throws Exception
{
addState(ControllerState.NOT_INSTALLED, null);
+ addState(ControllerState.PRE_INSTALL, null);
addState(ControllerState.DESCRIBED, null);
addState(ControllerState.INSTANTIATED, null);
addState(ControllerState.CONFIGURED, null);
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -21,14 +21,14 @@
*/
package org.jboss.dependency.spi;
-import org.jboss.util.JBossObject;
-import org.jboss.util.JBossStringBuilder;
-
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
+import org.jboss.util.JBossObject;
+import org.jboss.util.JBossStringBuilder;
+
/**
* Description of state.
*
@@ -37,7 +37,7 @@
*/
public class ControllerState extends JBossObject implements Serializable
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
/** Error */
public static final ControllerState ERROR = new ControllerState("**ERROR**");
@@ -45,6 +45,9 @@
/** Not installed state */
public static final ControllerState NOT_INSTALLED = new ControllerState("Not Installed");
+ /** Pre install state */
+ public static final ControllerState PRE_INSTALL = new ControllerState("PreInstall");
+
/** Described state */
public static final ControllerState DESCRIBED = new ControllerState("Described");
@@ -72,6 +75,7 @@
{
values.put(ERROR.getStateString(), ERROR);
values.put(NOT_INSTALLED.getStateString(), NOT_INSTALLED);
+ values.put(PRE_INSTALL.getStateString(), PRE_INSTALL);
values.put(DESCRIBED.getStateString(), DESCRIBED);
values.put(INSTANTIATED.getStateString(), INSTANTIATED);
values.put(CONFIGURED.getStateString(), CONFIGURED);
Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/BasicDependencyTestCase.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -22,7 +22,6 @@
package org.jboss.test.dependency.controller.test;
import junit.framework.Test;
-
import org.jboss.dependency.plugins.AbstractDependencyItem;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
@@ -81,7 +80,7 @@
public void testDependencyWrongOrder() throws Throwable
{
TestDelegate delegate2 = getDelegate2();
- ControllerContext context2 = assertInstall(delegate2, ControllerState.NOT_INSTALLED);
+ ControllerContext context2 = assertInstall(delegate2, ControllerState.PRE_INSTALL);
assertEquals(-1, delegate2.describeInstallOrder);
assertEquals(-1, delegate2.instantiateInstallOrder);
assertEquals(-1, delegate2.configureInstallOrder);
@@ -205,7 +204,7 @@
assertEquals(34, delegate1.configureUninstallOrder);
assertEquals(35, delegate1.instantiateUninstallOrder);
assertEquals(36, delegate1.describeUninstallOrder);
- assertContext("Name2", ControllerState.NOT_INSTALLED);
+ assertContext("Name2", ControllerState.PRE_INSTALL);
assertEquals(19, delegate2.describeInstallOrder);
assertEquals(20, delegate2.instantiateInstallOrder);
assertEquals(21, delegate2.configureInstallOrder);
Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/CrossContextDependencyTestCase.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -22,7 +22,6 @@
package org.jboss.test.dependency.controller.test;
import junit.framework.Test;
-
import org.jboss.dependency.plugins.AbstractDependencyItem;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
@@ -82,7 +81,7 @@
public void testDependencyWrongOrder() throws Throwable
{
OtherDelegate delegate2 = getDelegate2();
- ControllerContext context2 = assertInstall(delegate2, ControllerState.NOT_INSTALLED);
+ ControllerContext context2 = assertInstall(delegate2, ControllerState.PRE_INSTALL);
assertEquals(-1, delegate2.describeInstallOrder);
assertEquals(-1, delegate2.instantiateInstallOrder);
assertEquals(-1, delegate2.configureInstallOrder);
@@ -206,7 +205,7 @@
assertEquals(34, delegate1.configureUninstallOrder);
assertEquals(35, delegate1.instantiateUninstallOrder);
assertEquals(36, delegate1.describeUninstallOrder);
- assertContext("Name2", ControllerState.NOT_INSTALLED);
+ assertContext("Name2", ControllerState.PRE_INSTALL);
assertEquals(19, delegate2.describeInstallOrder);
assertEquals(20, delegate2.instantiateInstallOrder);
assertEquals(21, delegate2.configureInstallOrder);
Modified: projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/StateConsistencyUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/StateConsistencyUnitTestCase.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/dependency/src/tests/org/jboss/test/dependency/controller/test/StateConsistencyUnitTestCase.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -24,7 +24,6 @@
import java.util.HashMap;
import junit.framework.Test;
-
import org.jboss.dependency.plugins.AbstractControllerContext;
import org.jboss.dependency.plugins.AbstractControllerContextActions;
import org.jboss.dependency.plugins.spi.action.ControllerContextAction;
@@ -62,7 +61,7 @@
{
try
{
- assertChange(ctx, ControllerState.DESCRIBED);
+ assertChange(ctx, ControllerState.PRE_INSTALL);
}
catch (Throwable t)
{
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -22,12 +22,17 @@
package org.jboss.beans.metadata.plugins;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
-import org.jboss.beans.metadata.spi.*;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
+import org.jboss.beans.metadata.spi.MetaDataVisitor;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
+import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
@@ -94,7 +99,7 @@
public void initialVisit(MetaDataVisitor visitor)
{
- visitor.setContextState(ControllerState.DESCRIBED);
+ visitor.setContextState(ControllerState.PRE_INSTALL);
visitor.initialVisit(this);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -28,11 +28,8 @@
import org.jboss.dependency.plugins.AbstractDependencyItem;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.config.KernelConfigurator;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
import org.jboss.metadata.spi.MetaData;
@@ -46,81 +43,26 @@
{
protected void installActionInternal(KernelControllerContext context) throws Throwable
{
- KernelController controller = (KernelController) context.getController();
- Kernel kernel = controller.getKernel();
- KernelConfigurator configurator = kernel.getConfigurator();
-
- BeanMetaData metaData = context.getBeanMetaData();
- if (metaData.getBean() != null)
+ BeanInfo info = context.getBeanInfo();
+ if (info != null)
{
- BeanInfo info = configurator.getBeanInfo(metaData);
- context.setBeanInfo(info);
-
- MetaData md = addMetaData(context);
- try
+ KernelController controller = (KernelController)context.getController();
+ KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
+ MetaData md = repository.getMetaData(context);
+ DependencyInfo depends = context.getDependencyInfo();
+ // add custom dependencies (e.g. AOP layer).
+ List<Object> dependencies = info.getDependencies(md);
+ log.trace("Extra dependencies for " + context.getName() + " " + dependencies);
+ if (dependencies != null)
{
- DependencyInfo depends = context.getDependencyInfo();
- // add custom dependencies (e.g. AOP layer).
- List<Object> dependencies = info.getDependencies(md);
- log.trace("Extra dependencies for " + context.getName() + " " + dependencies);
- if (dependencies != null)
+ BeanMetaData metaData = context.getBeanMetaData();
+ for (Object dependencyName : dependencies)
{
- for (Object dependencyName : dependencies)
- {
- AbstractDependencyItem dependency = new AbstractDependencyItem(metaData.getName(), dependencyName, ControllerState.INSTANTIATED, ControllerState.INSTALLED);
- depends.addIDependOn(dependency);
- }
+ AbstractDependencyItem dependency = new AbstractDependencyItem(metaData.getName(), dependencyName, ControllerState.INSTANTIATED, ControllerState.INSTALLED);
+ depends.addIDependOn(dependency);
}
}
- catch (Throwable t)
- {
- removeMetaData(context);
- throw t;
- }
}
}
- protected Class<? extends KernelControllerContextAware> getActionAwareInterface()
- {
- return null;
- }
-
- protected void uninstallActionInternal(KernelControllerContext context)
- {
- removeMetaData(context);
- context.setBeanInfo(null);
- }
-
- /**
- * Adds annotations to the bean.
- *
- * @param context the context
- * @return the metadata
- */
- private MetaData addMetaData(KernelControllerContext context)
- {
- KernelController controller = (KernelController) context.getController();
- KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
- repository.addMetaData(context);
- return repository.getMetaData(context);
- }
-
- /**
- * Remove any previously added metadata
- *
- * @param context the context
- */
- private void removeMetaData(KernelControllerContext context)
- {
- try
- {
- KernelController controller = (KernelController) context.getController();
- KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
- repository.removeMetaData(context);
- }
- catch (Throwable ignored)
- {
- log.warn("Unexpected error removing metadata: ", ignored);
- }
- }
}
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextActions.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextActions.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextActions.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -57,6 +57,7 @@
if (instance == null)
{
Map<ControllerState, ControllerContextAction> actions = new HashMap<ControllerState, ControllerContextAction>();
+ actions.put(ControllerState.PRE_INSTALL, new PreInstallAction());
actions.put(ControllerState.DESCRIBED, new DescribeAction());
actions.put(ControllerState.INSTANTIATED, new InstantiateAction());
actions.put(ControllerState.CONFIGURED, new ConfigureAction());
@@ -78,6 +79,7 @@
if (noInstantiate == null)
{
Map<ControllerState, ControllerContextAction> actions = new HashMap<ControllerState, ControllerContextAction>();
+ actions.put(ControllerState.PRE_INSTALL, new PreInstallAction());
actions.put(ControllerState.DESCRIBED, new DescribeAction());
actions.put(ControllerState.CONFIGURED, new ConfigureAction());
actions.put(ControllerState.CREATE, new CreateDestroyLifecycleAction());
Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/PreInstallAction.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -0,0 +1,103 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.kernel.plugins.dependency;
+
+import org.jboss.beans.info.spi.BeanInfo;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
+import org.jboss.metadata.spi.MetaData;
+
+/**
+ * PreInstallAction.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PreInstallAction extends KernelControllerContextAction
+{
+ protected void installActionInternal(KernelControllerContext context) throws Throwable
+ {
+ KernelController controller = (KernelController) context.getController();
+ Kernel kernel = controller.getKernel();
+ KernelConfigurator configurator = kernel.getConfigurator();
+
+ BeanMetaData metaData = context.getBeanMetaData();
+ if (metaData.getBean() != null)
+ {
+ BeanInfo info = configurator.getBeanInfo(metaData);
+ context.setBeanInfo(info);
+
+ MetaData md = addMetaData(context);
+ try
+ {
+ // todo
+ }
+ catch (Throwable t)
+ {
+ removeMetaData(context);
+ throw t;
+ }
+ }
+ }
+
+ protected void uninstallActionInternal(KernelControllerContext context)
+ {
+ removeMetaData(context);
+ context.setBeanInfo(null);
+ }
+
+ /**
+ * Adds annotations to the bean.
+ *
+ * @param context the context
+ * @return the metadata
+ */
+ private MetaData addMetaData(KernelControllerContext context)
+ {
+ KernelController controller = (KernelController) context.getController();
+ KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
+ repository.addMetaData(context);
+ return repository.getMetaData(context);
+ }
+
+ /**
+ * Remove any previously added metadata
+ *
+ * @param context the context
+ */
+ private void removeMetaData(KernelControllerContext context)
+ {
+ try
+ {
+ KernelController controller = (KernelController) context.getController();
+ KernelMetaDataRepository repository = controller.getKernel().getMetaDataRepository();
+ repository.removeMetaData(context);
+ }
+ catch (Throwable ignored)
+ {
+ log.warn("Unexpected error removing metadata: ", ignored);
+ }
+ }
+}
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/ConstructorContextualInjection.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/ConstructorContextualInjection.xml 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/inject/test/ConstructorContextualInjection.xml 2007-02-15 10:13:17 UTC (rev 60558)
@@ -32,7 +32,7 @@
<bean name="testObject5" class="org.jboss.test.kernel.inject.support.ConstructorInjectTestObject" >
<constructor factoryMethod="withParameter">
- <factory bean="testObject6" whenRequired="Described"/>
+ <factory bean="testObject6" whenRequired="PreInstall"/>
<parameter><inject/></parameter>
</constructor>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DemandDependencyTestCase.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/DemandDependencyTestCase.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -24,7 +24,6 @@
import java.util.HashSet;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
@@ -102,7 +101,7 @@
{
demandDependencyWrongOrder();
- ControllerContext context2 = assertInstall(1, "Name2", ControllerState.NOT_INSTALLED);
+ ControllerContext context2 = assertInstall(1, "Name2", ControllerState.PRE_INSTALL);
ControllerContext context1 = assertInstall(0, "Name1");
assertEquals(ControllerState.INSTALLED, context2.getState());
@@ -153,10 +152,10 @@
assertUninstall("Name1");
assertEquals(ControllerState.ERROR, context1.getState());
- assertEquals(ControllerState.NOT_INSTALLED, context2.getState());
+ assertEquals(ControllerState.PRE_INSTALL, context2.getState());
assertNotInstalled("Name2");
- assertContext("Name2", ControllerState.NOT_INSTALLED);
+ assertContext("Name2", ControllerState.PRE_INSTALL);
context1 = assertInstall(0, "Name1");
assertNotNull(context1);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java 2007-02-15 01:14:06 UTC (rev 60557)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/dependency/test/GenericBeanFactoryDemandDependencyTestCase.java 2007-02-15 10:13:17 UTC (rev 60558)
@@ -24,7 +24,6 @@
import java.util.HashSet;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
@@ -100,7 +99,7 @@
{
demandDependencyWrongOrder();
- ControllerContext context2 = assertInstall(1, "Name2", ControllerState.NOT_INSTALLED);
+ ControllerContext context2 = assertInstall(1, "Name2", ControllerState.PRE_INSTALL);
ControllerContext context1 = assertInstall(0, "Name1");
assertEquals(ControllerState.INSTALLED, context2.getState());
@@ -150,10 +149,10 @@
assertUninstall("Name1");
assertEquals(ControllerState.ERROR, context1.getState());
- assertEquals(ControllerState.NOT_INSTALLED, context2.getState());
+ assertEquals(ControllerState.PRE_INSTALL, context2.getState());
assertNotInstalled("Name2");
- assertContext("Name2", ControllerState.NOT_INSTALLED);
+ assertContext("Name2", ControllerState.PRE_INSTALL);
context1 = assertInstall(0, "Name1");
assertNotNull(context1);
More information about the jboss-cvs-commits
mailing list