mcconnell 2003/07/15 16:55:15
Modified: meta/plugin plugin.jelly plugin.properties project.xml
meta/site/xdocs navigation.xml
meta/site/xdocs/tools index.xml navigation.xml
meta/site/xdocs/tools/maven index.xml navigation.xml
meta/site/xdocs/tools/tags navigation.xml
meta/site/xdocs/tutorial navigation.xml
Log:
Cleaning up doc - updating references to Merlin to Avalon Meta.
Revision Changes Path
1.5 +3 -3 avalon-sandbox/meta/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/plugin/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 15 Jul 2003 19:05:45 -0000 1.4
+++ plugin.jelly 15 Jul 2003 23:55:14 -0000 1.5
@@ -32,9 +32,9 @@
<ant:mkdir dir="${maven.build.dest}"/>
<ant:avalon destDir="${maven.build.dest}"
- format="${merlin.meta.format}"
- force="${merlin.meta.force}"
- postfix="${merlin.meta.type.postfix}">
+ format="${avalon.meta.format}"
+ force="${avalon.meta.force}"
+ postfix="${avalon.meta.type.postfix}">
<j:if test="${javaSourcesPresent == 'true'}">
<ant:fileset dir="${maven.src.dir}/java">
1.2 +4 -4 avalon-sandbox/meta/plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/plugin/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 10 Jul 2003 12:10:24 -0000 1.1
+++ plugin.properties 15 Jul 2003 23:55:15 -0000 1.2
@@ -1,14 +1,14 @@
# ------------------------------------------------------------------
# P L U G I N P R O P E R T I E S
# -------------------------------------------------------------------
-# Merlin plugin.
+# Avalon plugin.
# -------------------------------------------------------------------
#
# Policy controlling the regeneration of meta descriptors independently
# of the descriptor data. This value defaults to false.
#
-merlin.meta.force=false
+avalon.meta.force=false
#
# Output format specification. Valid values include 'xml' or 'serial'.
@@ -17,7 +17,7 @@
# description of the descriptor. Serial format is more efficient. The
# default XML format is more portable.
#
-merlin.meta.format=xml
+avalon.meta.format=xml
#
# When generating type descriptors, Merlin recognizes both <classname>.xinfo
@@ -25,7 +25,7 @@
# developers want to generate both Merlin and Phoenix descriptors. The
# value default to xinfo.
#
-merlin.meta.type.postfix=xinfo
+avalon.meta.type.postfix=xinfo
1.4 +3 -3 avalon-sandbox/meta/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 12 Jul 2003 08:44:11 -0000 1.3
+++ project.xml 15 Jul 2003 23:55:15 -0000 1.4
@@ -6,9 +6,9 @@
<id>avalon-meta-plugin</id>
<name>Avalon Meta Plugin</name>
<currentVersion>1.1-RC1</currentVersion>
- <description>Merlin Plugin for Maven</description>
- <shortDescription>Merlin Plugin for Maven</shortDescription>
- <package>org.apache.avalon.merlin</package>
+ <description>Avalon Plugin for Maven</description>
+ <shortDescription>Avalon Plugin for Maven</shortDescription>
+ <package>org.apache.avalon</package>
<dependencies>
1.3 +1 -1 avalon-sandbox/meta/site/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 15 Jul 2003 20:03:03 -0000 1.2
+++ navigation.xml 15 Jul 2003 23:55:15 -0000 1.3
@@ -13,7 +13,7 @@
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
- <menu name="About Merlin">
+ <menu name="About Avalon Meta">
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/tutorial/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
1.2 +4 -4 avalon-sandbox/meta/site/xdocs/tools/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 14 Jul 2003 20:22:19 -0000 1.1
+++ index.xml 15 Jul 2003 23:55:15 -0000 1.2
@@ -4,7 +4,7 @@
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
- <title>Merlin Tools</title>
+ <title>Avalon Tools</title>
</properties>
<body>
@@ -12,9 +12,9 @@
<section name="Overview">
<p>
-The Merlin platform includes a set of developer tools that assist in the automation
+The Avalon platform includes a set of developer tools that assist in the automation
of different process contributing to reliable and consistant component development.
-These tools include an ant task supporting meta info generation for component types
+These tools include an Ant task supporting meta info generation for component types
and services, and an equivalent Maven plugin.
</p>
<subsection name="Index">
@@ -37,7 +37,7 @@
<tr>
<td><a href="maven/index.html">Maven Plugin</a></td>
<td>
- The Merlin plugin for Maven that provides support for
+ The Avalon plugin for Maven provides support for
meta infor generation when building with the Maven tool.
</td>
</tr>
1.3 +1 -1 avalon-sandbox/meta/site/xdocs/tools/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 15 Jul 2003 20:03:05 -0000 1.2
+++ navigation.xml 15 Jul 2003 23:55:15 -0000 1.3
@@ -13,7 +13,7 @@
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
- <menu name="About Merlin">
+ <menu name="About Avalon Meta">
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/tutorial/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
1.3 +19 -20 avalon-sandbox/meta/site/xdocs/tools/maven/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/maven/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 15 Jul 2003 23:40:44 -0000 1.2
+++ index.xml 15 Jul 2003 23:55:15 -0000 1.3
@@ -3,13 +3,13 @@
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
- <title>Merlin Plugin for Maven</title>
+ <title>Avalon Plugin for Maven</title>
</properties>
<body>
- <section name="Merlin Plugin for Maven">
+ <section name="Avalon Plugin for Maven">
<subsection name="Meta Generation">
<p>
-The Merlin Plugin for Maven provides support for developers in the management of
Maven based projects that leverage the Avalon component model. This plugin will be
progressively extended with Merlin and related sub-system utilities. Currently the
plugin provides support for a meta info generation process based on javadoc tags
within class and interface source files.
+The Avalon Plugin for Maven provides support for developers in the management of
Maven based projects that leverage the Avalon component model. This plugin will be
progressively extended with Avalon and related sub-system utilities. Currently the
plugin provides support for a meta info generation process based on javadoc tags
within class and interface source files.
</p>
</subsection>
<subsection name="Goals">
@@ -19,15 +19,13 @@
<td>merlin:meta</td>
<td>
<p>Generates meta info descriptors for service and component types
- based on javadoc tags within the java source files. Source files
- are scanned for the presence of an @avalon.version tag and if
- present, a meta descriptor is generated. If the version tag is
- within an interface defintion, a new Service defintion is created
- otherwise a Type defintion is created.</p>
+ based on javadoc tags within the java source files. Source class files
+ are scanned for the presence of an @avalon.type or @avalon service tag
and if
+ present, a meta descriptor is generated.</p>
<p>Meta info generation process includes:</p>
<ul>
- <li>Scan source files for avalon.meta tags</li>
+ <li>Scan source files for avalon.type or @avalon.service tags</li>
<li>Build Type and Service descriptors</li>
<li>Externalize descriptors to serial or xml format</li>
</ul>
@@ -36,7 +34,7 @@
<source><![CDATA[
<project default="jar:jar">
<preGoal name="jar:jar">
- <attainGoal name="merlin:meta"/>
+ <attainGoal name="avalon:meta"/>
</preGoal>
</project>
]]></source>
@@ -51,7 +49,8 @@
<resource>
<directory>${basedir}/target/src</directory>
<includes>
- <include>**/*.x*</include>
+ <include>**/*.x*</include> <!-- XML meta info desriptors -->
+ <include>**/*.z*</include> <!-- Serialized info descriptors -->
</includes>
</resource>
</resources>
@@ -70,7 +69,7 @@
<th>Description</th>
</tr>
<tr>
- <td>merlin.meta.format</td>
+ <td>avalon.meta.format</td>
<td>Yes</td>
<td>
<p>Output format specification. Valid values include 'xml' or 'serial'.
@@ -82,12 +81,12 @@
Default behaviour:
</p>
<source><![CDATA[
-merlin.meta.format="xml"
+avalon.meta.format="xml"
]]></source>
</td>
</tr>
<tr>
- <td>merlin.meta.force</td>
+ <td>avalon.meta.force</td>
<td>Yes</td>
<td>
<p>Policy controlling the regeneration of meta descriptors independently
@@ -96,19 +95,19 @@
Default behaviour:
</p>
<source><![CDATA[
-merlin.meta.force="false"
+avalon.meta.force="false"
]]></source>
</td>
</tr>
<tr>
- <td>merlin.meta.type.postfix</td>
+ <td>avalon.meta.type.postfix</td>
<td>No</td>
<td>
<p>
-Merlin will default to the deneration of XML type descriptors under
+Avalon will default to the generation of XML type descriptors under
the .xinfo file type. When generating meta-info descriptors targetted
for deployment in both Merlin and Phoenix, the xinfo type will conflict
-with the Phoenix meta-info descriptor. Merlin provides support for
+with the Phoenix meta-info descriptor. Avalon Plugin provides support for
generation of meta info under the alternative .xtype. To control the
type of file generated, you can declare either "xinfo" or "xtype" under
this property.
@@ -117,13 +116,13 @@
Default behaviour:
</p>
<source><![CDATA[
-merlin.meta.type.postfix="xinfo"
+avalon.meta.type.postfix="xinfo"
]]></source>
<p>
Alternative xtype behaviour:
</p>
<source><![CDATA[
-merlin.meta.type.postfix="xtype"
+avalon.meta.type.postfix="xtype"
]]></source>
</td>
1.4 +2 -2 avalon-sandbox/meta/site/xdocs/tools/maven/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/maven/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 15 Jul 2003 23:40:44 -0000 1.3
+++ navigation.xml 15 Jul 2003 23:55:15 -0000 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <title>Avalon Sandbox</title>
+ <title>Avalon Tools</title>
<body>
@@ -13,7 +13,7 @@
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
- <menu name="About Merlin">
+ <menu name="About Avalon Meta">
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/tutorial/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
1.4 +2 -2 avalon-sandbox/meta/site/xdocs/tools/tags/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 15 Jul 2003 23:40:44 -0000 1.3
+++ navigation.xml 15 Jul 2003 23:55:15 -0000 1.4
@@ -13,7 +13,7 @@
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
- <menu name="About Avalon Merlin">
+ <menu name="About Avalon Meta">
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/tutorial/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
@@ -21,10 +21,10 @@
<item name="Javadoc Tags Reference" href="/tools/tags/index.html">
<item name="Type" href="/tools/tags/type.html"/>
<item name="Attribute" href="/tools/tags/attribute.html"/>
+ <item name="Service" href="/tools/tags/service.html"/>
<item name="Logger" href="/tools/tags/logger.html"/>
<item name="Context" href="/tools/tags/context.html"/>
<item name="Entry" href="/tools/tags/entry.html"/>
- <item name="Service" href="/tools/tags/service.html"/>
<item name="Dependency" href="/tools/tags/dependency.html"/>
<item name="Stage" href="/tools/tags/stage.html"/>
<item name="Extension" href="/tools/tags/extension.html"/>
1.3 +2 -2 avalon-sandbox/meta/site/xdocs/tutorial/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tutorial/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 15 Jul 2003 20:03:05 -0000 1.2
+++ navigation.xml 15 Jul 2003 23:55:15 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <title>Avalon Sandbox</title>
+ <title>Avalon Meta</title>
<body>
@@ -13,7 +13,7 @@
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
- <menu name="About Merlin">
+ <menu name="About Avalon Meta">
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/tutorial/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
