avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject svn commit: rev 20498 - in avalon/trunk/central/site/src/xdocs: central/laboratory/studio central/laboratory/studio/developing-plugins central/laboratory/studio/getting-started central/laboratory/studio/installation central/laboratory/studio/manual central/laboratory/studio/reference products/runtime/system
Date Thu, 27 May 2004 11:21:05 GMT
Author: niclas
Date: Thu May 27 04:21:05 2004
New Revision: 20498

Added:
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter1.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter3.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter4.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter5.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter6.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/index.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml
Modified:
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml
Log:
Translated the RTF doc into Xdoc. No images yet though, as I don't have a good viewer of RTF.

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml
Thu May 27 04:21:05 2004
@@ -19,34 +19,13 @@
 
 <project href="http://avalon.apache.org/logkit" 
          name="Avalon Framework">
- <title>Merlin Developer</title>
+  <title>Merlin Developer</title>
 
- <body>
-
-    <links>
-      <item name="Apache" href="http://apache.org/"/>
-      <item name="Avalon" href="http://avalon.apache.org/"/>
-      <item name="Framework" href="http://avalon.apache.org/framework/"/>
-      <item name="Merlin" href="http://avalon.apache.org/merlin/"/>
-      <item name="Planet" href="http://avalon.apache.org/components/"/>
-    </links>
-
-    <menu name="About Merlin Developer">
-        <item name="Overview" href="index.html"/>
-        <item name="Installation" href="installation/index.html"/>
-        <item name="Getting Started" href="getting-started/index.html"/>
-        <item name="Reference" href="reference/index.html"/>
-        <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
-        <item name="Javadoc" href="/api/index.html"/>
+  <body>
+    <menu>
+      <item name="Overview" href="index.html"/>
     </menu>
-
-    <menu name="Related Projects">
-      <item name="Avalon Meta" href="http://avalon.apache.org/meta"/>
-      <item name="Avalon Merlin" href="http://avalon.apache.org/merlin"/>
-      <item name="Avalon Planet" href="http://avalon.apache.org/components"/>
-    </menu>
-
- </body>
+  </body>
 
 </project>
 

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml
Thu May 27 04:21:05 2004
@@ -19,34 +19,13 @@
 
 <project href="http://avalon.apache.org/logkit" 
          name="Avalon Framework">
- <title>Merlin Developer</title>
+  <title>Merlin Developer</title>
 
- <body>
-
-    <links>
-      <item name="Apache" href="http://apache.org/"/>
-      <item name="Avalon" href="http://avalon.apache.org/"/>
-      <item name="Framework" href="http://avalon.apache.org/framework/"/>
-      <item name="Merlin" href="http://avalon.apache.org/merlin/"/>
-      <item name="Planet" href="http://avalon.apache.org/components/"/>
-    </links>
-
-    <menu name="About Merlin Developer">
-        <item name="Overview" href="index.html"/>
-        <item name="Installation" href="installation/index.html"/>
-        <item name="Getting Started" href="getting-started/index.html"/>
-        <item name="Reference" href="reference/index.html"/>
-        <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
-        <item name="Javadoc" href="/api/index.html"/>
+  <body>
+    <menu>
+      <item name="Overview" href="index.html"/>
     </menu>
-
-    <menu name="Related Projects">
-      <item name="Avalon Meta" href="http://avalon.apache.org/meta"/>
-      <item name="Avalon Merlin" href="http://avalon.apache.org/merlin"/>
-      <item name="Avalon Planet" href="http://avalon.apache.org/components"/>
-    </menu>
-
- </body>
+  </body>
 
 </project>
 

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml
Thu May 27 04:21:05 2004
@@ -19,34 +19,13 @@
 
 <project href="http://avalon.apache.org/logkit" 
          name="Avalon Framework">
- <title>Merlin Developer</title>
-
- <body>
-
-    <links>
-      <item name="Apache" href="http://apache.org/"/>
-      <item name="Avalon" href="http://avalon.apache.org/"/>
-      <item name="Framework" href="http://avalon.apache.org/framework/"/>
-      <item name="Merlin" href="http://avalon.apache.org/merlin/"/>
-      <item name="Planet" href="http://avalon.apache.org/components/"/>
-    </links>
+  <title>Merlin Developer</title>
 
+  <body>
     <menu name="About Merlin Developer">
-        <item name="Overview" href="index.html"/>
-        <item name="Installation" href="installation/index.html"/>
-        <item name="Getting Started" href="getting-started/index.html"/>
-        <item name="Reference" href="reference/index.html"/>
-        <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
-        <item name="Javadoc" href="/api/index.html"/>
+      <item name="Overview" href="index.html"/>
     </menu>
