avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 20641 - in avalon/trunk/central/site/src/xdocs/products/runtime: . installation installation/archive reference reference/component/artifacts reference/containment reference/containment/directives reference/kernel reference/kernel/kernel tools
Date Sun, 30 May 2004 05:30:08 GMT
Author: mcconnell
Date: Sat May 29 22:30:08 2004
New Revision: 20641

Added:
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/install.3.0.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/install.3.2.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml
Removed:
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/kernel/
Modified:
   avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tools/navigation.xml
Log:


Added: avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/index.xml	Sat
May 29 22:30:08 2004
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!-- 
+ 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.
+-->
+
+<document>
+
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
+  <body>
+    <section name="Instalation Instructions for Earlier Versions">
+    </section>
+  </body>
+
+</document>
+
+

Added: avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/install.3.0.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/install.3.0.xml
Sat May 29 22:30:08 2004
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!-- 
+ 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.
+-->
+
+<document>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
+    <body>
+        <section name="Installation">
+
+            <subsection name="Declare MERLIN_HOME environment variable">
+
+                <p>
+                    To use Merlin command line support or the Merlin NT Service
+                    you will need to define the MERLIN_HOME environment
+                    variable for your system and include MERLIN_HOME/bin in
+                    your system path:
+                </p>
+
+<source><![CDATA[
+$ echo '
+> # set location of merlin
+> export MERLIN_HOME=/opt/merlin
+> # include it in the path
+> export PATH=$PATH:$MERLIN_HOME/bin
+> ' >> ~/.bash_profile
+$ source ~/.bash_profile
+]]></source>
+
+            </subsection>
+            <subsection name="Validating your installation.">
+
+                <p>
+                    The following instructions assume that you have defined the
+                    MERLIN_HOME environment variable that points the directory
+                    containing the Merlin installation.
+                </p>
+
+                <p>
+                    To confirm that you MERLIN_HOME variable is correct, you
+                    should open a new command line window and invoke the Merlin
+                    CLI application. The following command should list the
+                    Merlin CLI help information.
+                </p>
+
+<source><![CDATA[
+$ merlin.sh -help
+usage: merlin [block] [-debug] [-config <file>] [-lang
+<code>] [-repository <directory>] [-kernel <file>] [-home
+<directory>] [-version] [-help]
+...
+]]></source>
+
+            </subsection>
+            <subsection name="Next Steps">
+                <p>
+                    Now that you have installed Merlin on your system you can
+                    proceed to the <a href="../tutorial/index.html">Using Merlin</a>
+                    tutorial page.
+                </p>
+            </subsection>
+
+        </section>
+    </body>
+
+</document>
+
+

