avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/xdocs/reference/component/lifestyle navigation.xml
Date Mon, 05 Apr 2004 02:12:34 GMT
mcconnell    2004/04/04 19:12:34

  Modified:    merlin/platform/xdocs/merlin/systems composition.xml
                        meta.xml repository.xml
               merlin/platform/xdocs/reference/component/lifestyle
                        navigation.xml
  Log:
  Site updates.
  
  Revision  Changes    Path
  1.3       +3 -0      avalon/merlin/platform/xdocs/merlin/systems/composition.xml
  
  Index: composition.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/composition.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- composition.xml	4 Apr 2004 23:33:56 -0000	1.2
  +++ composition.xml	5 Apr 2004 02:12:34 -0000	1.3
  @@ -33,6 +33,8 @@
         Merlin model-drive architecture.
         </p>
   
  +      <subsection name="Aspects">
  +
         <table>
           <tr>
             <th>Feature</th><th>Description</th>
  @@ -88,6 +90,7 @@
             </td>
           </tr>
         </table>
  +      </subsection>
   
       </section>
   
  
  
  
  1.3       +5 -2      avalon/merlin/platform/xdocs/merlin/systems/meta.xml
  
  Index: meta.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/meta.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- meta.xml	4 Apr 2004 23:33:56 -0000	1.2
  +++ meta.xml	5 Apr 2004 02:12:34 -0000	1.3
  @@ -27,10 +27,12 @@
         <p>
         The <a href="http://avalon.apache.org/meta">Avalon Meta</a> system 
         provides Merlin's foundation for the management of component 
  -      type defintions.  It is used extensively withing the 
  +      type defintions.  It is used extensively within the 
         <a href="composition.html">Avalon Composition Framework</a> as the
  -      underlying meta-info layer within the overall container meta-model.
  +      underlying meta-info layer of the containment meta-model.
         </p>
  +
  +      <subsection name="Aspects">
         <table>
           <tr>
             <th>Feature</th><th>Description</th>
  @@ -66,6 +68,7 @@
             </td>
           </tr>
         </table>
  +      </subsection>
       </section>
     </body>
   </document>
  
  
  
  1.3       +16 -8     avalon/merlin/platform/xdocs/merlin/systems/repository.xml
  
  Index: repository.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/repository.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- repository.xml	4 Apr 2004 23:33:56 -0000	1.2
  +++ repository.xml	5 Apr 2004 02:12:34 -0000	1.3
  @@ -34,15 +34,23 @@
         framework. 
         </p>
   
  -      <subsection name="Overview">
  +      <subsection name="Aspects">
   
  -        <p>
  -        The Avalon Repository is a Java <a href="about/api/index.html">API</a>,

  -        <a href="about/spi.html">SPI</a>, <a href="about/reference.html">reference

  -        implementation</a> and <a href="about/bootstrap.html">bootstrap platform</a>

  -        that provides support for the dynamic artifact loading, classloader chain 
  -        creation, and generic application bootstrapping.
  -        </p>
  +      <table>
  +        <tr>
  +          <th>Feature</th><th>Description</th>
  +        </tr>
  +        <tr>
  +          <td>Resource Management API</td>
  +          <td>
  +          The Avalon Repository is a Java <a href="about/api/index.html">API</a>,

  +          <a href="about/spi.html">SPI</a>, <a href="about/reference.html">reference

  +          implementation</a> and <a href="about/bootstrap.html">bootstrap platform</a>

  +          that provides support for the dynamic artifact loading, classloader chain 
  +          creation, and generic application bootstrapping.
  +          </td>
  +        </tr>
  +      </table>
   
         </subsection>
   
  
  
  
  1.9       +0 -4      avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- navigation.xml	4 Apr 2004 15:49:06 -0000	1.8
  +++ navigation.xml	5 Apr 2004 02:12:34 -0000	1.9
  @@ -47,10 +47,6 @@
             <item name="Artifacts" href="/reference/component/artifacts/index.html"/>
             <item name="Lifecycle" href="/reference/component/lifecycle/index.html"/>
             <item name="Lifestyle" href="/reference/component/lifestyle/index.html">
  -            <item name="Transient" href="/reference/component/lifecycle/index.html#Transient"/>
  -            <item name="Thread" href="/reference/component/lifecycle/index.html#Thread"/>
  -            <item name="Pooled" href="/reference/component/lifecycle/index.html#Pooled"/>
  -            <item name="Singleton" href="/reference/component/lifecycle/index.html#Singleton"/>
             </item>
           </item>
           <item name="Container Specification" href="/reference/containment/index.html"/>
  
  
  

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


Mime
View raw message