-
-    <menu name="Related Projects">
-      <item name="Avalon Meta" href="http://avalon.apache.org/meta"/>
-      <item name="Avalon Merlin" href="http://avalon.apache.org/merlin"/>
-      <item name="Avalon Planet" href="http://avalon.apache.org/components"/>
-    </menu>
-
- </body>
+  </body>
 
 </project>
 

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter1.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter1.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Studio Manual - Chapter 1</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Introduction">
+      <p>
+        <em><strong>Documentation not available yet.</strong></em>
+      </p>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Studio Manual - Chapter 2</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Chapter 2 - Concepts">
+      <!-- 2.1 -->
+      <subsection name="Merlin" >
+        <p>
+          The Merlin project is committed to ....
+        </p>
+        <!-- 2.1.1 -->
+        <subsection name="Component">
+          <p>
+            A component is a logical unit of one or more classes and related
+            artifacts which together implement a functionality. A component 
+            delivers his functionality only through its “component interface”. 
+            There can be one or more “component interface implementations”.
+          </p>
+          <p>
+            A component is not aware of its functional environment – eg. a 
+            component can be deployed predictably in different application 
+            scenarios and environments. 
+          </p>
+          <p>
+            A component is always responsible for the correctness of the 
+            incoming data / objects.
+          </p>
+          <p>
+            A component is described by a “component type descriptor” (Type) 
+            which holds immutable information associated with the component 
+            implementation and its interface (Metadata). Based on information 
+            accessible from an instance of Type a container has available the 
+            structural and runtime dependencies that an instance of a 
+            corresponding component will require. 
+          </p>
+          <p>
+            In Merlin metadata are stored either in XML or in a binary format.
+            Metadata are created automatically by “Magic” – which is the build
+            tool for Merlin – or by Eclipse Studio from JavaDoc tags contained
+            in the components interface or implementation.
+          </p>
+          <p>
+            Components in Merlin can get their information either through a 
+            freely configurable and extendable set of interfaces or by 
+            constructor injection. 
+          </p>
+          <p>
+            The following set of interfaces are delivered as standard by Merlin:
+          </p>
+          <dl>
+            <dd>Lifestyle Management</dd>
+            <dt>
+              Merlin provides support for different component instantiation 
+              policies. These policies are referred to as lifestyles. Examples
+              of lifestyle include 'singleton', 'per-thread', 'pooled' and 
+              'transient'.
+            </dt>
+            <dd>Lifecycle Management</dd>
+            <dt>
+              Merlin provides support for constructor based injection of 
+              lifecycle artifacts, or optional phased delivery under which a 
+              component is processed through a series of lifecycle stages. 
+              Lifecycle processing involves the execution of a series of stages
+              such as associating a logging channel, applying a configuration or
+              component parameters, setting the runtime context, supplying 
+              dependent services, initialization, startup, shutdown and 
+              disposal. Within the Merlin system, lifecycle stages can be 
+              extended or modified through association of other components 
+              that provide lifecycle support. Merlin distinguishes these 
+              services as deployment dependencies as distinct from classic 
+              runtime dependencies.
+            </dt>
+          </dl>
+        </subsection>
+        <!-- 2.1.2 -->
+        <subsection name="Block / Services" >
+          <!-- 2.1.2.1 -->
+          <subsection name="Block" >
+            <p>
+              In Merlin a block is a logical and physical unit of one or more 
+              components and its related artifacts. One artifact is the blocks
+              metadata which contains information like its containing 
+              components, classloader directives and the “services” it delivers.
+            </p>
+            <p>
+              Other artifacts of a block might be persistence mapping 
+              information for contained components etc.
+            </p>
+            <p>
+              Physically a block is deployed in a standard jar file. To make it
+              possible to identify blocks visually Merlin blocks are using the 
+              “.bar” file extension.
+            </p>
+            <p>
+              It’s quite usual that the term “block” and the term “component“ 
+              are used equivalent. 
+            </p>
+          </subsection>
+          <!-- 2.1.2.2 -->
+          <subsection name="Service" >
+            <p>
+              A block can declare the export of a set of services established by
+              the components contained within it. This enables a container to 
+              function as a composite component relative to its peers. This 
+              composition is either done by “nested” or by “referenced” blocks.
+            </p>
+          </subsection>
+          <!-- 2.1.2.3 -->
+          <subsection name="Nested Blocks" >
+            <p>
+              An “include” directive in a block instructs Merlin to include an 
+              external block within the container. Services exported by the 
+              block will be made available to other components at the same 
+              level as the included block
+            </p>
+            <p>
+              With the “include” directive a block is included “by value” into a
+              block. This is especially useful  to structure larger blocks into 
+              smaller reusable blocks. 
+            </p>
+          </subsection>
+          <!-- 2.1.2.4 -->
+          <subsection name="Referenced Blocks" >
+            <p>
+              A “container” directive is used to reference other blocks / 
+              containers. Only services declared in the referenced block are 
+              accessible by the parent block. This directive is used to assemble
+              a whole application by reusable blocks.            
+            </p>
+          </subsection>
+        </subsection>
+        <!-- 2.1.3 -->
+        <subsection name="Kernel / Container" >
+          <p>
+            In Merlin every block is covered by its own container. The “startup”
+            program, which instantiates and manages all the subsequent 
+            containers is called the “kernel”. 
+          </p>
+          <p>
+            Through that architecture Merlin assures a very secure and 
+            encapsulated runtime environment for each block. 
+          </p>
+        </subsection>
+        <!-- 2.1.4 -->
+        <subsection name="Facilities / Application blocks" >
+          <p>
+            Merlin differentiates two types of blocks: On one hand “application 
+            blocks” and on the other hand “Facilities”.
+          </p>
+          <!-- 2.1.4.1 -->
+          <subsection name="Facilities" >
+            <p>
+              Facilities are just normal blocks with the exception of:  
+            </p>
+            <ul>
+              <li>
+                Facilities are able to access the kernel and its container
+                model.
+              </li>
+              <li>
+                Facilities are used to extend the functionality of the core 
+                Merlin container in a plugable and flexible manner. 
+              </li>
+              <li>
+                Facilities include technical services like JMX, messaging,
+                logging, persistence, workflow etc.
+              </li>
+            </ul>
+            <p>
+              This separation of concerns enables the enhancement or even 
+              exchange of kernel implementations without touching the 
+              implementation of the application blocks. This is one of the key
+              features of Merlin which ensures on one hand a large stability 
+              for application blocks against technology change and on the other
+              hand a high flexibility to adopt new technologies and to enhance
+              the core functionality of Merlin.             
+            </p>
+          </subsection>
+          <!-- 2.1.4.2 -->
+          <subsection name="Application Blocks" >
+            <p>
+              Application blocks may also be hierarchically composed. But 
+              because this is not naturally darstellbar it is limited to one 
+              block.
+            </p>
+          </subsection>
+        </subsection>
+        <!-- 2.1.5 -->
+        <subsection name="Server" >
+        </subsection>
+        <!-- 2.1.6 -->
+        <subsection name="Repository" >
+        </subsection>
+      </subsection>
+      <!-- 2.2 -->
+      <subsection name="Eclipse" >
+        <!-- 2.2.1 -->
+        <subsection name="Preferences" >
+        </subsection>
+        <!-- 2.2.2 -->
+        <subsection name="Properties" >
+        </subsection>
+        <!-- 2.2.3 -->
+        <subsection name="Builders" >
+        </subsection>
+        <!-- 2.2.4 -->
+        <subsection name="Help" >
+        </subsection>
+        <!-- 2.2.5 -->
+        <subsection name="Component Configurator" >
+        </subsection>
+      </subsection>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter3.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter3.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Studio Manual - Chapter 3</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Chapter 3 - Run / Debug / Test Server">
+      <p>
+        <em><strong>Documentation not available yet.</strong></em>
+      </p>
+      <!-- 3.1 -->
+      <subsection name="Execution Mode" >
+        <!-- 3.1.1 -->
+        <subsection name="Start / Stop Server" >
+        </subsection>
+        <!-- 3.1.2 -->
+        <subsection name="Runtime addition and removal of blocks" >
+        </subsection>
+      </subsection>
+      <!-- 3.2 -->
+      <subsection name="Server Mode" >
+      </subsection>
+      <!-- 3.3 -->
+      <subsection name="Embedded Mode" >
+      </subsection>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter4.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter4.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Studio Manual - Chapter 4</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Chapter 4 - Block editing and publication">
+      <p>
+        <em><strong>Documentation not available yet.</strong></em>
+      </p>
+      <!-- 4.1 -->
+      <subsection name="Create a Block" >
+        <!-- 4.1.1 -->
+        <subsection name="create a block within a new project" >
+        </subsection>
+        <!-- 4.1.2 -->
+        <subsection name="create a block within an existing project" >
+        </subsection>
+      </subsection>
+      <!-- 4.2 -->
+      <subsection name="Edit Block Type" >
+      </subsection>
+      <!-- 4.3 -->
+      <subsection name="Add/Edit/Remove Block Reference" >
+      </subsection>
+      <!-- 4.4 -->
+      <subsection name="Add/Edit/Remove Nested Block" >
+      </subsection>
+      <!-- 4.5 -->
+      <subsection name="Add / Remove External Library" >
+      </subsection>
+      <!-- 4.6 -->
+      <subsection name="Property Editor" >
+      </subsection>
+      <!-- 4.7 -->
+      <subsection name="Services" >
+        <!-- 4.7.1 -->
+        <subsection name="add / remove service" >
+        </subsection>
+        <!-- 4.7.2 -->
+        <subsection name="add / remove service dependency" >
+        </subsection>
+        <!-- 4.7.3 -->
+        <subsection name="add / remove service extension" >
+        </subsection>
+      </subsection>
+      <!-- 4.8 -->
+      <subsection name="Standalone Block Validation" >
+      </subsection>
+      <!-- 4.9 -->
+      <subsection name="Block Publication" >
+        <!-- 4.9.1 -->
+        <subsection name="As a bundled jar" >
+        </subsection>
+        <!-- 4.9.2 -->
+        <subsection name="As a standalone block definition" >
+        </subsection>
+        <!-- 4.9.3 -->
+        <subsection name="As a bar file" >
+        </subsection>
+      </subsection>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter5.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter5.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Studio Manual - Chapter 5</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Chapter 5 - Component editing">
+      <p>
+        <em><strong>Documentation not available yet.</strong></em>
+      </p>
+      <!-- 5.1 -->
+      <subsection name="Edit Development Context" >
+      </subsection>
+      <!-- 5.2 -->
+      <subsection name="Edit Component Info" >
+        <!-- 5.2.1 -->
+        <subsection name="Lifestyle" >
+        </subsection>
+        <!-- 5.2.2 -->
+        <subsection name="Collection Policy" >
+        </subsection>
+        <!-- 5.2.3 -->
+        <subsection name="Attributes" >
+        </subsection>
+      </subsection>
+      <!-- 5.3 -->
+      <subsection name="add/edit/remove parameter" >
+      </subsection>
+      <!-- 5.4 -->
+      <subsection name="add/edit/remove configuration" >
+      </subsection>
+      <!-- 5.5 -->
+      <subsection name="add/edit/remove context" >
+      </subsection>
+      <!-- 5.6 -->
+      <subsection name="add/edit/remove service export" >
+      </subsection>
+      <!-- 5.7 -->
+      <subsection name="add/edit/remove dependency import" >
+      </subsection>
+      <!-- 5.8 -->
+      <subsection name="add/edit/remove lifecycle stage dependency" >
+      </subsection>
+      <!-- 5.9 -->
+      <subsection name="add/edit/remove lifecycle extension support" >
+      </subsection>
+      <!-- 5.10 -->
+      <subsection name="Property Editor" >
+      </subsection>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter6.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter6.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Studio Manual - Chapter 6</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Chapter 6 - Repository editing">
+      <p>
+        <em><strong>Documentation not available yet.</strong></em>
+      </p>
+      <!-- 6.1 -->
+      <subsection name="Edit Repository location" >
+        <!-- 6.1.1 -->
+        <subsection name="Local Repository" >
+        </subsection>
+        <!-- 6.1.2 -->
+        <subsection name="Remote Repository" >
+        </subsection>
+      </subsection>
+      <!-- 6.2 -->
+      <subsection name="Attach / detach a Repository location" >
+      </subsection>
+      <!-- 6.3 -->
+      <subsection name="Edit block groups" >
+      </subsection>
+      <!-- 6.4 -->
+      <subsection name="Edit block entries" >
+      </subsection>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/index.xml	Thu May
27 04:21:05 2004
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+  <properties>
+    <title>Merlin Developer - Getting Started</title>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+  </properties>
+
+  <body>
+    <section name="Table of Content">
+    
+      <table>
+        <tr>
+          <th>Chapter</th>
+          <th>Name</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>
+            1
+          </td>
+          <td>
+            Introduction
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            2
+          </td>
+          <td>
+            Concepts
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            3
+          </td>
+          <td>
+            Run/Debug/Test Server
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            4
+          </td>
+          <td>
+            Block Editing/Publication
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            5
+          </td>
+          <td>
+            Component Editing
+          </td>
+          <td>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            6
+          </td>
+          <td>
+            Repository Editing
+          </td>
+          <td>
+          </td>
+        </tr>
+      </table>
+    </section>
+  </body>
+</document>