Added: avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/install.3.2.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/install.3.2.xml
Sat May 29 22:30:08 2004
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+
+<!-- 
+ 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.
+-->
+
+<document>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
+  <body>
+    <section name="Installation - Merlin 3.2">
+
+      <subsection name="Build Procedure">
+
+        <p>
+        After downloading the Merlin 3.2 binary distribution and 
+        inpacking the archive into you preferred location, you should
+        have a directory structure that looks like the following: 
+        </p>
+<source><![CDATA[
+  /merlin
+    /bin
+    /config
+    /ext
+    /system
+    README.TXT
+    LICENSE.TXT
+  /plugins
+    avalon-meta-plugin-1.3.1.jar
+    merlin-plugin-3.2.3.jar
+]]></source>
+
+        <p>
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path.  The MERLIN_HOME environment variable
+should point to the merlin directory.
+        </p>
+
+        <p>
+Under Lunix you can do this as follows:
+        </p>
+
+<source><![CDATA[
+  $ echo '
+  > # set location of merlin
+  > export MERLIN_HOME=/opt/merlin
+  > # include it in the path
+  > export PATH=$PATH:$MERLIN_HOME/bin
+  > ' >> ~/.bash_profile
+  $ source ~/.bash_profile
+]]></source>
+
+        <p>
+Under Windows you can set environment variables by selecting the 
+Environment Tab from the System Control Panel.
+        </p>
+        <p>
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory.  As of the 20031210 build the repository is maintained 
+under AVALON_HOME which defaults to ${user.home}/.avalon.  To 
+override this behaviour you can either define a AVALON_HOME 
+environment variable or you can add a merlin.properties file to 
+${user.home} containing the "merlin.repository" property key and 
+a value point to you preferred repository location.
+        </p>
+        <p>
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+        </p>
+<source><![CDATA[
+Under DOS:
+
+  $ merlin -version
+
+Under Lunix:
+
+  $ merlin.sh -version
+
+]]></source>
+        <p>
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the 
+Maven platform.  These plugins should be placed in the Maven plugin 
+directory (%MAVEN_HOME%\plugins).
+        </p>
+<source><![CDATA[
+  %MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.1.jar
+  %MAVEN_HOME%\plugins\merlin-plugin-3.2.3.jar
+]]></source>
+
+        <p>
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the 
+Maven platform.  These plugins should be placed in the Maven plugin 
+directory (%MAVEN_HOME%\plugins).
+        </p>
+<source><![CDATA[
+  %MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.1.jar
+  %MAVEN_HOME%\plugins\merlin-plugin-3.2.3.jar
+]]></source>
+
+        <p>
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+        </p>
+
+<source><![CDATA[
+  %MAVEN_HOME%\plugins\merlin-plugin-* 
+  %MAVEN_HOME%\plugins\avalon-meta-plugin-*
+]]></source>
+
+      </subsection>
+      <subsection name="Validating your installation.">
+
+        <p>
+          The following instructions assume that you have defined the
+          MERLIN_HOME environment variable that points the directory
+          containing the Merlin installation.
+        </p>
+
+        <p>
+          To confirm that you MERLIN_HOME variable is correct, you
+          should open a new command line window and invoke the Merlin
+          CLI application. The following command should list the
+          Merlin CLI help information.
+        </p>
+
+<source><![CDATA[
+$ merlin.sh -help
+usage: merlin [block] [-lang <code>] [-install <url>] 
+  [-library <directory>] [-help] [-version] [-home <directory>] 
+  [-impl <artifact>] [-debug] [-info] [-config <url>] 
+  [-context <directory>] [-system <directory>] [-execute] 
+  [-repository <directory>] [-kernel <url>]...
+]]></source>
+
+      </subsection>
+      <subsection name="Next Steps">
+        <p>
+          Now that you have installed Merlin on your system you can
+          proceed to the <a href="../tutorial/index.html">Using Merlin</a>
+          tutorial page.
+        </p>
+      </subsection>
+
+    </section>
+  </body>
+
+</document>
+
+

Added: avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/navigation.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/navigation.xml
Sat May 29 22:30:08 2004
@@ -0,0 +1,32 @@
+<?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>
+
+  <title>Merlin Install (old versions)</title>
+
+  <body>
+    <menu>
+      <item name="3.2.5" href="install.3.2.html"/>
+      <item name="3.0.0" href="install.3.0.html"/>
+    </menu>
+
+ </body>
+
+</project>

