mcconnell    2003/08/27 21:08:29

  Modified:    merlin/merlin-platform/xdocs/meta index.xml navigation.xml
  Log:
  Updated meta-data spec.
  
  Revision  Changes    Path
  1.4       +19 -30    avalon-sandbox/merlin/merlin-platform/xdocs/meta/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml 24 Aug 2003 15:10:25 -0000      1.3
  +++ index.xml 28 Aug 2003 04:08:29 -0000      1.4
  @@ -11,47 +11,36 @@
   
       <section name="Meta Model">
   
  +    <subsection name="Overview">
  +<p>The Merlin container provides a comprehense mata model supporting component 
deployment.  The meta model provides a set of directives that that provide the 
information necesasary for component deployment.  Underlying the Merlin Meta-Model is 
the <a href="http://avalon.apache.org/sandbox/avalon-meta/index.html";>Avalon Meta-Info 
Model</a> which defines a component type. 
  +</p>
  +    </subsection>
  +
       <subsection name="Index">
         <table>
           <tr><th>Topic</th><th>Description</th></tr>
  -        <tr><td><a 
href="http://avalon.apache.org/sandbox/avalon-meta";>Descriptors</a></td>
  +        <tr><td><a href="kernel/index.html">kernel.xml</a></td>
  +          <td>
  +          The kernel.xml file declares the configuration of a Merlin
  +          kernel instance.
  +          </td>
  +        </tr>
  +        <tr><td><a href="block/index.html">block.xml</a></td>
             <td>
  -          The meta info model is composed of a set of descriptors 
  -          that are used to describe the structural information 
  -          and operation criteria of a component type or service.
  +          The block.xml file declares an executable deployment scenario
  +          described by a root container, sub-containers, components and 
  +          imported block defintions.
             </td>
           </tr>
  -        <tr><td><a href="model/index.html">Directives</a></td>
  +        <tr><td><a href="config/index.html">config.xml</a></td>
             <td>
  -          The meta data model is composed of a set of directives 
  -          that capture the intended usage of a component type. 
  -          Directives are used by the Merlin container to establish
  -          potential deployment scenarios.
  +          A file containing logging categotry and component configuration
  +          overrides.
             </td>
           </tr>
         </table>
       </subsection>
  -    <subsection name="Overview">
  -<p>The Meta Model is an object model describing a type of Avalon component.
  -The meta model encompasses all information about a component that is not
  -specified by its work interface and/or lifecycle interfaces.
  -Specifically, the Meta Model allows for specification of 
  -lifecycle-related constraints/requirments, ie Context, Configuration,
  -Parameter, and Dependency constraints/requirments.
  -</p>
  -<p>
  -The Meta Model API is a set of well-known interfaces and classes that
  -is used to provide a runtime representation of the meta model.
  -</p>
  -<p>
  -The Meta Model DTDs are a set of well-known XML DTDs that provide a
  -mapping of the Meta Model API in XML.
  -</p>
  -<p>
  -The Meta Model XML API provides an implementation of the Meta Model API
  -that takes XML documents following the Meta Model DTDs as source.
  -</p>
  -    </subsection>
  +
       </section>
     </body>
   
  
  
  
  1.4       +3 -2      avalon-sandbox/merlin/merlin-platform/xdocs/meta/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml    24 Aug 2003 15:10:25 -0000      1.3
  +++ navigation.xml    28 Aug 2003 04:08:29 -0000      1.4
  @@ -18,8 +18,9 @@
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html">
  -        <item name="Descriptors" 
href="http://avalon.apache.org/sandbox/avalon-meta"/>
  -        <item name="Directives" href="/meta/model/index.html"/>
  +        <item name="kernel.xml" href="/meta/kernel/index.html"/>
  +        <item name="block.xml" href="/meta/block/index.html"/>
  +        <item name="config.xml" href="/meta/config/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
         <item name="Resources" href="/resources/index.html"/>
  
  
  

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

Reply via email to