cvs commit: avalon-sandbox/merlin/src/xdocs classpath.xml

8 Jan 2003 23:21:59 -0000 

mcconnell    2003/01/08 15:21:53

  Modified:    merlin/src/test/config block.xml
               merlin/src/xdocs classpath.xml
  Log:
  Updated documentation to reflect the different classlpath declaration 
possibilities that exist at the kernel, block and container levels.
  
  Revision  Changes    Path
  1.13      +1 -0      avalon-sandbox/merlin/src/test/config/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/test/config/block.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- block.xml 8 Jan 2003 21:24:27 -0000       1.12
  +++ block.xml 8 Jan 2003 23:21:52 -0000       1.13
  @@ -18,6 +18,7 @@
      to a root container who's name is implied by the name of the block.
      -->
      <implementation src="external.xml">
  +
        <!-- use external file or embedded defintion -->
        <!-- a container can contain a classpath declaration -->
        <!-- a container can contain nested appliance declarations -->
  
  
  
  1.2       +61 -16    avalon-sandbox/merlin/src/xdocs/classpath.xml
  
  Index: classpath.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/xdocs/classpath.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- classpath.xml     1 Dec 2002 06:43:22 -0000       1.1
  +++ classpath.xml     8 Jan 2003 23:21:53 -0000       1.2
  @@ -23,6 +23,7 @@
   
   <source>
     &lt;kernel&gt;
  +    &lt;engine&gt;
   </source>
   
   <p><font color="gray"><i>&lt;!-- 
  @@ -30,10 +31,10 @@
   --&gt;</i></font></p>
   
   <source>
  -    &lt;ibrary dir="<font color="darkred">.</font>"&gt;
  -      &lt;include name="<font color="darkred">dist</font>"/&gt;
  -      &lt;include name="<font color="darkred">lib</font>"/&gt;
  -    &lt;/ibrary"&gt;
  +      &lt;library dir="<font color="darkred">.</font>"&gt;
  +        &lt;include name="<font color="darkred">dist</font>"/&gt;
  +        &lt;include name="<font color="darkred">lib</font>"/&gt;
  +      &lt;/ibrary"&gt;
   </source>
   
       <p><font color="gray"><i>&lt;!-- 
  @@ -41,17 +42,19 @@
       --&gt;</i></font></p>
   
   <source>
  +    &lt;/engine&gt;
     &lt;/kernel&gt;
   </source>
   
       </s2>
   
  -    <s2 title="Classpath Managment">
  +    <s2 title="Kernel Classpath Managment">
   <a href="extension"/>
   <p>A classpath declaration may occur at kernel and container scope.  A 
kernel classpath is accessible by the root container and all subsidiary 
containers.  A classpath declared at container scope is accessible only to the 
immediate container in which the classpath is defined and its subsidiary 
containers. An example of a classpath declaration is included below.</p>
   
   <source>
     &lt;kernel&gt;
  +    &lt;engine&gt;
   </source>
   
   <p><font color="gray"><i>&lt;!-- 
  @@ -59,12 +62,12 @@
   --&gt;</i></font></p>
   
   <source>
  -    &lt;classpath"&gt;
  -      &lt;fileset dir="<font color="darkred">lib</font>"&gt;
  -        &lt;include name="<font 
color="darkred">avalon-framework.jar</font>"/&gt;
  -        &lt;include name="<font color="darkred">logkit.jar</font>"/&gt;
  -      &lt;/fileset&gt;
  -    &lt;/classpath"&gt;
  +      &lt;classpath"&gt;
  +        &lt;fileset dir="<font color="darkred">lib</font>"&gt;
  +          &lt;include name="<font 
color="darkred">avalon-framework.jar</font>"/&gt;
  +          &lt;include name="<font color="darkred">logkit.jar</font>"/&gt;
  +        &lt;/fileset&gt;
  +      &lt;/classpath"&gt;
   </source>
   
       <p><font color="gray"><i>&lt;!-- 
  @@ -72,14 +75,53 @@
       --&gt;</i></font></p>
   
   <source>
  -    &lt;container name="<font color="darkred">root</font>"&gt;
  +    &lt;/engine&gt;
  +  &lt;/kernel&gt;
  +</source>
  +
  +</s2>
  +<s2 title="Root Container Classpath Declaration">
  +
  +<p><font color="gray"><i>&lt;!-- 
  +Declaration of the root container classpath.
  +--&gt;</i></font></p>
  +
  +<source>
  +    &lt;block&gt;
  +      &lt;implementation&gt;
  +        &lt;engine&gt;
  +
  +          &lt;classpath"&gt;
  +            &lt;fileset dir="<font color="darkred">dist</font>"&gt;
  +              &lt;include name="<font color="darkred">demo.jar</font>"/&gt;
  +            &lt;/fileset&gt;
  +          &lt;/classpath"&gt;
  +
  +        &lt;/engine&gt;
  +</source>
  +
  +<p><font color="gray"><i>&lt;!-- 
  +Component appliance declarations and/or subsidiary containers will normally 
appear here.
  +--&gt;</i></font></p>
  +
  +<source>
  +      &lt;/implementation&gt;
  +    &lt;/block&gt;
   </source>
   
  +</s2>
  +<s2 title="Nested Container Classpath Declaration">
  +
   <p><font color="gray"><i>&lt;!-- 
   Declaration of a container level classpath.
   --&gt;</i></font></p>
   
   <source>
  +    &lt;container name="<font color="darkred">demo</font>"&gt;
  +      &lt;engine&gt;
  +</source>
  +
  +<source>
         &lt;classpath"&gt;
           &lt;fileset dir="<font color="darkred">dist</font>"&gt;
             &lt;include name="<font color="darkred">demo.jar</font>"/&gt;
  @@ -87,13 +129,16 @@
         &lt;/classpath"&gt;
   </source>
   
  +<source>
  +    &lt;/engine&gt;
  +</source>
  +
   <p><font color="gray"><i>&lt;!-- 
  -Component profiles and/or subsidiary containers will normally appear here.
  +Appliance and/or subsidiary container declarations will normally appear here.
   --&gt;</i></font></p>
   
   <source>
  -    &lt;/container&gt;
  -  &lt;/kernel&gt;
  +  &lt;/container&gt;
   </source>
   
       </s2>
  
  
  

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

Reply via email to