Added: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml	Thu
May 27 04:21:05 2004
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+ Copyright 2004 Apache Software Foundation
+ Licensed  under the  Apache License,  Version 2.0  (the "License");
+ you may not use  this file  except in  compliance with the License.
+ You may obtain a copy of the License at 
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed  under the  License is distributed on an "AS IS" BASIS,
+ WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ implied.
+ 
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project href="http://avalon.apache.org/logkit" 
+         name="Avalon Framework">
+ <title>Merlin Developer</title>
+
+ <body>
+
+    <menu name="About Merlin Developer">
+      <item name="TOC" href="index.html"/>
+      <item name="Introduction" href="chapter1.html"/>
+      <item name="Concepts" href="chapter2.html"/>
+      <item name="Run/Debug/Test Server" href="chapter3.html"/>
+      <item name="Block Editing/Publication" href="chapter4.html"/>
+      <item name="Component Editing" href="chapter5.html"/>
+      <item name="Repository Editing" href="chapter6.html"/>
+    </menu>
+ </body>
+
+</project>
+

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml	Thu May 27
04:21:05 2004
@@ -19,34 +19,19 @@
 
 <project href="http://avalon.apache.org/logkit" 
          name="Avalon Framework">
- <title>Merlin Developer</title>
+  <title>Merlin Developer</title>
 
