mcconnell 2003/08/16 21:19:15
Modified: merlin/merlin-platform/examples/afs/simple-servlet/src/webapp/BLOCK-INF
block.xml
merlin/merlin-platform/xdocs/merlin/block index.xml
merlin/merlin-platform/xdocs/meta/model index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container
categories.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/categories
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/context
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry
index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/parameters
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath
index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/include
index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/model/kernel index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/model/kernel/repository
navigation.xml
merlin/merlin-platform/xdocs/starting/examples/afs/simple
implementation.xml
merlin/merlin-platform/xdocs/starting/examples/james
block.xml
merlin/merlin-platform/xdocs/starting/tutorial creation.xml
merlin/merlin-platform/xdocs/starting/tutorial/config
block.xml
merlin/merlin-platform/xdocs/starting/tutorial/context
casting.xml entries.xml
Added:
merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry
import.xml
merlin/merlin-platform/xdocs/meta/model/block/container/services
index.xml navigation.xml service.xml
merlin/merlin-platform/xdocs/meta/model/kernel/categories
category.xml index.xml navigation.xml
Removed: merlin/merlin-platform/xdocs/meta/model/block
dependencies.xml index.xml info.xml navigation.xml
services.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/context
import.xml
merlin/merlin-platform/xdocs/meta/model/block/export
export.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/import
import.xml index.xml navigation.xml
Log:
Documentation updating (bringing things into sync. with 3.0).
Revision Changes Path
1.2 +9 -16
avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/src/webapp/BLOCK-INF/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/examples/afs/simple-servlet/src/webapp/BLOCK-INF/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Jun 2003 02:09:51 -0000 1.1
+++ block.xml 17 Aug 2003 04:19:14 -0000 1.2
@@ -1,10 +1,5 @@
-<block>
-
- <info>
- <name>simple-servlet</name>
- <version>1.0</version>
- </info>
+<container name="simple-servlet">
<services>
<service type="org.apache.bank.Bank">
@@ -12,14 +7,12 @@
</service>
</services>
- <implementation>
- <container name="banking">
- <component name="bank" class="org.apache.bank.impl.BankProvider"
activation="startup">
- <configuration>
- <name>Apache Financial Services</name>
- </configuration>
- </component>
- </container>
- </implementation>
+ <container name="banking">
+ <component name="bank" class="org.apache.bank.impl.BankProvider"
activation="startup">
+ <configuration>
+ <name>Apache Financial Services</name>
+ </configuration>
+ </component>
+ </container>
-</block>
+</container>
1.3 +25 -6
avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 16 Aug 2003 11:16:34 -0000 1.2
+++ index.xml 17 Aug 2003 04:19:14 -0000 1.3
@@ -13,28 +13,47 @@
<subsection name="Overview">
<p>
-A block is a specialisation of an <a href="../appliance/index.html">Appliance</a>.
A block manages a container (a type of component). In addition, a block exposes
services derived from the set of appliances that are managed by its container. As
such, a block can be view as a composite component. A block may be contained within
other blocks.
+A block is a specialisation of an <a href="../appliance/index.html">Appliance</a>.
+A block manages a container (a type of component). In addition, a block exposes
+services derived from the set of appliances that are managed by its container. As
+such, a block can be view as a composite component. A block may be contained
+within other blocks.
</p>
<p>
-A container manages a set of components declared within the containment scope. As
such, a container represents a logical and structural partition within a containment
hierarchy. Each container is associated with a classloader. The classloader parent
is the classloader of the parent container. As such, a container (and component
within the container) have access to the services defined within the immediate
container and all parent containers.
+A container manages a set of components declared within the containment scope.
+As such, a container represents a logical and structural partition within a
+containment hierarchy. Each container is associated with a classloader. The
+classloader parent is the classloader of the parent container. As such, a
+container (and component within the container) have access to the services
+defined within the immediate container and all parent containers.
</p>
</subsection>
<subsection name="Cascading Containers">
<p>
-The Merlin system provides support for <strong>cascading containers</strong>. This
model enables component assemblers to (among other things) associate jar files under a
protected block scope where each block is associated with its own classloader. Each
block manages a single container. A container manages multiple components.
+The Merlin system provides support for <strong>cascading containers</strong>.
+This model enables component assemblers to (among other things) associate jar
+files under a protected block scope where each block is associated with its own
+classloader. Each block manages a single container. A container manages
+multiple components.
</p>
<p>
-Merlin will handle resolution of service dependencies for components contained in
containers by looking for explicitly declared components commencing within the local
container, and working progressively up the container hierarchy. If no explicit
solutions are resolved, Merlin will attempt to build an implicit solution based on
components declared in the respective container classpath.
+Merlin will handle resolution of service dependencies for components contained
+in containers by looking for explicitly declared components commencing within
+the local container, and working progressively up the container hierarchy. If
+no explicit solutions are resolved, Merlin will attempt to build an implicit
+solution based on components declared in the respective container classpath.
</p>
</subsection>
<subsection name="Block Model">
<p>
-A new block is defined by the <block> element. The element is the definition
of a block, its classpath, and the components it is responsible for managing. Blocks
are declared programmatically or via an XML description as shown below:
+A new block is defined by the <container> element. The element is the
definition
+of a block, its classpath, and the components it is responsible for managing.
+Blocks are declared programmatically or via an XML description as shown below:
</p>
<p><em>Minimilist block definition:</em></p>
1.3 +4 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 23 Jun 2003 02:04:31 -0000 1.2
+++ index.xml 17 Aug 2003 04:19:14 -0000 1.3
@@ -19,9 +19,9 @@
<td>The meta data directives used to establish the Merlin Kernel.</td>
</tr>
<tr>
- <td><a href="block/index.html">Block</a></td>
- <td>The meta data directives used to establish a block and the
- container hierachy and nested component.</td>
+ <td><a href="block/container/index.html">Container</a></td>
+ <td>The meta data directives used to establish a root container, nested
+ containers, and nested components.</td>
</tr>
</table>
</subsection>
@@ -30,7 +30,7 @@
Meta data is the information used by the Merlin system to instantiate
system and client aspects to achieve a particular application objective.
Meta data is refered to here under the term 'directive'. This
- reflects the role of meta-data - information that directs the behaviour
+ reflects the role of meta data - information that directs the behaviour
of the system. This is in contract with meta-info which more typically
establish operational and functional requirements of a component type.
</p>
1.3 +1 -1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.3
@@ -22,7 +22,7 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html"/>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
1.2 +5 -7
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/categories.xml
Index: categories.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/categories.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- categories.xml 10 Jun 2003 02:14:19 -0000 1.1
+++ categories.xml 17 Aug 2003 04:19:14 -0000 1.2
@@ -13,16 +13,15 @@
<p>Component scoped logging directives are relative to the enclosing component
profile declaration. The logging categories are component specific and will normally
be documented as part of the component you are using. The following example is the
logging configuration for the demonstration component included with the
distribution.</p>
<source>
- <kernel>
<p><font color="gray"><i><!-- A classpath declaration could be included here or
under the container scope. --></i></font></p>
- <block name="<font color="darkred">root</font>">
+ <container name="<font color="darkred">root</font>">
</source>
<font color="gray"><i><!--
Component profile declaration.
--></i></font>
<source>
- <appliance name="<font color="darkred">complex</font>"
+ <component name="<font color="darkred">complex</font>"
class="<font
color="darkred">org.apache.excalibur.playground.ComplexComponent</font>"
activation="<font color="darkred">true</font>">
</source>
@@ -34,14 +33,13 @@
<categories priority="<font color="darkred">DEBUG</font>">
<category name="<font color="darkred">init</font>" priority="<font
color="darkred">WARN</font>"/>
</categories>
- </appliance>
+ </component>
</source>
<p><font color="gray"><i><!-- Other container declarations. --></i></font></p>
<source>
</container>
- </kernel>
</source>
</section>
@@ -49,7 +47,7 @@
</body>
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Apache Avalon Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.5 +15 -53
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 22 Jun 2003 14:19:58 -0000 1.4
+++ index.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -13,23 +13,18 @@
<section name="Impementation Directive">
- <subsection name="Attributes">
+ <subsection name="Nested Elements">
+
<table>
- <tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
+ <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
- <td>class</td><td>no</td>
+ <td><a href="services/index.html">services</a></td><td>0..n</td>
<td>
- The component implementation class. This value defaults to
- org.apache.avalon.merlin.container.impl.DefaultContainer.
+ 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>
- </table>
- </subsection>
-
- <subsection name="Nested Elements">
-
- <table>
- <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
<td><a href="engine/index.html">classloader</a></td><td>0..1</td>
<td>
@@ -62,41 +57,15 @@
</td>
</tr>
</table>
-
- </subsection>
- <subsection name="Nested Elements (from component)">
-
- <table>
- <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
-
- <tr>
- <td><a
href="components/categories/index.html">categories</a></td><td>0..1</td>
- <td>Defintion of the priority and targets parameterization to apply
- to logging channels declared by the component.</td>
- </tr>
- <tr>
- <td><a
href="components/context/index.html">context</a></td><td>0..1</td>
- <td>Defintion of the context class and entries.</td>
- </tr>
- <tr>
- <td><a
href="components/parameters/index.html">parameters</a></td><td>0..1</td>
- <td>Defintion of the parameters to be supplied during Parameterization
of the
- component.</td>
- </tr>
- <tr>
- <td><a
href="components/configuration.html">configuration</a></td><td>0..1</td>
- <td>The configuration fragment to be applied to the target component
during a
- configuration lifecycle stage.</td>
- </tr>
- </table>
</subsection>
<subsection name="Description">
- <p>
- A block implementation declares a set of components,
- sub-containers, and includes that make up the compostion
- of the block in terms of its internal functionality.
- </p>
+ <p>
+ A container holds a set of components,
+ sub-containers, and includes that make up the compostion
+ of the block in terms of its internal functionality, exported
+ through optional service directives.
+ </p>
</subsection>
<subsection name="Sample XML">
@@ -107,14 +76,8 @@
<source><![CDATA[
<!-- block implementation declaration -->
-<block>
-
- <!-- block info -->
- <!-- block dependecies -->
- <!-- block services -->
+<container>
- <implementation>
-
<!--
declaration of the classloader that this block
will execute within
@@ -170,9 +133,8 @@
<include path="example-block.xml"/>
<include id="osm:collaboration" version="1.0"/>
- </implementation>
+</container>
-</block>
]]></source>
</subsection>
</section>
1.5 +6 -10
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:31 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,16 +20,12 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
href="/meta/model/block/container/components/index.html"/>
- <item name="Container"
href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
- </item>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
+ <item name="Component"
href="/meta/model/block/container/components/index.html"/>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.5 +10 -20
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:31 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,27 +20,17 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
- href="/meta/model/block/container/components/index.html">
- <item name="Categories"
-
href="/meta/model/block/container/components/categories/index.html"/>
- <item name="Context"
- href="/meta/model/block/container/components/context/index.html"/>
- <item name="Configuration"
- href="/meta/model/block/container/components/configuration.html"/>
- <item name="Parameters"
-
href="/meta/model/block/container/components/parameters/index.html"/>
- </item>
- <item name="Container"
- href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
+ <item name="Component"
href="/meta/model/block/container/components/index.html">
+ <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
+ <item name="Context"
href="/meta/model/block/container/components/context/index.html"/>
+ <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
+ <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html"/>
</item>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.5 +14 -17
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,25 +20,22 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
- href="/meta/model/block/container/components/index.html">
- <item name="Categories"
href="/meta/model/block/container/components/categories/index.html">
- <item name="Category"
href="/meta/model/block/container/components/categories/category.html"/>
- </item>
- <item name="Context"
href="/meta/model/block/container/components/context/index.html"/>
- <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
- <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
+ <item name="Component"
href="/meta/model/block/container/components/index.html">
+ <item name="Categories"
href="/meta/model/block/container/components/categories/index.html">
+ <item name="Category"
href="/meta/model/block/container/components/categories/category.html"/>
</item>
- <item name="Container"
- href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Context"
+ href="/meta/model/block/container/components/context/index.html"/>
+ <item name="Configuration"
+ href="/meta/model/block/container/components/configuration.html"/>
+ <item name="Parameters"
+
href="/meta/model/block/container/components/parameters/index.html"/>
</item>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.5 +11 -19
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,27 +20,19 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
- href="/meta/model/block/container/components/index.html">
- <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
- <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
- <item name="Context"
href="/meta/model/block/container/components/context/index.html">
- <item name="Entry"
href="/meta/model/block/container/components/context/entry/index.html"/>
- <item name="Import"
href="/meta/model/block/container/components/context/import.html"/>
- </item>
- <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
- <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
+ <item name="Component"
href="/meta/model/block/container/components/index.html">
+ <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
+ <item name="Context"
href="/meta/model/block/container/components/context/index.html">
+ <item name="Entry"
href="/meta/model/block/container/components/context/entry/index.html"/>
</item>
- <item name="Container"
- href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
+ <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html"/>
</item>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.3 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 9 Jul 2003 11:39:27 -0000 1.2
+++ index.xml 17 Aug 2003 04:19:14 -0000 1.3
@@ -23,8 +23,8 @@
</td>
</tr>
</table>
-
</subsection>
+
<subsection name="Nested Elements">
<table>
<tr><th>Element</th><th>Cardinality</th><th>Description</th></tr>
@@ -37,7 +37,7 @@
</td>
</tr>
<tr>
- <td>import</td><td>1 (or param)</td>
+ <td><a href="import.html">import</a></td><td>1 (or param)</td>
<td>
Declaration of the import of a container standard context entry into
the context entries to supplied to the component.
1.5 +14 -21
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,30 +20,23 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
- href="/meta/model/block/container/components/index.html">
- <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
- <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
- <item name="Context"
href="/meta/model/block/container/components/context/index.html">
- <item name="Entry"
href="/meta/model/block/container/components/context/entry/index.html">
- <item name="Parameters"
-
href="/meta/model/block/container/components/context/entry/parameter.html"/>
- </item>
- <item name="Import"
href="/meta/model/block/container/components/context/import.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
+ <item name="Component"
href="/meta/model/block/container/components/index.html">
+ <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
+ <item name="Context"
href="/meta/model/block/container/components/context/index.html">
+ <item name="Import"
href="/meta/model/block/container/components/context/import.html"/>
+ <item name="Entry"
href="/meta/model/block/container/components/context/entry/index.html">
+ <item name="Import"
href="/meta/model/block/container/components/context/entry/import.html"/>
+ <item name="Param"
href="/meta/model/block/container/components/context/entry/parameter.html"/>
</item>
- <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
- <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html"/>
</item>
- <item name="Container"
- href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
+ <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html"/>
</item>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/import.xml
Index: import.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Import Directive</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Import Directive">
<subsection name="Attributes">
<table>
<tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
<tr>
<td>key</td><td>yes</td>
<td>
The container scoped context key to import into the component scope.
The imported key must be know by the container. Once established,
the value will be imported against the component key declared in the
enclosing entry tag.
</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>A context import directive is used to map a standard container context entry to a
component context entry.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<profile name="basic">
<context class="org.apache.avalon.playground.basic.BasicContextImp">
<entry key="home">
<import name="urn:avalon:home"/>
</entry>
</context>
</profile>
]]></source>
</subsection>
</section>
</body>
</document>
1.5 +11 -22
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/parameters/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,30 +20,19 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
- href="/meta/model/block/container/components/index.html">
- <item name="Categories"
-
href="/meta/model/block/container/components/categories/index.html"/>
- <item name="Context"
- href="/meta/model/block/container/components/context/index.html"/>
- <item name="Configuration"
- href="/meta/model/block/container/components/configuration.html"/>
- <item name="Parameters"
-
href="/meta/model/block/container/components/parameters/index.html">
- <item name="Parameter"
-
href="/meta/model/block/container/components/parameters/parameter.html"/>
- </item>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
+ <item name="Component"
href="/meta/model/block/container/components/index.html">
+ <item name="Categories"
href="/meta/model/block/container/components/categories/index.html"/>
+ <item name="Context"
href="/meta/model/block/container/components/context/index.html"/>
+ <item name="Configuration"
href="/meta/model/block/container/components/configuration.html"/>
+ <item name="Parameters"
href="/meta/model/block/container/components/parameters/index.html">
+ <item name="Parameter"
href="/meta/model/block/container/components/parameters/parameter.html"/>
</item>
- <item name="Container"
- href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.5 +8 -12
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
+++ navigation.xml 17 Aug 2003 04:19:14 -0000 1.5
@@ -20,19 +20,15 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
- <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html"/>
- <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
- </item>
- <item name="Component"
href="/meta/model/block/container/components/index.html"/>
- <item name="Container"
href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
+ <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html"/>
+ <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
</item>
+ <item name="Component"
href="/meta/model/block/container/components/index.html"/>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.4 +6 -6
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 20 Jun 2003 19:01:39 -0000 1.3
+++ index.xml 17 Aug 2003 04:19:15 -0000 1.4
@@ -14,16 +14,16 @@
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
- <td><a href="fileset.html">fileset</a></td><td>n</td>
+ <td><a href="repository/index.html">repository</a></td><td>0..n</td>
<td>
- A fileset directive.
+ A logical jar repository (repository development is in progress,
+ as such limitations may apply).
</td>
</tr>
<tr>
- <td><a href="repository/index.html">repository</a></td><td>0..n</td>
+ <td><a href="fileset.html">fileset</a></td><td>n</td>
<td>
- A logical jar repository (repository development is in progress,
- as such limitations may apply).
+ A fileset directive.
</td>
</tr>
</table>
1.6 +10 -14
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.5
+++ navigation.xml 17 Aug 2003 04:19:15 -0000 1.6
@@ -20,22 +20,18 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
- <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html">
- <item name="Repository"
href="/meta/model/block/container/engine/classpath/repository/index.html"/>
- <item name="Fileset"
href="/meta/model/block/container/engine/classpath/fileset.html"/>
- </item>
- <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
+ <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html">
+ <item name="Repository"
href="/meta/model/block/container/engine/classpath/repository/index.html"/>
+ <item name="Fileset"
href="/meta/model/block/container/engine/classpath/fileset.html"/>
</item>
- <item name="Component"
href="/meta/model/block/container/components/index.html"/>
- <item name="Container"
href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
</item>
+ <item name="Component"
href="/meta/model/block/container/components/index.html"/>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.4 +11 -15
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.3
+++ navigation.xml 17 Aug 2003 04:19:15 -0000 1.4
@@ -20,24 +20,20 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
- <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html">
- <item name="Repository"
href="/meta/model/block/container/engine/classpath/repository/index.html">
- <item name="Resource"
href="/meta/model/block/container/engine/classpath/repository/resource.html"/>
- </item>
- <item name="Fileset"
href="/meta/model/block/container/engine/classpath/fileset.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
+ <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html">
+ <item name="Repository"
href="/meta/model/block/container/engine/classpath/repository/index.html">
+ <item name="Resource"
href="/meta/model/block/container/engine/classpath/repository/resource.html"/>
</item>
- <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
+ <item name="Fileset"
href="/meta/model/block/container/engine/classpath/fileset.html"/>
</item>
- <item name="Component"
href="/meta/model/block/container/components/index.html"/>
- <item name="Container"
href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html"/>
+ <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
</item>
+ <item name="Component"
href="/meta/model/block/container/components/index.html"/>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
1.5 +0 -18
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 16 Aug 2003 11:16:34 -0000 1.4
+++ index.xml 17 Aug 2003 04:19:15 -0000 1.5
@@ -16,30 +16,12 @@
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
- <td><a href="source.html">source</a></td><td>1*</td>
- <td>
- A block.xml source include directive.
- </td>
- </tr>
- <tr>
<td><a href="resource.html">resource</a></td><td>1*</td>
<td>
A repository references from which a block descriptor will be resolved.
</td>
</tr>
- <tr>
- <td><a href="targets/index.html">targets</a></td><td>0..1</td>
- <td>
- Configuration target overrride directive.
- </td>
- </tr>
</table>
- <p>
- * NOTE: Source and resource are mutually exclusive.
- It is also an error if the include directive does not contain one of
- two possible include forms ("source" or "resource").
- </p>
-
</subsection>
<subsection name="Attributes">
1.4 +14 -12
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 23 Jun 2003 02:04:32 -0000 1.3
+++ navigation.xml 17 Aug 2003 04:19:15 -0000 1.4
@@ -20,19 +20,21 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
- <item name="Block" href="/meta/model/block/index.html">
- <item name="Info" href="/meta/model/block/info.html"/>
- <item name="Services" href="/meta/model/block/export/index.html"/>
- <item name="Dependencies" href="/meta/model/block/import/index.html"/>
- <item name="Implementation"
href="/meta/model/block/container/index.html">
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
- <item name="Component"
href="/meta/model/block/container/components/index.html"/>
- <item name="Container"
href="/meta/model/block/container/containers.html"/>
- <item name="Include"
href="/meta/model/block/container/include/index.html">
- <item name="Source"
href="/meta/model/block/container/include/source.html"/>
- <item name="Resource"
href="/meta/model/block/container/include/resource.html"/>
- <item name="Targets"
href="/meta/model/block/container/include/targets/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html">
+ <item name="Services"
href="/meta/model/block/container/services/index.html"/>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
+ <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html">
+ <item name="Repository"
href="/meta/model/block/container/engine/classpath/repository/index.html">
+ <item name="Resource"
href="/meta/model/block/container/engine/classpath/repository/resource.html"/>
+ </item>
+ <item name="Fileset"
href="/meta/model/block/container/engine/classpath/fileset.html"/>
</item>
+ <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
+ </item>
+ <item name="Component"
href="/meta/model/block/container/components/index.html"/>
+ <item name="Container"
href="/meta/model/block/container/containers.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/index.html">
+ <item name="Resource"
href="/meta/model/block/container/include/resource.html"/>
</item>
</item>
</item>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/services/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Block Service Export</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Block Service Export">
<p>In preparation.</p>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2003/08/17 04:19:15 $
</legal>
</footer>
</document>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/services/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<title>Merlin</title>
<body>
<links>
<item name="Home" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/framework/"/>
<item name="Components" href="http://avalon.apache.org/components"/>
<item name="Containers" href="http://avalon.apache.org/containers/"/>
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<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="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Container" href="/meta/model/block/container/index.html">
<item name="Services"
href="/meta/model/block/container/services/index.html">
<item name="Service"
href="/meta/model/block/container/services/service.html"/>
</item>
<item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
<item name="Component"
href="/meta/model/block/container/components/index.html"/>
<item name="Container"
href="/meta/model/block/container/containers.html"/>
<item name="Include"
href="/meta/model/block/container/include/index.html"/>
</item>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
</menu>
<menu name="Extensions">
<item name="JNDI" href="/extensions/jndi/index.html"/>
<item name="Servlet" href="/extensions/servlet/index.html"/>
</menu>
</body>
</project>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/services/service.xml
Index: service.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Block Service Export</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Block Service Export">
<p>In preparation.</p>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2003/08/17 04:19:15 $
</legal>
</footer>
</document>
1.3 +4 -6
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 27 Jun 2003 22:58:07 -0000 1.2
+++ index.xml 17 Aug 2003 04:19:15 -0000 1.3
@@ -17,10 +17,6 @@
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
- <td><a href="system.html">system</a></td><td>0..1</td>
- <td>Used during creation of URLs. If not defined the host name
defaults to locahost.</td>
- </tr>
- <tr>
<td><a href="logging.html">logging</a></td><td>0..1</td>
<td>Defintion of the root logging system.</td>
</tr>
@@ -32,6 +28,10 @@
<td><a href="repository/index.html">repository</a></td><td>0..1</td>
<td>Defintion of the repository sub-system including proxy settings,
cache directory and remote host list.</td>
</tr>
+ <tr>
+ <td><a
href="../block/container/index.html">container</a></td><td>0..1</td>
+ <td>The root container established by the kernel.</td>
+ </tr>
</table>
</subsection>
@@ -47,8 +47,6 @@
<source><![CDATA[
<!-- kernel declaration -->
<kernel>
-
- <system host="home.osm.net"/>
<logging target="default" priority="INFO">
<category name="/sys/logger" priority="WARN"/>
1.4 +2 -3
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 27 Jun 2003 22:58:07 -0000 1.3
+++ navigation.xml 17 Aug 2003 04:19:15 -0000 1.4
@@ -20,12 +20,11 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html">
- <item name="System" href="/meta/model/kernel/system.html"/>
<item name="Logging" href="/meta/model/kernel/logging.html"/>
- <item name="Categories" href="/meta/model/kernel/categories.html"/>
+ <item name="Categories"
href="/meta/model/kernel/categories/index.html"/>
<item name="Repository"
href="/meta/model/kernel/repository/index.html"/>
</item>
- <item name="Block" href="/meta/model/block/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html"/>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/categories/category.xml
Index: category.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Category Directive</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Category Directive">
<subsection name="Attributes">
<table>
<tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
<tr>
<td>name</td><td>yes</td>
<td>
Logging category name. The category name refers to
a logging sub-category within the enclosing category.
</td>
</tr>
<tr>
<td>priority</td><td>no</td>
<td>
The logging priority (one of INFO, WARN, ERROR, FATAL, DEBUG).
</td>
</tr>
<tr>
<td>target</td><td>no</td>
<td>
Named logging target.
</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>The logging channel category directive.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<category name="/sys" priority="INFO"/>
]]></source>
</subsection>
</section>
</body>
</document>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/categories/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Categories Directive</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Categories Directive">
<subsection name="Attributes">
<table>
<tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
<tr>
<td>priority</td><td>no</td>
<td>
The default logging priority (one of INFO, WARN, ERROR, FATAL, DEBUG)
to assign to the component.
</td>
</tr>
<tr>
<td>target</td><td>no</td>
<td>
Named default logging target.
</td>
</tr>
</table>
</subsection>
<subsection name="Nested Elements">
<table>
<tr><th>Element</th><th>Cardinality</th><th>Description</th></tr>
<tr>
<td><a href="category.html">category</a></td><td>0..n</td>
<td>Logging sub-category directive.</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>The logging channels used by a component may be parameterized using a categories
directive. Each category with a categories directive enables customization of the
priority and targets of logging channels used by the component.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<!--
Create a component with a logging channel priority of INFO.
Set the subsidiary channel for tutorial.data to a priority
of DEBUG and the tutorial.data.model channel to a ERROR
priority.
-->
<component name="tutorial">
<categories priority="INFO">
<category name="/data" priority="DEBUG"/>
<category name="/data/model" priority="ERROR"/>
</categories>
</component>
]]></source>
</subsection>
</section>
</body>
</document>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/categories/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<title>Merlin</title>
<body>
<links>
<item name="Home" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/framework/"/>
<item name="Components" href="http://avalon.apache.org/components"/>
<item name="Containers" href="http://avalon.apache.org/containers/"/>
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<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="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html">
<item name="Logging" href="/meta/model/kernel/logging.html"/>
<item name="Categories" href="/meta/model/kernel/categories/index.html">
<item name="Categories"
href="/meta/model/kernel/categories/index.html"/>
</item>
<item name="Repository" href="/meta/model/kernel/repository/index.html"/>
</item>
<item name="Container" href="/meta/model/block/container/index.html"/>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
</menu>
<menu name="Extensions">
<item name="JNDI" href="/extensions/jndi/index.html"/>
<item name="Servlet" href="/extensions/servlet/index.html"/>
</menu>
</body>
</project>
1.2 +2 -3
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 27 Jun 2003 22:58:07 -0000 1.1
+++ navigation.xml 17 Aug 2003 04:19:15 -0000 1.2
@@ -20,16 +20,15 @@
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html">
- <item name="System" href="/meta/model/kernel/system.html"/>
<item name="Logging" href="/meta/model/kernel/logging.html"/>
- <item name="Categories" href="/meta/model/kernel/categories.html"/>
+ <item name="Categories"
href="/meta/model/kernel/categories/index.html"/>
<item name="Repository" href="/meta/model/kernel/repository/index.html">
<item name="Cache" href="/meta/model/kernel/repository/cache.html"/>
<item name="Proxy" href="/meta/model/kernel/repository/proxy.html"/>
<item name="Hosts" href="/meta/model/kernel/repository/hosts.html"/>
</item>
</item>
- <item name="Block" href="/meta/model/block/index.html"/>
+ <item name="Container" href="/meta/model/block/container/index.html"/>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
1.2 +3 -8
avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/implementation.xml
Index: implementation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/implementation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- implementation.xml 10 Jun 2003 02:14:30 -0000 1.1
+++ implementation.xml 17 Aug 2003 04:19:15 -0000 1.2
@@ -22,16 +22,11 @@
ready to handle account creation and removal requests.
</p>
<source><![CDATA[
-<block>
+<container name="banking">
- <info>
- <name>banking</name>
- </info>
+ <component name="bank" class="org.apache.bank.impl.BankProvider"
activation="startup"/>
- <implementation>
- <component name="bank" class="org.apache.bank.impl.BankProvider"
activation="startup"/>
- </implementation>
-</block>
+</container>
]]></source>
</subsection>
<subsection name="Bank Implementation">
1.4 +2 -8
avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 4 Jul 2003 11:31:37 -0000 1.3
+++ block.xml 17 Aug 2003 04:19:15 -0000 1.4
@@ -35,11 +35,7 @@
</subsection>
<subsection name="block.xml">
<source><![CDATA[
-<block>
-
- <info>
- <name>james</name>
- </info>
+<container name="james">
<!--
Service provided by this block.
@@ -444,9 +440,7 @@
</configuration>
</component>
- </implementation>
-
-</block>
+</container>
]]></source>
</subsection>
</section>
1.2 +2 -8
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/creation.xml
Index: creation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/creation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creation.xml 10 Jun 2003 02:14:33 -0000 1.1
+++ creation.xml 17 Aug 2003 04:19:15 -0000 1.2
@@ -71,17 +71,11 @@
A block is the definition of a composite component. It represents an
application made up of a set of components and the supporting resources. In our
example the block will container the single HelloComponent component. The following
XML description should be declared under a BLOCK-INF directory. It declares a block
named "tutorial". The root container includes the declaration of the hello component.
Based on this infromation Merlin will create a container and deploy the hello
component on startup.
</p>
<source><![CDATA[
-<block>
+<container name="banking">
- <info>
- <name>banking</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup"/>
- </implementation>
-</block>
+</container>
]]></source>
</subsection>
<subsection name="Execution">
1.3 +2 -8
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 15 Jun 2003 17:43:24 -0000 1.2
+++ block.xml 17 Aug 2003 04:19:15 -0000 1.3
@@ -19,21 +19,15 @@
tutorial/configuration/block directory.
</p>
<source><![CDATA[
-<block>
+<container name="hello">
- <info>
- <name>hello</name>
- </info>
-
- <implementation>
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<configuration>
<source>explicit configuration within block</source>
</configuration>
</component>
- </implementation>
-</block>
+</container>
]]></source>
<p>
Build and run the tutorial again.
1.2 +5 -13
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/casting.xml
Index: casting.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/casting.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- casting.xml 10 Jun 2003 02:14:36 -0000 1.1
+++ casting.xml 17 Aug 2003 04:19:15 -0000 1.2
@@ -224,19 +224,11 @@
context implementation.
</p>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
- <component name="hello" class="tutorial.HelloComponent" activation="startup">
- <context class="tutorial.DemoContextProvider"/>
- </component>
- </implementation>
-
-</block>
+<container name="tutorial">
+ <component name="hello" class="tutorial.HelloComponent" activation="startup">
+ <context class="tutorial.DemoContextProvider"/>
+ </component>
+</container>
]]></source>
</subsection>
<subsection name="Executing the example">
1.3 +2 -10
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/entries.xml
Index: entries.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/entries.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- entries.xml 9 Jul 2003 11:39:27 -0000 1.2
+++ entries.xml 17 Aug 2003 04:19:15 -0000 1.3
@@ -141,13 +141,7 @@
</p>
<p><i>block.xml</i></p>
<source><![CDATA[
-<block>
-
- <info>
- <name>tutorial</name>
- </info>
-
- <implementation>
+ <container name="tutorial">
<component name="hello" class="tutorial.HelloComponent" activation="startup">
<context>
<entry key="cruncher">
@@ -158,9 +152,7 @@
</entry>
</context>
</component>
- </implementation>
-
-</block>
+ </container>
]]></source>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
