[jboss-cvs] microkernel/src/main/org/jboss/kernel/plugins/dependency/basic ...

[Adrian B. <adr...@jb...>]

  User: adrian  
  Date: 05/05/20 16:46:29

  Modified:    src/main/org/jboss/kernel/plugins/dependency/basic 
                        BasicKernelController.java
  Log:
  Fix the support for lifecycle dependency and write some tests.
  Also made this a separate piece of metadata
  <depends>OtherName</depends>
  since this doesn't really have the same semantics as <demands/>
  
  Revision  Changes    Path
  1.11      +22 -1     microkernel/src/main/org/jboss/kernel/plugins/dependency/basic/BasicKernelController.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BasicKernelController.java
  ===================================================================
  RCS file: /cvsroot/jboss/microkernel/src/main/org/jboss/kernel/plugins/dependency/basic/BasicKernelController.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- BasicKernelController.java	3 May 2005 14:16:20 -0000	1.10
  +++ BasicKernelController.java	20 May 2005 20:46:29 -0000	1.11
  @@ -11,6 +11,7 @@
   import java.util.Map;
   import java.util.Set;
   
  +import org.jboss.beans.metadata.spi.DependencyMetaData;
   import org.jboss.beans.metadata.spi.PropertyMetaData;
   import org.jboss.beans.metadata.spi.BeanMetaData;
   import org.jboss.beans.metadata.spi.DemandMetaData;
  @@ -36,7 +37,7 @@
    * Basic Kernel controller.
    * 
    * @author <a href="ad...@jb...">Adrian Brock</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class BasicKernelController extends AbstractKernelController implements KernelRegistryFactory
   {
  @@ -249,6 +250,26 @@
                  log.trace("Added dependency: " + item);
            }
            
  +         // Dependency
  +         else if (node instanceof DependencyMetaData)
  +         {
  +            DependencyMetaData dependency = (DependencyMetaData) node;
  +
  +            DependencyItem item = createDependencyItem(KernelControllerState.CREATE, dependency.getDependency(), beanName, KernelControllerState.CREATE);
  +            item.setController(BasicKernelController.this);
  +            info.addIDependOn(item);
  +            
  +            if (trace)
  +               log.trace("Added create dependency: " + item);
  +
  +            item = createDependencyItem(KernelControllerState.START, dependency.getDependency(), beanName, KernelControllerState.START);
  +            item.setController(BasicKernelController.this);
  +            info.addIDependOn(item);
  +            
  +            if (trace)
  +               log.trace("Added start dependency: " + item);
  +         }
  +         
            // Demand
            else if (node instanceof DemandMetaData)
            {