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:27:07 UTC
cvs commit: avalon/merlin/platform/xdocs/starting/advanced/unit example.xml index.xml
neeme 2003/10/25 08:27:07
Modified: merlin/platform/xdocs/starting/advanced index.xml
merlin/platform/xdocs/starting/advanced/unit example.xml
index.xml
Log:
various fixes for spelling and other mistakes
Revision Changes Path
1.7 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/index.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.xml 14 Oct 2003 10:53:41 -0000 1.6
+++ index.xml 25 Oct 2003 15:27:07 -0000 1.7
@@ -84,7 +84,7 @@
</tr>
<tr>
<td><a href="unit/index.html">Unit Tests</a></td>
- <td>Setting up unit tests the leverage merlin as the component factory.</td>
+ <td>Setting up unit tests that leverage merlin as the component factory.</td>
</tr>
</table>
</section>
1.2 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/unit/example.xml
Index: example.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/example.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example.xml 14 Oct 2003 10:53:41 -0000 1.1
+++ example.xml 25 Oct 2003 15:27:07 -0000 1.2
@@ -63,7 +63,7 @@
included in the hello tutorial.
</p>
<p><i>block.xml<br/>
- Definition of a container holding a single componet.
+ Definition of a container holding a single component.
</i></p>
<source><![CDATA[
<container name="tutorial">
1.2 +6 -6 avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 14 Oct 2003 10:53:41 -0000 1.1
+++ index.xml 25 Oct 2003 15:27:07 -0000 1.2
@@ -92,11 +92,11 @@
}
</source>
<p>
- The default behaviour it to deploy a block based on the
+ The default behaviour is to deploy a block based on the
deployment path ${basedir}/target/classes/. Merlin will attempt
to locate a block.xml file at the [DEPLOYMENT-PATH]/BLOCK-INF/block.xml.
To make sure that a block.xml file and component meta-info is available under
- ${basedir}/target/classes/ and you need to include the following resource
+ ${basedir}/target/classes/ you need to include the following resource
statement in you maven project descriptor.
</p>
<source><![CDATA[
@@ -123,15 +123,15 @@
<p>
You can now access components established by Merlin via
- the component name. For example, if you block.xml defines
+ the component name. For example, if your block.xml defines
a component named "hello" you access the component by
requesting the relative path "hello". Relative paths are
resolved relative to the container defined by your block
- defintion.
+ definition.
</p>
<p>
The following code fragment demonstrates the usage of the
- resolve method to locate a named component and a convinience
+ resolve method to locate a named component and a convenience
getLogger() method.
</p>
<source><![CDATA[
@@ -146,7 +146,7 @@
</subsection>
<subsection name="Customizing Merlin behaviour">
<p>
- The abstract test case include a constructor that allows
+ The abstract test case includes a constructor that allows
control over the deployment path, configuration, debugging
and info generation policies. Please refer to the supporting
javadoc for more details.
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org