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-smp/xdocs/tools/tags navigation.xml
Date Tue, 08 Apr 2003 12:24:25 GMT
mcconnell    2003/04/08 05:24:24

  Modified:    merlin/merlin-smp/xdocs/starting navigation.xml
               merlin/merlin-smp/xdocs/starting/advanced navigation.xml
               merlin/merlin-smp/xdocs/starting/examples navigation.xml
               merlin/merlin-smp/xdocs/starting/examples/afs navigation.xml
               merlin/merlin-smp/xdocs/starting/examples/afs/simple
                        navigation.xml
               merlin/merlin-smp/xdocs/starting/hello navigation.xml
               merlin/merlin-smp/xdocs/starting/hello/context
                        navigation.xml
               merlin/merlin-smp/xdocs/tools navigation.xml
               merlin/merlin-smp/xdocs/tools/tags navigation.xml
  Added:       merlin/merlin-smp/xdocs/starting main.xml
               merlin/merlin-smp/xdocs/tools main.xml
  Log:
  Workaround CVS conflicts.
  
  Revision  Changes    Path
  1.5       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	8 Apr 2003 09:01:35 -0000	1.4
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.5
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/starting/main.xml
  
  Index: main.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
    <header>
      <title>Getting Started</title>
      <authors>
        <person name="Stephen McConnell" email="mcconnell@apache.org"/>
      </authors>
    </header>
    <body>
      <section name="Getting Started">
          <table>
            <tr><th>Topic</th><th>Summary</th></tr>
            <tr>
              <td><a href="installation.html">Installation</a></td>
              <td>Installation instructions including build and verification procedures.</td>
            </tr>
            <tr>
              <td><a href="hello/index.html">Using Merlin</a></td>
              <td>
  A short introduction to using Merlin based on a Hello Block example that takes your though
the definition of a block, subsequent deployment, and general aspects concerning configuration,
contextualization, service publication, and service dependency management.
              </td>
            </tr>
            <tr>
              <td><a href="advanced/index.html">Advanced Features</a></td>
              <td>
  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>
  
  </document>
  
  
  
  
  
  
  
  1.7       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	8 Apr 2003 11:53:01 -0000	1.6
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.7
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html">
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	8 Apr 2003 09:01:35 -0000	1.2
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.3
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	8 Apr 2003 09:01:35 -0000	1.2
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.3
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	8 Apr 2003 09:01:35 -0000	1.2
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.3
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
  
  
  
  1.8       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	8 Apr 2003 09:01:36 -0000	1.7
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.8
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html">
             <item name="Hello Block" href="/starting/hello/creation.html"/>
  
  
  
  1.6       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	8 Apr 2003 09:01:36 -0000	1.5
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.6
  @@ -11,7 +11,7 @@
   
       <menu name="About Merlin">
         <item name="Overview" href="/about/index.html"/>
  -      <item name="Getting Started" href="/starting/index.html">
  +      <item name="Getting Started" href="/starting/main.html">
           <item name="Installation" href="/starting/installation.html"/>
           <item name="Using Merlin" href="/starting/hello/index.html">
             <item name="Hello Block" href="/starting/hello/creation.html"/>
  
  
  
  1.6       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/tools/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/tools/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	8 Apr 2003 09:01:36 -0000	1.5
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.6
  @@ -15,7 +15,7 @@
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  -      <item name="Tools" href="/tools/index.html">
  +      <item name="Tools" href="/tools/main.html">
           <item name="Javadoc Tags Reference" href="/tools/tags/index.html"/>
           <item name="Meta-Info Generator Task" href="/tools/ant.html"/>
           <item name="Merlin Plugin for Maven" href="/tools/maven.html"/>
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-smp/xdocs/tools/main.xml
  
  Index: main.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <document>
  
    <properties>
      <author email="mcconnell@apache.org">Stephen McConnell</author>
      <title>Merlin Tools</title>
    </properties>
  
    <body>
  
      <section name="Overview">
  
        <p>
  The Merlin platform includes a set of developer tools that assist in the automation
  of different process contributing to reliable and consistant component development.
  These tools include an ant task supporting meta info generation for component types
  and services, and an equivalent Maven plugin. 
        </p>
        <subsection name="Index">
          <table>
            <tr><th>Topic</th><th>Summary</th></tr>
            <tr>
              <td><a href="tags/index.html">Javadoc Tags</a></td>
              <td>
                Reference specification of the Javadoc Tags used to 
                support automation of component and service metadata.
              </td>
            </tr>
            <tr>
              <td><a href="ant.html">Meta Generation Ant Task</a></td>
              <td>
                An Ant task supporting generation of XML or serialized 
                meta-info descriptors.
              </td>
            </tr>
            <tr>
              <td><a href="maven.html">Maven Plugin</a></td>
              <td>
                The Merlin plugin for Maven that provides support for 
                meta infor generation when building with the Maven tool.
              </td>
            </tr>
          </table>
        </subsection>
      </section>
  
    </body>
  
  </document>
  
  
  
  
  
  1.4       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	8 Apr 2003 10:29:50 -0000	1.3
  +++ navigation.xml	8 Apr 2003 12:24:24 -0000	1.4
  @@ -15,7 +15,7 @@
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
  -      <item name="Tools" href="/tools/index.html">
  +      <item name="Tools" href="/tools/main.html">
           <item name="Javadoc Tags Reference" href="/tools/tags/index.html">
             <item name="Namespace" href="/tools/tags/namespace.html"/>
             <item name="Version" href="/tools/tags/version.html"/>
  
  
  

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


Mime
View raw message