- <body>
-
-    <links>
-      <item name="Apache" href="http://apache.org/"/>
-      <item name="Avalon" href="http://avalon.apache.org/"/>
-      <item name="Framework" href="http://avalon.apache.org/framework/"/>
-      <item name="Merlin" href="http://avalon.apache.org/merlin/"/>
-      <item name="Planet" href="http://avalon.apache.org/components/"/>
-    </links>
-
-    <menu name="About Merlin Developer">
-        <item name="Overview" href="index.html"/>
-        <item name="Installation" href="installation/index.html"/>
-        <item name="Getting Started" href="getting-started/index.html"/>
-        <item name="Reference" href="reference/index.html"/>
-        <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
-        <item name="Javadoc" href="/api/index.html"/>
+  <body>
+    <menu>
+      <item name="Overview" href="index.html"/>
+      <item name="Installation" href="installation/index.html"/>
+      <item name="Getting Started" href="getting-started/index.html"/>
+      <item name="User Manual" href="manual/index.html"/>
+      <item name="Reference" href="reference/index.html"/>
+      <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
+      <item name="Javadoc" href="/api/index.html"/>
     </menu>
-
-    <menu name="Related Projects">
-      <item name="Avalon Meta" href="http://avalon.apache.org/meta"/>
-      <item name="Avalon Merlin" href="http://avalon.apache.org/merlin"/>
-      <item name="Avalon Planet" href="http://avalon.apache.org/components"/>
-    </menu>
-
- </body>
+  </body>
 
 </project>
 

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml
Thu May 27 04:21:05 2004
@@ -19,34 +19,13 @@
 
 <project href="http://avalon.apache.org/logkit" 
          name="Avalon Framework">
