avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 20642 - in avalon/trunk/central/site/src/xdocs: central/tutorials/advanced central/tutorials/advanced/lifecycle central/tutorials/advanced/unit central/tutorials/basic central/tutorials/basic/config central/tutorials/basic/context central/tutorials/basic/dependencies products/runtime products/runtime/reference/containment products/runtime/reference/containment/categories products/runtime/reference/containment/classloader products/runtime/reference/containment/classloader/classpath products/runtime/reference/containment/classloader/classpath/fileset products/runtime/reference/containment/classloader/classpath/repository products/runtime/reference/containment/components products/runtime/reference/containment/components/categories products/runtime/reference/containment/components/context products/runtime/reference/containment/components/context/entry products/runtime/reference/containment/components/context/entry/constructor products/runtime/reference/containment/components/dependencies products/runtime/reference/containment/components/parameters products/runtime/reference/containment/include products/runtime/reference/containment/services
Date Sun, 30 May 2004 06:02:30 GMT
Author: mcconnell
Date: Sat May 29 23:02:29 2004
New Revision: 20642

Modified:
   avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/lifecycle/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/unit/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/tutorials/basic/config/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/tutorials/basic/context/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/tutorials/basic/dependencies/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/tutorials/basic/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/categories/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/fileset/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/repository/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/categories/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/constructor/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/dependencies/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/parameters/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/include/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/containment/services/navigation.xml
Log:
More enhancements.

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/lifecycle/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/lifecycle/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/lifecycle/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Overview" href="extension.html"/>
       <item name="Interfaces" href="interfaces.html"/>
       <item name="Example" href="example.html"/>

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/navigation.xml	Sat May
29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Lifecycle Tools" href="lifecycle/index.html"/>
       <item name="Contextualization" href="context.html"/>
       <item name="Deployment Templates" href="profiles.html"/>

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/unit/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/unit/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/advanced/unit/navigation.xml	Sat
May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Hello Example" href="example.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/basic/config/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/basic/config/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/basic/config/navigation.xml	Sat
May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Using" href="configurable.html"/>
       <item name="Defaults" href="defaults.html"/>
       <item name="Declaring" href="block.html"/>

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/basic/context/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/basic/context/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/basic/context/navigation.xml	Sat
May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Standard Entries" href="standard.html"/>
       <item name="Custom Entries" href="entries.html"/>
       <item name="Context Casting" href="casting.html"/>

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/basic/dependencies/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/basic/dependencies/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/basic/dependencies/navigation.xml
Sat May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Auto" href="auto.html"/>
       <item name="Manual" href="manual.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/basic/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/basic/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/basic/navigation.xml	Sat May 29
23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="Hello Block" href="creation.html"/>
       <item name="Running Hello" href="execution.html"/>
       <item name="Behind the Scenes" href="internal.html"/>

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 23:02:29
2004
@@ -27,7 +27,7 @@
       <item name="Installation" href="installation/index.html"/>
       <item name="Embedding" href="embedded/index.html"/>
       <item name="Specification" 
-        href="reference/containment/directives/index.html"/>
+        href="reference/containment/index.html"/>
       <item name="Systems" href="system/meta/index.html"/>
       <item name="Tools" href="tools/index.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/categories/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/categories/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/categories/navigation.xml
Sat May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="category" href="category.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/fileset/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/fileset/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/fileset/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
  <body>
 
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="include" href="include.html"/>
       <item name="exclude" href="exclude.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/navigation.xml
Sat May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="repository" href="repository/index.html"/>
       <item name="fileset" href="fileset/index.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/repository/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/repository/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/classpath/repository/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="resource" href="resource.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/classloader/navigation.xml
Sat May 29 23:02:29 2004
@@ -24,7 +24,6 @@
   <body>
 
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="classpath" href="classpath/index.html"/>
       <item name="library" href="extensions.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/categories/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/categories/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/categories/navigation.xml
Sat May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="category" href="category.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/constructor/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/constructor/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/constructor/navigation.xml
Sat May 29 23:02:29 2004
@@ -24,7 +24,6 @@
   <body>
 
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="param" href="param.html"/>
     </menu>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/entry/navigation.xml
Sat May 29 23:02:29 2004
@@ -24,7 +24,6 @@
   <body>
 
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="import" href="import.html"/>
       <item name="constructor" href="constructor/index.html"/>
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/context/navigation.xml
Sat May 29 23:02:29 2004
@@ -22,7 +22,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="entry" href="entry/index.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/dependencies/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/dependencies/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/dependencies/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="dependency" href="dependency.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,11 +23,10 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="categories" href="categories/index.html"/>
       <item name="context" href="context/index.html"/>
       <item name="dependencies" href="dependencies/index.html"/>
-      <item name="configuration" href="/reference/containment/directives/components/configuration.html"/>
+      <item name="configuration" href="configuration.html"/>
       <item name="parameters" href="parameters/index.html"/>
     </menu>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/parameters/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/parameters/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/components/parameters/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="parameter" href="parameter.html"/>
     </menu>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/include/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/include/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/include/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="source" href="source.html"/>
       <item name="resource" href="resource.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 23:02:29 2004
@@ -39,122 +39,6 @@
         </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 23:02:29 2004
@@ -23,11 +23,12 @@
 
   <body>
     <menu>
-      <item name="services" href="services/index.html"/>
+      <item name="container" href="container.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"/>
+      <item name="services" href="services/index.html"/>
     </menu>
   </body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/services/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/services/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/services/navigation.xml
Sat May 29 23:02:29 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Overview" href="index.html"/>
       <item name="service" href="service.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