You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ne...@apache.org on 2003/10/25 17:18:24 UTC
cvs commit: avalon/merlin/platform/xdocs/starting/advanced/lifecycle example.xml extension.xml
neeme 2003/10/25 08:18:24
Modified: merlin/platform/xdocs/starting/advanced composite.xml
context.xml profiles.xml
merlin/platform/xdocs/starting/advanced/lifecycle
example.xml extension.xml
Log:
various fixes for spelling and other mistakes
Revision Changes Path
1.2 +4 -4 avalon/merlin/platform/xdocs/starting/advanced/composite.xml
Index: composite.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/composite.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- composite.xml 24 Sep 2003 09:35:15 -0000 1.1
+++ composite.xml 25 Oct 2003 15:18:23 -0000 1.2
@@ -76,7 +76,7 @@
</p>
<ul>
<li><p>an application component</p></li>
- <li><p>a location provider block inlcuded by reference</p></li>
+ <li><p>a location provider block included by reference</p></li>
<li><p>an application block included by reference</p></li>
</ul>
<p>
@@ -87,10 +87,10 @@
blocks relative to the services and dependencies they declare.
When a block is deployed, it appears to other components as a
component providing the services it exports. However in practice
- these services are provided by components defined with the
- container (i.e. the container represents the defintion of
+ these services are provided by components defined within the
+ container (i.e. the container represents the definition of
a virtual component and the containers components and subcontainers
- represent the virual compoent implementation).
+ represent the virtual component implementation).
</p>
<p>The top level application block declaration (block.xml):</p>
<source><![CDATA[
1.4 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/context.xml
Index: context.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/context.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- context.xml 1 Oct 2003 11:18:38 -0000 1.3
+++ context.xml 25 Oct 2003 15:18:23 -0000 1.4
@@ -75,7 +75,7 @@
</ul>
<p>
Resources supporting this tutorial are included in the
- src/tutorials/context/strategy package.
+ tutorials/context/strategy package.
</p>
</subsection>
<subsection name="Contextualization stage definition">
1.4 +12 -4 avalon/merlin/platform/xdocs/starting/advanced/profiles.xml
Index: profiles.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/profiles.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- profiles.xml 4 Oct 2003 10:45:19 -0000 1.3
+++ profiles.xml 25 Oct 2003 15:18:23 -0000 1.4
@@ -60,10 +60,15 @@
<section name="Advanced Features">
<subsection name="Packaged Deployment Profiles">
<p>
-Central to the Merlin component management model is the notion deployment profiles. A profile is a predefined deployment template. It enables Merlin to establish a component type and associated context, parameterisation and/or configuration information as a candidate scenario when building a connected set of components.
+Central to the Merlin component management model is the notion of deployment
+profiles. A profile is a predefined deployment template. It enables Merlin to
+establish a component type and associated context, parameterization and/or
+configuration information as a candidate scenario when building a connected
+set of components.
</p>
<p>
-Component deployment profiles are co-located with the component implementation class under a .xprofile resource.
+Component deployment profiles are co-located with the component implementation
+class under a .xprofile resource.
</p>
</subsection>
<subsection name="Creating a Profile">
@@ -156,9 +161,12 @@
[INFO ] (tutorial.randomizer-primary): seed: 1024
[INFO ] (tutorial.hello): resolved random: -1250858422
[INFO ] (kernel): dissassembly phase
-[INFO ] (kernel): disposal phase</source>
+[INFO ] (kernel): disposal phase
+</source>
<p>
-Note: When constructing a name for the component based on a packaged profile, Merlin will append the component type name to the profile name, seperated by the - character resulting in the component name 'random-provider-randomizer'.
+Note: When constructing a name for the component based on a packaged profile,
+Merlin will append the profile name to the component type name, seperated by
+the - character resulting in the component name 'randomizer-primary'.
</p>
</subsection>
1.2 +20 -3 avalon/merlin/platform/xdocs/starting/advanced/lifecycle/example.xml
Index: example.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/example.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example.xml 24 Sep 2003 09:35:20 -0000 1.1
+++ example.xml 25 Oct 2003 15:18:23 -0000 1.2
@@ -113,7 +113,14 @@
</source>
<p>
-To complete the defintion of you extension handler you need to prepare the meta-info that will be used by Merlin to identify the extension and the stage interface is supports. The following <type/> declaration includes an <extensions/> tag that contains a <reference/> element that includes the reference to the Explitable lifecycle stage interface. This is the key that Merlin uses to associate a handler with a component. If you extension class requires any specific context values, they should be declared in a context element within the extension element.
+To complete the definition of your extension handler you need to prepare the
+meta-info that will be used by Merlin to identify the extension and the stage
+interface it supports. The following <type/> declaration includes an
+<extensions/> tag that contains a <reference/> element that
+includes the reference to the Exploitable lifecycle stage interface. This is
+the key that Merlin uses to associate a handler with a component. If your
+extension class requires any specific context values, they should be declared
+in a <context/> element within the <extension/> element.
</p>
<source><![CDATA[
@@ -148,7 +155,13 @@
</source>
<p>
-To complete the defintion of your component you need to prepare the meta-info that will be used by Merlin to identify the stage interface is requires a handler for. The following <type/> declaration includes an <stage/> tag that contains a <reference/> element that includes the reference to the Exploitable lifecycle stage interface. This is the key that Merlin uses to associate the component with a handler capable of handling the Exploitable interface.
+To complete the defintion of your component you need to prepare the meta-info
+that will be used by Merlin to identify the stage interface it requires a
+handler for. The following <type/> declaration includes a
+<stage/> tag that contains a <reference/> element that includes
+a reference to the Exploitable lifecycle stage interface. This is the key that
+Merlin uses to associate the component with a handler capable of handling the
+Exploitable interface.
</p>
<source><![CDATA[
@@ -169,7 +182,11 @@
<subsection name="Execution">
-<p>To execute the example you simply need to include a reference to you component within a Merlin container declaration. The following XML source declares a Merlin kernel, container, and component. You don't need to include the handler because Merlin can sort that out itself based on the information supplied in the meta-info declarations.</p>
+<p>To execute the example you simply need to include a reference to your
+component within a Merlin container declaration. The following XML source
+declares a Merlin kernel, container, and component. You don't need to include
+the handler because Merlin can sort that out itself based on the information
+supplied in the meta-info declarations.</p>
<source><![CDATA[
1.2 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/lifecycle/extension.xml
Index: extension.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/extension.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extension.xml 24 Sep 2003 09:35:20 -0000 1.1
+++ extension.xml 25 Oct 2003 15:18:23 -0000 1.2
@@ -68,7 +68,7 @@
<p>
Lifecycle extensions provide support for the declaration of supplimentary
stages above and beyond the classic Avalon stages. These custom stages
- can be introduced during component creation, deployment, decommissining,
+ can be introduced during component creation, deployment, decommissioning,
and release.
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org