You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/03/17 03:52:53 UTC

cvs commit: avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance DependencyGraph.java Appliance.java

mcconnell    2003/03/16 18:52:53

  Modified:    merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance
                        DependencyGraph.java Appliance.java
  Log:
  Resolution of appliance dependency moved from type descriptor to appliance.
  
  Revision  Changes    Path
  1.2       +14 -9     avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java
  
  Index: DependencyGraph.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DependencyGraph.java	13 Mar 2003 01:04:39 -0000	1.1
  +++ DependencyGraph.java	17 Mar 2003 02:52:52 -0000	1.2
  @@ -350,7 +350,7 @@
                                    final ArrayList order )
       {
           //
  -        // get the context provider appliance
  +        // get the contextualization phase provider appliance
           //
   
           Appliance contextProvider = appliance.getContextProvider();
  @@ -360,8 +360,8 @@
           }
   
           //
  -        // get all of the extensions that provide extension
  -        // support to the subject appliance
  +        // get all of the extensions that provide lifecycle stage
  +        // support to the target appliance
           //
   
           final StageDescriptor[] stages = appliance.getType().getStages();
  @@ -376,12 +376,17 @@
           }
   
           //
  -        // get all of the appliance instances that are service providers
  -        // towards the target appliance
  +        // get the set of runtime dependencies for the object managed
  +        // by this appliance
           //
   
           final DependencyDescriptor[] descriptors =
  -            appliance.getType().getDependencies();
  +            appliance.getDependencies();
  +
  +        //
  +        // for each runtime dependency make sure we have an assigned 
  +        // provider appliance
  +        //
   
           for( int i = 0; i < descriptors.length; i++ )
           {
  @@ -405,8 +410,8 @@
       }
   
       /**
  -     * Traverse all Consumers of an appliance. ie Anyone that uses
  -     * service provided by the appliance.
  +     * Traverse all consumers of an appliance. I.e. all appliances that use
  +     * service provided by supplied appliance.
        *
        * @param appliance the Appliance
        */
  
  
  
  1.2       +8 -1      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java
  
  Index: Appliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Appliance.java	13 Mar 2003 01:04:35 -0000	1.1
  +++ Appliance.java	17 Mar 2003 02:52:52 -0000	1.2
  @@ -119,6 +119,13 @@
       Type getType();
   
       /**
  +     * Return the set of runtime dependencies for the type.
  +     *
  +     * @return the set of runtim dependencies.
  +     */
  +    DependencyDescriptor[] getDependencies();
  +
  +    /**
        * Return the activation policy for the component.  If TRUE, activation
        * will occur at startup.  If false, activation will be deferred to
        * the first lookup invocation if any (i.e. lazy activation).
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org