You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/20 14:52:30 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config override.xml
mcconnell 2003/04/20 05:52:30
Modified: merlin/merlin-smp/xdocs/starting/advanced index.xml
navigation.xml
merlin/merlin-smp/xdocs/starting/hello internal.xml
merlin/merlin-smp/xdocs/starting/hello/config override.xml
Log:
Updated navigation to reflect includes tutorial.
Revision Changes Path
1.5 +5 -3 avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 8 Apr 2003 11:54:09 -0000 1.4
+++ index.xml 20 Apr 2003 12:52:30 -0000 1.5
@@ -19,11 +19,13 @@
<td><a href="selectors.html">Profile Selectors</a></td>
<td>Using profile selectors to influence and/or override the assembly process.</td>
</tr>
- <!--
<tr>
- <td><a href="import.html">Importing Blocks</a></td>
- <td>Example of block composition via import statements.</td>
+ <td><a href="includes.html">Block Includes</a></td>
+ <td>Example of block composition via include statements with emphasis
+ on managing multiple external configurations. This tutorial also
+ includes usage of the application repository.</td>
</tr>
+ <!--
<tr>
<td><a href="export.html">Exporting Services</a></td>
<td>Using block level service export statements to isolate a block implementation from the services it provides.</td>
1.10 +1 -1 avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- navigation.xml 17 Apr 2003 22:01:50 -0000 1.9
+++ navigation.xml 20 Apr 2003 12:52:30 -0000 1.10
@@ -20,8 +20,8 @@
<item name="Advanced Features" href="/starting/advanced/index.html">
<item name="Deployment Templates" href="/starting/advanced/profiles.html"/>
<item name="Profile Selectors" href="/starting/advanced/selectors.html"/>
+ <item name="Block Includes" href="/starting/advanced/includes.html"/>
<!--
- <item name="Importing Blocks" href="/starting/advanced/import.html"/>
<item name="Exporting Services" href="/starting/advanced/export.html"/>
<item name="Creating Contextualizers" href="/starting/advanced/context.html"/>
<item name="Using a Custom Appliance" href="/starting/advanced/appliance.html"/>
1.2 +3 -3 avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/internal.xml
Index: internal.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/internal.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- internal.xml 2 Apr 2003 15:52:17 -0000 1.1
+++ internal.xml 20 Apr 2003 12:52:30 -0000 1.2
@@ -63,14 +63,14 @@
]]></source>
<p>
- Another example of internal component bootstraping is the location
- of the the DefaultBlock, DefaultContainer and DefaultKernel types
+ Another example of internal component bootstraping is the resolution
+ of the the StandardBlock, DefaultContainer and DefaultKernel types
which are components used by the Merlin core.
</p>
<source><![CDATA[
[DEBUG ] (sys): scanning: file:/F:/system/merlin/lib/system/merlin-core-2.1.jar
-[DEBUG ] (sys.types): add: [block] org.apache.avalon.merlin.block.impl.DefaultBlock:1.0.0
+[DEBUG ] (sys.types): add: [block] org.apache.avalon.merlin.block.impl.StandardBlock:1.0.0
[DEBUG ] (sys.types): add: [container] org.apache.avalon.merlin.container.impl.DefaultContainer:1.0
.0
[DEBUG ] (sys.types): add: [kernel] org.apache.avalon.merlin.kernel.impl.DefaultKernel:1.0.0
1.2 +4 -4 avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config/override.xml
Index: override.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config/override.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- override.xml 18 Apr 2003 21:01:37 -0000 1.1
+++ override.xml 20 Apr 2003 12:52:30 -0000 1.2
@@ -11,7 +11,7 @@
<section name="Using Merlin">
<subsection name="Using configuration overrides">
<p>
- The Merlin command line tool allws the specification of a
+ The Merlin command line tool allows the specification of a
set of overriding configuration targets. Each target in the
<targets> set contains a a configuration that may be
applied to a named component. This allows modification of a
@@ -22,7 +22,7 @@
<subsection name="Target Override Format">
<source><![CDATA[
<targets>
- <target name="/hello">
+ <target path="/hello">
<configuration>
<source>External configuration target.</source>
</configuration>
@@ -41,7 +41,7 @@
</source>
<p>
Executing Merlin demonstrates that the configuration supplied
- to the hello component reflects the configuration eleemnt contained
+ to the hello component reflects the configuration element contained
in the target name "hello".
</p>
<source>
@@ -60,7 +60,7 @@
</p>
<source><![CDATA[
<targets>
- <target name="/container/hello">
+ <target path="/container/hello">
<configuration>
<source>External configuration target.</source>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org