mcconnell 2003/08/28 10:44:28
Modified: merlin/merlin-platform/xdocs/meta/block/components index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/categories
navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/context
navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/parameters
navigation.xml parameter.xml
Added: merlin/merlin-platform/xdocs/meta/block/components/dependencies
dependency.xml index.xml navigation.xml
Log:
Add dependency overrides (dedicated to Leo).
Revision Changes Path
1.2 +4 -0
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 28 Aug 2003 04:06:35 -0000 1.1
+++ index.xml 28 Aug 2003 17:44:28 -0000 1.2
@@ -48,6 +48,10 @@
<td>Defintion of the context class and entries.</td>
</tr>
<tr>
+ <td><a href="dependencies/index.html">dependencies</a></td><td>0..1</td>
+ <td>Optional declaration of explicit dependency provider
assignments.</td>
+ </tr>
+ <tr>
<td><a href="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>
1.2 +1 -0
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 28 Aug 2003 04:06:35 -0000 1.1
+++ navigation.xml 28 Aug 2003 17:44:28 -0000 1.2
@@ -24,6 +24,7 @@
<item name="component" href="/meta/block/components/index.html">
<item name="categories"
href="/meta/block/components/categories/index.html"/>
<item name="context" href="/meta/block/components/context/index.html"/>
+ <item name="dependencies"
href="/meta/block/components/dependencies/index.html"/>
<item name="configuration"
href="/meta/block/components/configuration.html"/>
<item name="parameters"
href="/meta/block/components/parameters/index.html"/>
</item>
1.2 +1 -0
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 28 Aug 2003 04:06:35 -0000 1.1
+++ navigation.xml 28 Aug 2003 17:44:28 -0000 1.2
@@ -26,6 +26,7 @@
<item name="Category"
href="/meta/block/components/categories/category.html"/>
</item>
<item name="context" href="/meta/block/components/context/index.html"/>
+ <item name="dependencies"
href="/meta/block/components/dependencies/index.html"/>
<item name="configuration"
href="/meta/block/components/configuration.html"/>
<item name="parameters"
href="/meta/block/components/parameters/index.html"/>
</item>
1.2 +1 -0
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 28 Aug 2003 04:06:35 -0000 1.1
+++ navigation.xml 28 Aug 2003 17:44:28 -0000 1.2
@@ -26,6 +26,7 @@
<item name="context" href="/meta/block/components/context/index.html">
<item name="entry"
href="/meta/block/components/context/entry/index.html"/>
</item>
+ <item name="dependencies"
href="/meta/block/components/dependencies/index.html"/>
<item name="configuration"
href="/meta/block/components/configuration.html"/>
<item name="parameters"
href="/meta/block/components/parameters/index.html"/>
</item>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/dependency.xml
Index: dependency.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Dependency Directive</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Dependency 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 dependency key.</td>
</tr>
<tr>
<td>source</td><td>yes</td>
<td>The relative path to the component to use as the service
provider.</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>A dependency directive is used to override merlin's auto-assembly semantics by
declaring a relative path to a component that should be used as the service
provider.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<container name="tutorial">
<classloader>
<classpath>
<repository>
<resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
<resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
</repository>
</classpath>
</classloader>
<component name="gloria" class="tutorial.IdentifiableComponent"/>
<component name="nancy" class="tutorial.IdentifiableComponent"/>
<component name="hello" class="tutorial.HelloComponent">
<dependencies>
<dependency key="primary" source="gloria"/>
<dependency key="secondary" source="nancy"/>
</dependencies>
</component>
</container>
]]></source>
</subsection>
</section>
</body>
</document>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Dependencies Directive</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Dependencies Directive">
<subsection name="Nested Elements">
<table>
<tr><th>Element</th><th>Cardinality</th><th>Description</th></tr>
<tr>
<td><a href="dependency.html">dependency</a></td><td>n</td>
<td>
Declaration of a dependency directive.
</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>A dependencies directive contains a set of optional dependency directives that
may be used to override the default auto-assembly semantics within Merlin.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<component name="hello" class="tutorial.HelloComponent">
<dependencies>
<dependency key="primary" source="gloria"/>
<dependency key="secondary" source="nancy"/>
</dependencies>
</component>
]]></source>
</subsection>
</section>
</body>
</document>
1.1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/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="kernel.xml" href="/meta/kernel/index.html"/>
<item name="blocks.xml" href="/meta/block/index.html">
<item name="services" href="/meta/block/services/index.html"/>
<item name="classloader" href="/meta/block/classloader/index.html"/>
<item name="component" href="/meta/block/components/index.html">
<item name="categories"
href="/meta/block/components/categories/index.html"/>
<item name="context" href="/meta/block/components/context/index.html"/>
<item name="dependencies"
href="/meta/block/components/dependencies/index.html">
<item name="dependency"
href="/meta/block/components/dependencies/dependency.html"/>
</item>
<item name="configuration"
href="/meta/block/components/configuration.html"/>
<item name="parameters"
href="/meta/block/components/parameters/index.html"/>
</item>
<item name="container" href="/meta/block/index.html"/>
<item name="include" href="/meta/block/include/index.html"/>
</item>
<item name="config.xml" href="/meta/config/index.html"/>
</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 +1 -0
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 28 Aug 2003 04:06:35 -0000 1.1
+++ navigation.xml 28 Aug 2003 17:44:28 -0000 1.2
@@ -24,6 +24,7 @@
<item name="component" href="/meta/block/components/index.html">
<item name="categories"
href="/meta/block/components/categories/index.html"/>
<item name="context" href="/meta/block/components/context/index.html"/>
+ <item name="dependencies"
href="/meta/block/components/dependencies/index.html"/>
<item name="configuration"
href="/meta/block/components/configuration.html"/>
<item name="parameters"
href="/meta/block/components/parameters/index.html">
<item name="parameter"
href="/meta/block/components/parameters/parameter.html"/>
1.2 +0 -1
avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/parameter.xml
Index: parameter.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/parameter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parameter.xml 28 Aug 2003 04:06:35 -0000 1.1
+++ parameter.xml 28 Aug 2003 17:44:28 -0000 1.2
@@ -28,7 +28,6 @@
<subsection name="Description">
<p>A parameters directive is used by Merlin to construct an entry within a
Parameters instance.</p>
- <p><strong>Attributes</strong></p>
</subsection>
<subsection name="Sample XML">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