Added: avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml	Sat May 29
22:30:08 2004
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+
+<!-- 
+ 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.
+-->
+
+<document>
+
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
+  <body>
+    <section name="Installation - Merlin 3.3">
+
+      <subsection name="Structure">
+
+        <p>
+        After downloading the Merlin 3.3.0 binary distribution and 
+        unpacking the archive into you preferred location, you should
+        have a directory structure that looks like the following: 
+        </p>
+<source><![CDATA[
+  /merlin
+    /bin
+    /config
+    /plugins
+    /system
+    README.TXT
+    LICENSE.TXT
+    NOTICE.TXT
+]]></source>
+
+      </subsection>
+
+      <subsection name="MERLIN_HOME Environment Variable">
+
+        <p>
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path.  The MERLIN_HOME environment variable
+should point to the merlin directory.
+        </p>
+
+        <p>
+Under Windows you can set environment variables by selecting the 
+Environment Tab from the System Control Panel.
+        </p>
+
+        <p>
+Under Lunix you can do this as follows:
+        </p>
+
+<source><![CDATA[
+  $ echo '
+  > # set location of merlin
+  > export MERLIN_HOME=/opt/merlin
+  > # include it in the path
+  > export PATH=$PATH:$MERLIN_HOME/bin
+  > ' >> ~/.bash_profile
+  $ source ~/.bash_profile
+]]></source>
+
+      </subsection>
+
+      <subsection name="AVALON_HOME Environment Variable">
+
+        <p>
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory.  As of the 20031210 build the repository is maintained 
+under AVALON_HOME/repository where AVALON_HOME defaults to 
+${user.home}/.avalon.  To override the AVALON_HOME directory you 
+can either define a AVALON_HOME environment variable or you can 
+add a merlin.properties file to ${user.home} containing the 
+"merlin.repository" property key and a value point to you preferred 
+repository location.
+        </p>
+
+      </subsection>
+
+      <subsection name="Maven Plugin Installation">
+
+        <p>
+The merlin system installation is now complete.  Three plugins 
+supporting development are provided and can be installed using the 
+commands listed below (please check the packaged INSTALL.TXT for 
+correct version numbers):
+        </p>
+
+<source><![CDATA[
+$ maven -DgroupId=avalon-util -DartifactId=avalon-util-plugin -Dversion=1.0.dev-0 plugin:download
+$ maven -DgroupId=avalon-meta -DartifactId=avalon-meta-plugin -Dversion=1.4.dev-0 plugin:download
+$ maven -DgroupId=merlin -DartifactId=merlin-plugin -Dversion=3.3.dev-0 plugin:download
+]]></source>
+
+      </subsection>
+
+
+      <subsection name="Validating your installation.">
+
+        <p>
+          The following instructions assume that you have defined the
+          MERLIN_HOME environment variable that points the directory
+          containing the Merlin installation.
+        </p>
+
+        <p>
+          To confirm that you MERLIN_HOME variable is correct, you
+          should open a new command line window and invoke the Merlin
+          CLI application. The following command should list the
+          Merlin CLI help information.
+        </p>
+
+<source><![CDATA[
+$ merlin.sh -help
+usage: merlin [block] [-lang <code>] [-install <url>] 
+  [-library <directory>] [-help] [-version] [-home <directory>] 
+  [-impl <artifact>] [-debug] [-info] [-config <url>] 
+  [-context <directory>] [-system <directory>] [-execute] 
+  [-repository <directory>] [-kernel <url>]...
+]]></source>
+
+      </subsection>
+      <subsection name="Cygwin Notes">
+        <p>
+Due to restrictions related to the handling of spaces in filename 
+and/or directory names when running under the Cygwin environment you 
+will need to quote and escape command line arguments that contain 
+references with embedded spaces. </p>
+
+<p>For example:</p>
+
+<source>
+  merlin -home '/My\ Documents/merlin/apps/abc' -execute
+</source>
+
+      </subsection>
+
+      <subsection name="Next Steps">
+        <p>
+          Now that you have installed Merlin on your system you can
+          proceed to the <a href="../tutorial/index.html">Using Merlin</a>
+          tutorial page.
+        </p>
+      </subsection>
+
+    </section>
+  </body>
+
+</document>
+
+

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml	Sat May 29 22:30:08
2004
@@ -26,8 +26,9 @@
       <item name="About" href="about/index.html"/>
       <item name="Installation" href="installation/index.html"/>
       <item name="Embedding" href="embedded/index.html"/>
-      <item name="Specification" href="reference/index.html"/>
-      <item name="System" href="system/index.html"/>
+      <item name="Specification" 
+        href="reference/containment/directives/index.html"/>
+      <item name="Systems" href="system/meta/index.html"/>
       <item name="Tools" href="tools/index.html"/>
     </menu>
  </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/navigation.xml
Sat May 29 22:30:08 2004
@@ -25,7 +25,7 @@
     <menu>
       <item name="Logger" href="logger.html"/>
       <item name="Context" href="context.html"/>
-      <item name="ServiceManager" href="artifacts/manager.html"/>
+      <item name="ServiceManager" href="manager.html"/>
       <item name="Configuration" href="configuration.html"/>
       <item name="Parameters" href="parameters.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/index.xml	Sat
May 29 22:30:08 2004
@@ -26,27 +26,135 @@
 
   <body>
 
-    <section name="Deployment Specification">
+    <section name="Block Specification">
       <p>
