Return-Path: 
 <cvs-return-15213-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 15055 invoked by uid 500); 18 Mar 2003 05:04:18 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 15011 invoked by uid 500); 18 Mar 2003 05:04:17 -0000
Received: (qmail 14972 invoked from network); 18 Mar 2003 05:04:17 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 18 Mar 2003 05:04:17 -0000
Received: (qmail 41442 invoked by uid 1438); 18 Mar 2003 05:04:16 -0000
Date: 18 Mar 2003 05:04:16 -0000
Message-ID: <20030318050416.41441.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: avalon-sandbox-cvs@apache.org
Subject: cvs commit:
 avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
 DefaultBlock.xinfo
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org