mcconnell 2003/06/22 19:04:33
Modified: merlin project.xml
merlin/merlin-platform/xdocs/meta index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/info index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/info/attributes
navigation.xml
merlin/merlin-platform/xdocs/meta/info/type navigation.xml
merlin/merlin-platform/xdocs/meta/info/type/context
navigation.xml
merlin/merlin-platform/xdocs/meta/info/type/dependencies
navigation.xml
merlin/merlin-platform/xdocs/meta/info/type/extensions
navigation.xml
merlin/merlin-platform/xdocs/meta/info/type/loggers
navigation.xml
merlin/merlin-platform/xdocs/meta/info/type/services
navigation.xml
merlin/merlin-platform/xdocs/meta/info/type/stages
navigation.xml
merlin/merlin-platform/xdocs/meta/model index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/categories
category.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/context
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/components/parameters
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/include
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/container/include/targets
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/export
navigation.xml
merlin/merlin-platform/xdocs/meta/model/block/import
navigation.xml
merlin/merlin-platform/xdocs/meta/model/kernel
categories.xml navigation.xml
merlin/merlin-platform/xdocs/resources notebook.xml
Log:
Documetation updates.
Revision Changes Path
1.17 +3 -9 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 20 Jun 2003 19:02:17 -0000 1.16
+++ project.xml 23 Jun 2003 02:04:30 -0000 1.17
@@ -142,7 +142,7 @@
<name>Kristian Meier</name>
<email>[EMAIL PROTECTED]</email>
<roles>
- <role>Patches enhancing the meta-info generation sources and
documentation.</role>
+ <role>Patches enhancing the meta-info generation sources and documentation,
and patches related to the pooled lifestyle handler.</role>
</roles>
</contributor>
<contributor>
@@ -161,14 +161,6 @@
</roles>
<organization>IBM Global Services</organization>
</contributor>
- <contributor>
- <name>Kristian Meier</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Pooled lifestyle handler patches.</role>
- </roles>
- <organization>Jentro</organization>
- </contributor>
</contributors>
<build>
@@ -197,6 +189,8 @@
<include>**/*.xconfig</include>
<include>**/*.xml</include>
<include>**/*.xservice</include>
+ <include>**/*.mf</include>
+ <include>**/*.jar</include>
</includes>
</resource>
</resources>
1.2 +9 -9 avalon-sandbox/merlin/merlin-platform/xdocs/meta/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:14 -0000 1.1
+++ index.xml 23 Jun 2003 02:04:30 -0000 1.2
@@ -14,18 +14,19 @@
<subsection name="Index">
<table>
<tr><th>Topic</th><th>Description</th></tr>
- <tr><td><a href="info/index.html">Meta Info</a></td>
+ <tr><td><a href="info/index.html">Descriptors</a></td>
<td>
- The meta info model describes the structural information
+ The meta info model is composed of a set of descriptors
+ that are used to describe the structural information
and operation criteria of a component type or service.
</td>
</tr>
- <tr><td><a href="model/index.html">Meta Data</a></td>
+ <tr><td><a href="model/index.html">Directives</a></td>
<td>
- The meta data is information that enables the creation of
- of an instance of a type. Meta data represents directive
- information used a container to populate deployment criteria
- declared by a type.
+ The meta data model is composed of a set of directives
+ that capture the intended usage of a component type.
+ Directives are used by the Merlin container to establish
+ potential deployment scenarios.
</td>
</tr>
</table>
@@ -34,7 +35,7 @@
<p>The Meta Model is an object model describing a type of Avalon component.
The meta model encompasses all information about a component that is not
specified by its work interface and/or lifecycle interfaces.
-Specifically, the Meta Model allows for specification of
+Specifically, the Meta Model allows for specification of
lifecycle-related constraints/requirments, ie Context, Configuration,
Parameter, and Dependency constraints/requirments.
</p>
@@ -50,7 +51,6 @@
The Meta Model XML API provides an implementation of the Meta Model API
that takes XML documents following the Meta Model DTDs as source.
</p>
-
</subsection>
</section>
</body>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/xdocs/meta/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:14 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:30 -0000 1.2
@@ -18,8 +18,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:14 -0000 1.1
+++ index.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -3,7 +3,7 @@
<document>
<header>
- <title>Meta Info</title>
+ <title>Descriptors</title>
<authors>
<person name="Avalon Development Team" email="[EMAIL PROTECTED]"/>
</authors>
@@ -11,7 +11,7 @@
<body>
- <section name="Meta Info">
+ <section name="Descriptors">
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:14 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,12 +18,12 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html"/>
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/attributes/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/attributes/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:14 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,14 +18,14 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html"/>
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html">
<item name="Attribute" href="/meta/info/attributes/attribute.html"/>
</item>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:15 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html"/>
@@ -31,7 +31,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/context/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:15 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html"/>
@@ -33,7 +33,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/dependencies/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/dependencies/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:16 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html"/>
@@ -33,7 +33,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/extensions/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/extensions/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:17 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html"/>
@@ -33,7 +33,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/loggers/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/loggers/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:17 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html">
@@ -33,7 +33,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/services/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/services/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:17 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html"/>
@@ -33,7 +33,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/stages/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/stages/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:17 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,7 +18,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html">
+ <item name="Descriptors" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
<item name="Info" href="/meta/info/type/info.html"/>
<item name="Loggers" href="/meta/info/type/loggers/index.html"/>
@@ -33,7 +33,7 @@
<item name="Service" href="/meta/info/service.html"/>
<item name="Attributes" href="/meta/info/attributes/index.html"/>
</item>
- <item name="Meta Data" href="/meta/model/index.html"/>
+ <item name="Directives" href="/meta/model/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:18 -0000 1.1
+++ index.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -29,10 +29,10 @@
<p>
Meta data is the information used by the Merlin system to instantiate
system and client aspects to achieve a particular application objective.
- Meta data is often refered to here under the term 'directive'. This
+ Meta data is refered to here under the term 'directive'. This
reflects the role of meta-data - information that directs the behaviour
of the system. This is in contract with meta-info which more typically
- establish the requirements.
+ establish operational and functional requirements of a component type.
</p>
</subsection>
</section>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:18 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -19,8 +19,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html"/>
</item>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:18 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.2
@@ -18,8 +18,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:57 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:57 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:31 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.3 +7 -0
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/category.xml
Index: category.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/category.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- category.xml 15 Jun 2003 17:43:23 -0000 1.2
+++ category.xml 23 Jun 2003 02:04:32 -0000 1.3
@@ -17,6 +17,13 @@
<table>
<tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
<tr>
+ <td>name</td><td>yes</td>
+ <td>
+ Logging category name. The category name refers to
+ a logging sub-category within the enclosing category.
+ </td>
+ </tr>
+ <tr>
<td>priority</td><td>no</td>
<td>
The logging priority (one of INFO, WARN, ERROR, FATAL, DEBUG).
1.3 +13 -4
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 15 Jun 2003 17:43:23 -0000 1.2
+++ index.xml 23 Jun 2003 02:04:32 -0000 1.3
@@ -51,10 +51,19 @@
<subsection name="Sample XML">
<source><![CDATA[
-<categories priority="WARN">
- <category name="/sys" priority="INFO"/>
- <category name="/sys/logging" priority="DEBUG"/>
-</categories>
+
+<!--
+Create a component with a logging channel priority of INFO.
+Set the subsidiary channel for tutorial.data to a priority
+of DEBUG and the tutorial.data.model channel to a ERROR
+priority.
+-->
+<component name="tutorial">
+ <categories priority="INFO">
+ <category name="/data" priority="DEBUG"/>
+ <category name="/data/model" priority="ERROR"/>
+ </categories>
+</component>
]]></source>
</subsection>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/categories/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:57 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:57 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/context/entry/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:57 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/components/parameters/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:58 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 22 Jun 2003 13:57:58 -0000 1.3
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.4
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.5 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 22 Jun 2003 13:57:58 -0000 1.4
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.5
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.3 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/engine/classpath/repository/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 22 Jun 2003 13:57:58 -0000 1.2
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.3
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.3 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 22 Jun 2003 13:57:58 -0000 1.2
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.3
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.3 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/targets/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/targets/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 22 Jun 2003 13:57:58 -0000 1.2
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.3
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/export/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/export/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.2
@@ -18,8 +18,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/import/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/import/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:32 -0000 1.2
@@ -18,8 +18,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Block" href="/meta/model/block/index.html">
<item name="Info" href="/meta/model/block/info.html"/>
1.2 +7 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/categories.xml
Index: categories.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/categories.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- categories.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ categories.xml 23 Jun 2003 02:04:33 -0000 1.2
@@ -13,7 +13,7 @@
<section name="Logging Categories">
<subsection name="Description">
-<p>Logging channels used by the Merlin system (internal) may be qualified by the
addition of category entries within the kernel defintion.</p>
+<p>Logging channels used by the Merlin system (internal) may be qualified by the
addition of category entries within the kernel defintion. For a complete
specfification of the <a
href="../block/container/components/categories/index.html">categories</a> element
please see the documentation under component/catagories.</p>
</subsection>
<subsection name="Sample XML">
@@ -23,7 +23,12 @@
<logging priority="INFO"/>
- <categories>
+ <!--
+ Set the root logging category priority to ERROR
+ and the /sys sub-category to INFO.
+ -->
+
+ <categories priority="ERROR">
<category name="/sys" priority="INFO"/>
</categories>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 10 Jun 2003 02:14:24 -0000 1.1
+++ navigation.xml 23 Jun 2003 02:04:33 -0000 1.2
@@ -17,8 +17,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
- <item name="Meta Info" href="/meta/info/index.html"/>
- <item name="Meta Data" href="/meta/model/index.html">
+ <item name="Descriptors" href="/meta/info/index.html"/>
+ <item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html">
<item name="System" href="/meta/model/kernel/system.html"/>
<item name="Logging" href="/meta/model/kernel/logging.html"/>
1.7 +20 -8
avalon-sandbox/merlin/merlin-platform/xdocs/resources/notebook.xml
Index: notebook.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/notebook.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notebook.xml 21 Jun 2003 17:10:02 -0000 1.6
+++ notebook.xml 23 Jun 2003 02:04:33 -0000 1.7
@@ -67,27 +67,39 @@
<tr>
<td>
replace the attribute based lifestyle policy declaration with
- a formal element in the info block
+ a formal <lifestyle> element in the info block
</td>
<td>DONE</td>
</tr>
<tr>
- <td>tutorial on logging categories management</td>
- <td></td>
+ <td>
+ replace the <engine> tag with <classloader>
+ </td>
+ <td>DONE</td>
+ </tr>
+ <tr>
+ <td>documetation on logging categories management
+ (tutorials can come a little later)</td>
+ <td>DONE</td>
</tr>
- <tr><td>dynamic components tutorials</td><td></td></tr>
+ <tr>
+ <td>dynamic components tutorials</td>
+ <td>PENDING</td></tr>
<tr>
<td>complete the documentation about the James example
(this needs to cover the relationships between types, services,
packaged and explicit profiles, blocks, includes, and
targets).
</td>
- <td></td>
+ <td>PENDING</td>
</tr>
<tr>
- <td>either release Excalibur Extension or include a fork
- under the Merlin project</td>
- <td></td>
+ <td>
+ Release Excalibur Extension or include a fork
+ under the Merlin project.
+ </td>
+ <td>
+ </td>
</tr>
<tr><td>test and validation</td><td>ONGOING</td></tr>
<tr><td>tag the CVS</td><td></td></tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