-      </p>
-      <subsection name="Index">
-        <table>
-          <tr><th>Topic</th><th>Summary</th></tr>
-          <tr>
-            <td><a href="directives/index.html">Container Directive</a></td>
-            <td>
-The Container Directive declares the creation of a new container. A container directive includes
a classloader specification, an arbitary number of components and sub-containers.
-            </td>
-          </tr>
-          <tr>
-            <td><a href="overrides/index.html">Override Targets Directive</a></td>
-            <td>
-              A file containing logging categotry and component configuration
-              overrides.
-            </td>
-          </tr>
-        </table>
-      </subsection>
+      </p>
+      <subsection name="Overview">
+        <p>
+A deployment specification is represented by a <strong>&lt;container&gt;</strong>
XML element directive.  The directive presents a deployment scenerario to the runtime containment
model and through this process, defines a composite component model based on a series of subsidiary
containment and component diectives. Each containment directive represents a composite component
solution.  Each component directive represents an implementation deployment directive designed
to fulfill a particular application scenario.
+        </p>
+
+        <p>
+In structural terms, a <strong>&lt;container&gt;</strong> elements contains
a set of components, sub-containers, and includes that make up the compostion a block in terms
of its internal functionality.  This functionality is in turn exported through optional service
directives declared at the level of the <strong>&lt;container&gt;</strong>.
+        </p>
+      </subsection>
+
+      <subsection name="Nested Elements">
+
+        <table>
+          <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
+          <tr>
+            <td><a href="services/index.html">services</a></td><td>0..1</td>
+            <td>
+             A container 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.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="classloader/index.html">classloader</a></td><td>0..1</td>
+            <td>
+             The classloader to assign to the container.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="components/index.html">component</a></td><td>0..n</td>
+            <td>
+             A component directive is an instruction to merlin to build
+             a component of the type specified, and deploy the component 
+             in accordance with a stated policy.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="index.html">container</a></td><td>0..n</td>
+            <td>
+             A container directive is simply a composite component.  A container
+             establishes a partition within which a set of other components and 
+             containers can be declared.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="include/index.html">include</a></td><td>0..n</td>
+            <td>
+             An include directive 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.
+            </td>
+          </tr>
+        </table>
+      </subsection>
+
+      <subsection name="Sample XML">
+        <p>
+           The following XML is a sample of a implementation declaration
+           containing an engine, components, subcontainers and block includes.
+        </p>
+
+<source><![CDATA[
+ <!-- block implementation declaration -->
+<container>
+  
+     <!-- 
+     declaration of the classloader that this block 
+     will execute within 
+     -->
+
+     <classloader>
+       <classpath>
+         <repository>
+           <resource id="tutorial:composition-api" version="1.0"/>
+         </repository>
+       </classpath>
+     </classloader>
+
+     <!-- 
+     declaration of a root component (services provided by this component
+     will be avbailable to all other components at the same or lower levels
+     in the container hierachy
+     -->
+
+     <component name="application" 
+        class="tutorial.application.Application" activation="startup">
+     </component>
+
+     <!-- 
+     declaration of a container contining other components
+     -->
+
+     <container name="subcontainer">
+       
+       <!--
+       This component is only visible to other components at the same
+       level or lower in this branch of the container hierachy
+       -->
+
+       <component name="test2" class="AnotherComponent"/>
+
+       <!--
+       A subcontainer declaring a custom container type.
+       -->
+
+       <container name="testing" class="MySpecialContainerClass">
+         <!-- etc. -->
+       </container>
+
+     </container>
+
+     <!--
+     Declaration of a block to includes.  The inclusion of a block
+     results in the establishment of a container with a name correponding
+     to the name of the block.
+     -->
+
+     <include path="example-block.xml"/>
+     <include id="osm:collaboration" version="1.0"/>
+
+</container>
+
+]]></source>
+      </subsection>
+
     </section>
 
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/navigation.xml
Sat May 29 22:30:08 2004
@@ -22,9 +22,12 @@
   <title>Merlin</title>
 
   <body>
-    <menu>
-      <item name="container" href="directives/index.html"/>
-      <item name="targets" href="overrides/index.html"/>
+    <menu>
+      <item name="services" href="services/index.html"/>
+      <item name="classloader" href="classloader/index.html"/>
+      <item name="categories" href="categories/index.html"/>
+      <item name="component" href="components/index.html"/>
+      <item name="include" href="include/index.html"/>
     </menu>
   </body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/navigation.xml	Sat
May 29 22:30:08 2004
@@ -24,7 +24,9 @@
   <body>
     <menu>
       <item name="Properties" href="properties.html"/>
-      <item name="kernel" href="kernel/index.html"/>
+      <item name="Targets" href="overrides/index.html"/>
+      <item name="Repository" href="repository/index.html"/>
+      <!-- <item name="security" href="/security/index.html"/> -->
     </menu>
   </body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/navigation.xml	Sat May
29 22:30:08 2004
@@ -23,12 +23,11 @@
 
   <body>
     <menu>
+      <item name="Block" href="containment/index.html"/>
       <item name="Component" href="component/index.html"/>
-      <item name="Container" href="containment/index.html"/>
       <item name="Deployment" href="deployment/index.html"/>
-      <item name="System" href="system/index.html"/>
+      <item name="Kernel" href="kernel/index.html"/>
     </menu>
- 
   </body>
 
 </project>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tools/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/navigation.xml	Sat May 29 22:30:08
2004
@@ -23,7 +23,7 @@
 
   <body>
     <menu>
-      <item name="Maven Plugin" href="maven/index.html"/>
+      <item name="Maven Plugins" href="maven/index.html"/>
     </menu>
   </body>
 

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


Mime
View raw message