mcconnell 2003/08/23 10:18:57
Modified: merlin/merlin-platform/xdocs/merlin/kernel cli.xml
merlin/merlin-platform/xdocs/resources download.xml
merlin/merlin-platform/xdocs/tools index.xml navigation.xml
merlin/merlin-platform/xdocs/tools/maven deploy.xml
index.xml navigation.xml
Log:
Doc updates.
Revision Changes Path
1.2 +5 -1
avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/cli.xml
Index: cli.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/cli.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cli.xml 10 Jun 2003 02:14:14 -0000 1.1
+++ cli.xml 23 Aug 2003 17:18:57 -0000 1.2
@@ -30,7 +30,7 @@
</p>
<source><![CDATA[
$ merlin -help
-usage: merlin [block] [-debug] [-config <file>] [-lang <code>]
+usage: merlin [block] [-info] [-debug] [-config <file>] [-lang <code>]
[-system <directory>] [-kernel <file>] [-home <directory>] [-version] [-help]
]]></source>
</subsection>
@@ -46,6 +46,10 @@
<tr>
<td>-version</td><td></td>
<td>Prints Merlin version information.</td>
+ </tr>
+ <tr>
+ <td>-info</td><td></td>
+ <td>Lists deployment parameters on startup.</td>
</tr>
<tr>
<td>-debug</td><td></td>
1.3 +15 -2
avalon-sandbox/merlin/merlin-platform/xdocs/resources/download.xml
Index: download.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/download.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- download.xml 15 Jun 2003 17:43:24 -0000 1.2
+++ download.xml 23 Aug 2003 17:18:57 -0000 1.3
@@ -9,8 +9,21 @@
<body>
<section name="Download">
- <subsection name="Instructions">
- <p>PLACEHOLDER</p>
+ <subsection name="Binary Downloads">
+ <p>
+ Binary downloads of the Merlin installation, tutorials, and
+ related documentation are available on the ibiblio site.
+ </p>
+
+ <p>
+ <a href="http://www.ibiblio.org/maven/merlin/distributions";>
+ Merlin Binary Distribution</a>
+ </p>
+
+ <p>
+ <a
href="http://www.ibiblio.org/maven/merlin/distributions/INSTALLATION.TXT";>
+ Installation Instructions</a>
+ </p>
</subsection>
</section>
</body>
1.3 +11 -12 avalon-sandbox/merlin/merlin-platform/xdocs/tools/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 10 Jun 2003 05:10:41 -0000 1.2
+++ index.xml 23 Aug 2003 17:18:57 -0000 1.3
@@ -21,24 +21,23 @@
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
- <td><a href="tags/index.html">Javadoc Tags</a></td>
+ <td><a href="maven/index.html">Maven Plugin</a></td>
<td>
- Reference specification of the Javadoc Tags used to
- support automation of component and service metadata.
+ The Merlin plugin for Maven that provides support for
+ meta infor generation when building with the Maven tool.
</td>
</tr>
+ </table>
+ </subsection>
+ <subsection name="Related Resources">
+ <table>
+ <tr><th>Topic</th><th>Summary</th></tr>
<tr>
- <td><a href="ant.html">Meta Generation Ant Task</a></td>
<td>
- An Ant task supporting generation of XML or serialized
- meta-info descriptors.
- </td>
- </tr>
- <tr>
- <td><a href="maven/index.html">Maven Plugin</a></td>
+<a href="http://avalon.apache.org/sandbox/avalon-meta/tools/index.html";>Javadoc
Tags</a></td>
<td>
- The Merlin plugin for Maven that provides support for
- meta infor generation when building with the Maven tool.
+ Reference specification of the Javadoc Tags used to
+ support automation of component and service metadata.
</td>
</tr>
</table>
1.3 +2 -2 avalon-sandbox/merlin/merlin-platform/xdocs/tools/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 10 Jun 2003 05:10:41 -0000 1.2
+++ navigation.xml 23 Aug 2003 17:18:57 -0000 1.3
@@ -19,9 +19,9 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html">
- <item name="Javadoc Tags Reference" href="/tools/tags/index.html"/>
- <item name="Meta-Info Generator Task" href="/tools/ant.html"/>
<item name="Merlin Plugin for Maven" href="/tools/maven/index.html"/>
+ <item name="Meta Plugin for Maven"
+ href="http://avalon.apache.org/sandbox/avalon-meta/tools/index.html"/>
</item>
<item name="Resources" href="/resources/index.html"/>
</menu>
1.2 +6 -9
avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/deploy.xml
Index: deploy.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/deploy.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deploy.xml 10 Jun 2003 05:10:42 -0000 1.1
+++ deploy.xml 23 Aug 2003 17:18:57 -0000 1.2
@@ -7,27 +7,24 @@
</properties>
<body>
<section name="Merlin Plugin for Maven">
- <subsection name="Deployment">
- <p>
-The Merlin Plugin for Maven includes two goals supporting simulated and actual
deployment of a block within Maven.
- </p>
- </subsection>
<subsection name="Goals">
<table>
<tr><th>Goal</th><th>Description</th></tr>
<tr>
<td>merlin:simulate</td>
<td>
- <p>Initiates the deployment of a block based on a block.xml directive
- contained in the maven.conf directory using the target/classes
- as the source of components and meta-info.</p>
+ <p>Initiates the deployment of a block based on a
+ ${maven.build.dir}/classes/BLOCK-INF/block.xml directive. Classes
+ under the ${maven.build.dir}/classes directory are implicity added
+ to the container classloader.</p>
</td>
</tr>
<tr>
<td>merlin:deploy</td>
<td>
<p>Initiates the deployment of a block based on a block.xml directive
- contained in the generated jar file. The jar file is impliicity
+ contained in the generated jar file under the path
+ ${maven.build.dir}/${maven.final.name}.jar. The jar file is
impliicity
included within the deployment classpath.</p>
</td>
</tr>
1.2 +4 -10
avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 05:10:42 -0000 1.1
+++ index.xml 23 Aug 2003 17:18:57 -0000 1.2
@@ -18,23 +18,17 @@
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
- <td><a href="meta.html">Meta Generation</a></td>
- <td>
- Goals supporting the automated generation of Merlin meta info.
- </td>
- </tr>
- <tr>
- <td><a href="deploy.html">Component deployment</a></td>
+ <td><a href="deploy.html">Goals</a></td>
<td>
Goals supporting simulated and operational component
deployment within Maven.
</td>
</tr>
<tr>
- <td><a href="replicate.html">Maven to Merlin repository
replication</a></td>
+ <td><a href="properties.html">Properties</a></td>
<td>
- A goal supporting the replication of a Maven artifact to the
- Merlin repository.
+ Plugin properties enabling customization of plugin
+ behaviour.
</td>
</tr>
</table>
1.2 +4 -5
avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 05:10:42 -0000 1.1
+++ navigation.xml 23 Aug 2003 17:18:57 -0000 1.2
@@ -19,13 +19,12 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html">
- <item name="Javadoc Tags Reference" href="/tools/tags/index.html"/>
- <item name="Meta-Info Generator Task" href="/tools/ant.html"/>
<item name="Merlin Plugin for Maven" href="/tools/maven/index.html">
- <item name="Meta Generation" href="/tools/maven/meta.html"/>
- <item name="Deployment" href="/tools/maven/deploy.html"/>
- <item name="Replication" href="/tools/maven/replicate.html"/>
+ <item name="Goals" href="/tools/maven/deploy.html"/>
+ <item name="Properties" href="/tools/maven/properties.html"/>
</item>
+ <item name="Meta Plugin for Maven"
+ href="http://avalon.apache.org/sandbox/avalon-meta/tools/index.html"/>
</item>
<item name="Resources" href="/resources/index.html"/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