- <title>Merlin Developer</title>
+  <title>Merlin Developer</title>
 
- <body>
-
-    <links>
-      <item name="Apache" href="http://apache.org/"/>
-      <item name="Avalon" href="http://avalon.apache.org/"/>
-      <item name="Framework" href="http://avalon.apache.org/framework/"/>
-      <item name="Merlin" href="http://avalon.apache.org/merlin/"/>
-      <item name="Planet" href="http://avalon.apache.org/components/"/>
-    </links>
-
-    <menu name="About Merlin Developer">
-        <item name="Overview" href="index.html"/>
-        <item name="Installation" href="installation/index.html"/>
-        <item name="Getting Started" href="getting-started/index.html"/>
-        <item name="Reference" href="reference/index.html"/>
-        <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
-        <item name="Javadoc" href="/api/index.html"/>
+  <body>
+    <menu>
+      <item name="Overview" href="index.html"/>
     </menu>
-
-    <menu name="Related Projects">
-      <item name="Avalon Meta" href="http://avalon.apache.org/meta"/>
-      <item name="Avalon Merlin" href="http://avalon.apache.org/merlin"/>
-      <item name="Avalon Planet" href="http://avalon.apache.org/components"/>
-    </menu>
-
- </body>
+  </body>
 
 </project>
 

Added: avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml	Thu May 27 04:21:05
2004
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Runtime Products</title>
+  </properties> 
+
+  <body>
+    <section name="Merlin Runtime System">
+      <p>
+      </p>
+    </section>
+  </body>
+</document>
+

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


Mime
View raw message