avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-site/src/documentation/content/xdocs/containers index.xml
Date Tue, 15 Apr 2003 02:24:45 GMT
mcconnell    2003/04/14 19:24:45

  Modified:    src/documentation/content/xdocs/containers index.xml
  Log:
  Added link to the Merlin Project.
  
  Revision  Changes    Path
  1.2       +14 -2     avalon-site/src/documentation/content/xdocs/containers/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-site/src/documentation/content/xdocs/containers/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	4 Mar 2003 12:40:50 -0000	1.1
  +++ index.xml	15 Apr 2003 02:24:45 -0000	1.2
  @@ -31,8 +31,20 @@
             facility.
           </p>
   	  </section>
  -  </section>
  -  <section>
  +	  <section>
  +	    <title>Merlin</title>
  +          <p>
  +The <link href="http://avalon.apache.org/sandbox/merlin/">Merlin</link> project
deals with the general area of service and component management.  The Merlin system is a container
that provides comprehensive support for the management of complex component based systems.
Merlin uses a component meta-model to facilitate the automated assembly and deployment of
components.
  +          </p>
  +          <p>
  +            <figure>
  +              <title>Merlin Conceptual Model</title>
  +              <graphic srccredit="Stephen McConnell, 2003" fileref="images/merlin.gif"
format="GIF"/>
  +            </figure>
  +          </p>
  +	  </section>
  +      </section>
  +    <section>
       <title>Other Apache Containers</title>  
   	  <section>
   	    <title>Plexus</title>
  
  
  

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


Mime
View raw message