You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/04 05:46:32 UTC

cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/resources notebook.xml

mcconnell    2003/06/03 20:46:32

  Modified:    merlin/merlin-smp/xdocs/meta/info navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type info.xml
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/context index.xml
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/dependencies
                        dependency.xml navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/extensions
                        extension.xml navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/loggers logger.xml
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/services
                        navigation.xml service.xml
               merlin/merlin-smp/xdocs/meta/info/type/stages navigation.xml
                        stage.xml
               merlin/merlin-smp/xdocs/resources notebook.xml
  Log:
  Addition of attributes and attribute documetation to the meta-info doc suite.
  
  Revision  Changes    Path
  1.10      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	30 May 2003 09:52:58 -0000	1.9
  +++ navigation.xml	4 Jun 2003 03:46:30 -0000	1.10
  @@ -21,6 +21,7 @@
           <item name="Meta Info" href="/meta/info/index.html">
             <item name="Type" href="/meta/info/type/index.html"/>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/info.xml
  
  Index: info.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/info.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- info.xml	25 Apr 2003 17:02:46 -0000	1.2
  +++ info.xml	4 Jun 2003 03:46:31 -0000	1.3
  @@ -26,7 +26,7 @@
               </td>
             </tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                Declaration of a set of attributes associated with the component type.
               </td>
  
  
  
  1.10      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	30 May 2003 09:52:58 -0000	1.9
  +++ navigation.xml	4 Jun 2003 03:46:31 -0000	1.10
  @@ -29,6 +29,7 @@
               <item name="Extensions" href="/meta/info/type/extensions/index.html"/>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/context/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/context/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	25 Apr 2003 17:02:46 -0000	1.2
  +++ index.xml	4 Jun 2003 03:46:31 -0000	1.3
  @@ -35,7 +35,7 @@
               </td>
             </tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                A set of optional attribute declarations.
               </td>
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/context/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	30 May 2003 09:52:58 -0000	1.4
  +++ navigation.xml	4 Jun 2003 03:46:31 -0000	1.5
  @@ -31,6 +31,7 @@
               <item name="Extensions" href="/meta/info/type/extensions/index.html"/>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/dependencies/dependency.xml
  
  Index: dependency.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/dependencies/dependency.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- dependency.xml	25 Apr 2003 17:02:47 -0000	1.2
  +++ dependency.xml	4 Jun 2003 03:46:31 -0000	1.3
  @@ -45,7 +45,7 @@
           <table>
             <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                A set of attribute declarations.
               </td>
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/dependencies/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	30 May 2003 09:52:59 -0000	1.4
  +++ navigation.xml	4 Jun 2003 03:46:31 -0000	1.5
  @@ -31,6 +31,7 @@
               <item name="Extensions" href="/meta/info/type/extensions/index.html"/>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/extensions/extension.xml
  
  Index: extension.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/extensions/extension.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- extension.xml	25 Apr 2003 17:02:47 -0000	1.2
  +++ extension.xml	4 Jun 2003 03:46:31 -0000	1.3
  @@ -28,7 +28,7 @@
           <table>
             <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                A set of attribute declarations.
               </td>
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/extensions/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/extensions/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	30 May 2003 09:52:59 -0000	1.4
  +++ navigation.xml	4 Jun 2003 03:46:31 -0000	1.5
  @@ -31,6 +31,7 @@
               </item>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/loggers/logger.xml
  
  Index: logger.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/loggers/logger.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- logger.xml	25 Apr 2003 17:02:47 -0000	1.2
  +++ logger.xml	4 Jun 2003 03:46:31 -0000	1.3
  @@ -26,7 +26,7 @@
           <table>
             <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                A set of attribute declarations.
               </td>
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/loggers/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/loggers/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	30 May 2003 09:52:59 -0000	1.4
  +++ navigation.xml	4 Jun 2003 03:46:31 -0000	1.5
  @@ -31,6 +31,7 @@
               <item name="Extensions" href="/meta/info/type/extensions/index.html"/>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/services/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/services/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	30 May 2003 09:52:59 -0000	1.4
  +++ navigation.xml	4 Jun 2003 03:46:31 -0000	1.5
  @@ -31,6 +31,7 @@
               <item name="Extensions" href="/meta/info/type/extensions/index.html"/>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/services/service.xml
  
  Index: service.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/services/service.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- service.xml	25 Apr 2003 17:02:47 -0000	1.2
  +++ service.xml	4 Jun 2003 03:46:31 -0000	1.3
  @@ -28,7 +28,7 @@
           <table>
             <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                A set of attribute declarations.
               </td>
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/stages/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/stages/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	30 May 2003 09:52:59 -0000	1.4
  +++ navigation.xml	4 Jun 2003 03:46:32 -0000	1.5
  @@ -31,6 +31,7 @@
               <item name="Extensions" href="/meta/info/type/extensions/index.html"/>
             </item>
             <item name="Service" href="/meta/info/service.html"/>
  +          <item name="Attributes" href="/meta/info/attributes/index.html"/>
           </item>
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/stages/stage.xml
  
  Index: stage.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/stages/stage.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- stage.xml	25 Apr 2003 17:02:47 -0000	1.2
  +++ stage.xml	4 Jun 2003 03:46:32 -0000	1.3
  @@ -27,7 +27,7 @@
           <table>
             <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
             <tr>
  -            <td>attributes</td><td>0..1</td>
  +            <td><a href="../../attributes/index.html">attributes</a></td><td>0..1</td>
               <td>
                A set of attribute declarations.
               </td>
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/resources/notebook.xml
  
  Index: notebook.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/resources/notebook.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- notebook.xml	30 May 2003 09:53:02 -0000	1.1
  +++ notebook.xml	4 Jun 2003 03:46:32 -0000	1.2
  @@ -32,7 +32,7 @@
        <ul>
         <li>custom contextualization</li>
         <li>dynamic components</li>
  -    </ul>
  +     </ul>
      </li>
     <li>complete the documentation about the James example</li>
     <li>add documentation concerning the Merlin/Maven plugin</li>
  
  
  

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