avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies navigation.xml
Date Wed, 10 Sep 2003 10:04:39 GMT
mcconnell    2003/09/10 03:04:39

  Modified:    merlin/merlin-platform/xdocs/starting index.xml
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/advanced
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/advanced/lifecycle
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/examples
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/examples/afs
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/examples/afs/simple
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/examples/james
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/tutorial
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/tutorial/config
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/tutorial/context
                        navigation.xml
               merlin/merlin-platform/xdocs/starting/tutorial/dependencies
                        navigation.xml
  Log:
  Remove servlet examples pending completion of the example.
  
  Revision  Changes    Path
  1.3       +2 -0      avalon-sandbox/merlin/merlin-platform/xdocs/starting/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	16 Jun 2003 09:39:05 -0000	1.2
  +++ index.xml	10 Sep 2003 10:04:38 -0000	1.3
  @@ -27,12 +27,14 @@
   Advanced Merlin features covering aspects related to component default configurations,
deployment templates (profiles), using profile selectors, import blocks, exporting services,
custom appliance handlers and blocks, and custom contextualization possibilities.
               </td>
             </tr>
  +          <!--
             <tr>
               <td><a href="examples/index.html">Examples</a></td>
               <td>
                 A set of example applications.
               </td>
             </tr>
  +          -->
           </table>
       </section>
     </body>
  
  
  
  1.2       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	10 Jun 2003 02:14:25 -0000	1.1
  +++ navigation.xml	10 Sep 2003 10:04:38 -0000	1.2
  @@ -18,7 +18,6 @@
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	17 Aug 2003 04:54:04 -0000	1.2
  +++ navigation.xml	10 Sep 2003 10:04:38 -0000	1.3
  @@ -24,7 +24,6 @@
             <item name="Profile Selectors" href="/starting/advanced/selectors.html"/>
             <item name="Composition" href="/starting/advanced/composite.html"/>
           </item>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	15 Jun 2003 17:43:24 -0000	1.2
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.3
  @@ -30,7 +30,6 @@
             <item name="Block Composition" href="/starting/advanced/composite.html"/>
             <item name="Custom Containers" href="/starting/advanced/containers.html"/>
           </item>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.2       +2 -0      avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	10 Jun 2003 02:14:29 -0000	1.1
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.2
  @@ -18,10 +18,12 @@
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  +        <!--
           <item name="Examples" href="/starting/examples/index.html">
             <item name="Apache Financial Services" href="/starting/examples/afs/index.html"/>
             <item name="James Enterprise Messaging" href="/starting/examples/james/index.html"/>
           </item>
  +        -->
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.2       +2 -0      avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	10 Jun 2003 02:14:29 -0000	1.1
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.2
  @@ -18,12 +18,14 @@
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  +        <!--
           <item name="Examples" href="/starting/examples/index.html">
             <item name="Apache Financial Services" href="/starting/examples/afs/index.html">
               <item name="Simple Bank" href="/starting/examples/afs/simple/index.html"/>
             </item>
             <item name="James Enterprise Messaging" href="/starting/examples/james/index.html"/>
           </item>
  +        -->
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.2       +2 -0      avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	10 Jun 2003 02:14:30 -0000	1.1
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.2
  @@ -18,6 +18,7 @@
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  +        <!--
           <item name="Examples" href="/starting/examples/index.html">
             <item name="Apache Financial Services" href="/starting/examples/afs/index.html">
               <item name="Simple Bank" href="/starting/examples/afs/simple/index.html">
  @@ -28,6 +29,7 @@
               </item>
             </item>
           </item>
  +        -->
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.2       +2 -0      avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	10 Jun 2003 02:14:32 -0000	1.1
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.2
  @@ -18,6 +18,7 @@
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  +        <!--
           <item name="Examples" href="/starting/examples/index.html">
             <item name="Apache Financial Services" href="/starting/examples/afs/index.html"/>
             <item name="James Enterprise Messaging" href="/starting/examples/james/index.html">
  @@ -27,6 +28,7 @@
               <item name="Runtime" href="/starting/examples/james/runtime.html"/>
             </item>
           </item>
  +        -->
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	30 Aug 2003 20:43:01 -0000	1.2
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.3
  @@ -26,7 +26,6 @@
             <item name="Dependencies" href="/starting/tutorial/dependencies/index.html"/>
           </item>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.4       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	30 Aug 2003 20:43:01 -0000	1.3
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.4
  @@ -28,7 +28,6 @@
             <item name="Dependencies" href="/starting/tutorial/dependencies/index.html"/>
           </item>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	30 Aug 2003 20:43:01 -0000	1.2
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.3
  @@ -30,7 +30,6 @@
             <item name="Dependencies" href="/starting/tutorial/dependencies/index.html"/>
           </item>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  
  
  
  1.2       +0 -1      avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	30 Aug 2003 20:43:01 -0000	1.1
  +++ navigation.xml	10 Sep 2003 10:04:39 -0000	1.2
  @@ -29,7 +29,6 @@
             </item>
           </item>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  -        <item name="Examples" href="/starting/examples/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/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