mcconnell    2003/03/17 21:04:16

  Modified:    merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        DefaultBlock.xinfo
  Log:
  Updated to declare block level services and dependency suplimentary declarations as 
optional context entries.
  
  Revision  Changes    Path
  1.3       +4 -2      
avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.xinfo
  
  Index: DefaultBlock.xinfo
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultBlock.xinfo        17 Mar 2003 04:06:15 -0000      1.2
  +++ DefaultBlock.xinfo        18 Mar 2003 05:04:16 -0000      1.3
  @@ -54,10 +54,12 @@
          type="java.util.List"/>
       <entry 
          key="urn:merlin:container.dependencies" 
  -       type="org.apache.avalon.meta.DependencyDescriptor[]"/>
  +       type="org.apache.avalon.meta.DependencyDescriptor[]"
  +       optional="true"/>
       <entry 
          key="urn:merlin:container.services" 
  -       type="org.apache.avalon.meta.ServiceDescriptor[]"/>
  +       type="org.apache.avalon.meta.ServiceDescriptor[]"
  +       optional="true"/>
     </context>
   
     <services>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to