You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/02 23:58:00 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/tools navigation.xml
mcconnell 2003/04/02 13:58:00
Modified: merlin project.xml
merlin/merlin-smp/xdocs navigation.xml
merlin/merlin-smp/xdocs/about navigation.xml
merlin/merlin-smp/xdocs/extensions/jndi navigation.xml
merlin/merlin-smp/xdocs/merlin index.xml navigation.xml
merlin/merlin-smp/xdocs/merlin/block index.xml
navigation.xml packaging.xml structure.xml
merlin/merlin-smp/xdocs/merlin/kernel navigation.xml
merlin/merlin-smp/xdocs/meta index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info/type navigation.xml
merlin/merlin-smp/xdocs/meta/model index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/block navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container
navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container/engine
navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container/engine/classpath
navigation.xml
merlin/merlin-smp/xdocs/meta/model/kernel navigation.xml
merlin/merlin-smp/xdocs/meta/model/profile navigation.xml
merlin/merlin-smp/xdocs/meta/model/profile/categories
navigation.xml
merlin/merlin-smp/xdocs/meta/model/profile/context
navigation.xml
merlin/merlin-smp/xdocs/meta/model/profile/context/entry
navigation.xml parameter.xml
merlin/merlin-smp/xdocs/meta/model/profile/parameters
navigation.xml
merlin/merlin-smp/xdocs/meta/service navigation.xml
merlin/merlin-smp/xdocs/starting navigation.xml
merlin/merlin-smp/xdocs/starting/advanced navigation.xml
merlin/merlin-smp/xdocs/starting/hello navigation.xml
merlin/merlin-smp/xdocs/tools navigation.xml
Added: merlin/merlin-smp/xdocs/images uml-top-level.gif
merlin/merlin-smp/xdocs/merlin/appliance assembly.xml
index.xml lifecycle.xml lifestyle.xml
navigation.xml
Removed: merlin/merlin-smp/xdocs/assembly index.xml lifecycle.xml
lifestyle.xml navigation.xml
Log:
Project and documentation updates.
Revision Changes Path
1.5 +1 -1 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 2 Apr 2003 16:32:52 -0000 1.4
+++ project.xml 2 Apr 2003 21:57:58 -0000 1.5
@@ -11,7 +11,7 @@
<organization>
<name>Apache Software Foundation</name>
<url>http://avalon.apache.org/</url>
- <logo>/images/asf_logo_wide.gif</logo>
+ <logo>/images/apache-avalon-logo.png</logo>
</organization>
<inceptionYear>1997</inceptionYear>
1.4 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 2 Apr 2003 15:51:52 -0000 1.3
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.4
@@ -14,7 +14,6 @@
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/about/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/about/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:51:52 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -17,7 +17,6 @@
</item>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.4 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/extensions/jndi/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/extensions/jndi/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 2 Apr 2003 15:51:55 -0000 1.3
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.4
@@ -13,7 +13,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.1 avalon-sandbox/merlin/merlin-smp/xdocs/images/uml-top-level.gif
<<Binary file>>
1.3 +7 -12 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 2 Apr 2003 17:13:27 -0000 1.2
+++ index.xml 2 Apr 2003 21:57:58 -0000 1.3
@@ -11,19 +11,14 @@
<body>
<section name="Merlin System">
- <table>
- <tr><th>Topic</th><th>Summary</th></tr>
- <tr>
- <td><a href="kernel.html">The Merlin Kernel</a></td>
- <td>A quick introduction to the Merlin Kernel. The kernel is core controller of the platform and is responsible for the deployment of root block hierachy, and subsequent block decommissioning.</td>
- </tr>
- <tr>
- <td><a href="blocks.html">About Blocks</a></td>
- <td>A overview of the block concept including a description of the concerns addressed by the block architecture.</td>
- </tr>
- </table>
+ <subsection name="UML">
+ <p>
+ <i>UML diagram of the principal abstractions within the
+ Merlin platform.</i>
+ </p>
+ <img src="../images/uml-top-level.gif"/>
+ </subsection>
</section>
-
</body>
</document>
1.2 +2 -2 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:51:56 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -14,9 +14,9 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html">
<item name="Kernel" href="/merlin/kernel/index.html"/>
- <item name="Blocks" href="/merlin/block/index.html"/>
+ <item name="Block" href="/merlin/block/index.html"/>
+ <item name="Appliance" href="/merlin/appliance/index.html"/>
</item>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/assembly.xml
Index: assembly.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Assembly</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Assembly - Functional Description">
<p>
The assembly system is all about the management of the
the deployment of services provided by a component. The
package provides support for the declaration of meta
information describing component dependencies, and
deployment templates.
</p>
<p>
Components in the framework may have dependencies on services
provided by other components, which in turn may have
dependencies of their own. In addition, components can
declare (as part of their meta-info) particular lifecycle
stages (such as initiation or configuration) and the type
of stage provider it needs to handle that stage. So in
effect, components can be deployed with classic runtime
dependencies together with deployment dependencies (because
deployment stage providers are themselves components).
</p>
<p>
Assembly services include ordered deployment and
decommissioning, a range of "lifestyle" handlers (things
like thread-safe, per-thread, singleton, transient, or
custom policies). The package includes facilities for:
classloader management and cascading repositories for
types, templates, service definitions and appliance
instances (appliance is simply an instantiation of a
particular component deployment scenario).
</p>
</section>
</body>
</document>
1.1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Merlin Architecture</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Appliance">
<subsection name="Overview">
<p>
An appliance is the internal handler of a component. It is responsible for component deployment and decommissioning. An appliance can be view as an instance of a unique named deployment scenario where a deployment scenario is the result of combining a particular component type with deployment meta-data (configuration, context directives, etc.).
</p>
</subsection>
<subsection name="Components">
<p>
An component is an instantiated java.lang.Object managed by an Appliance. A component is characterised by deployment and runtime dependecies which are mananged by an appliance in response to service requests. A component typically exposes services (public interfaces) through implementation or other means. In addition a component may declare runtime dependencies on service provided by other components. Wiring together provider and consumer components to fulfill deployment and runtime dependencies is referred to as component assembly.
</p>
</subsection>
</section>
</body>
</document>
1.1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/lifecycle.xml
Index: lifecycle.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Lifecycle Management</title>
<author email="avalon-dev@jakarta.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="Lifecycle Management">
<p>
A lifecycle is a term that refers to the set of stages that a component passes through between creation and destruction. A summary of the standard Avalon lifecycle stages is included below. Each lifecycle stage is fully supported by the assembly framework through a default deployment service.
</p>
<subsection name="Stages">
<p>Overview of the standard lifecycle stages.</p>
<table>
<tr>
<td><strong>Stage</strong></td>
<td><strong>Description</strong></td>
<td><strong>Available Services</strong></td>
</tr>
<tr>
<td>logging</td>
<td>The assignment of a base and possible subsidiary logging channels to a
component based on a combination of logging criteria expressed with a
component type defintion and a deployment profile.</td>
<td>DefaultLoggingService</td>
</tr>
<tr>
<td>configuration</td>
<td>Assignment of a static configuration to the component based on a
type level set of defaults, combined with profile level cofigurations.</td>
<td>DefaultConfigurationService</td>
</tr>
<tr>
<td>parameters</td>
<td>Assignment of a static parameters to the component based on a
profile level parameter descriptions.</td>
<td>DefaultParameterizationService</td>
</tr>
<tr>
<td>contextualization</td>
<td>The supply of a runtime context to a component based on context criteria
declared at the level of a type, and context directives included in a
deployment profile.</td>
<td>DefaultContextulizationService</td>
</tr>
<tr>
<td>composition</td>
<td>The supply of a component or service manager to a component from which
service depedencies are accessible.</td>
<td>DefaultCompositionService</td>
</tr>
<tr>
<td>initialization</td>
<td>The initialization of a component including support for classic and
extension based initialization strategies.</td>
<td>DefaultInitializationService &
ExtendedInitializationService</td>
</tr>
<tr>
<td>startup and shutdown</td>
<td>Management of the orderly starting and shutdown of a component.</td>
<td>DefaultStartupService</td>
</tr>
<tr>
<td>disposal</td>
<td>The disposal of a component including support for classic and
extension based disposal strategies.</td>
<td>DefaultDisposalService &
ExtendedDisposalService</td>
</tr>
</table>
</subsection>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2003/04/02 21:57:58 $
</legal>
</footer>
</document>
1.1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/lifestyle.xml
Index: lifestyle.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>Avalon Assembly - Lifestyle Management</title>
<author email="avalon-dev@jakarta.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="Lifestyle Management">
<p>
A lifestyle is a term that reflects a component implementation approach. Four basic lifestyle strategies are included in the Assembly API - thse include the singleton, per-thread, pooled, and transient strategies. More information about these strategies is included in the following table:
</p>
<subsection name="Strategies">
<p>Overview of the standard lifestyle strategies.</p>
<table>
<tr>
<td><strong>Strategy</strong></td>
<td><strong>Description</strong></td>
<td><strong>Available Services</strong></td>
</tr>
<tr>
<td>singleton</td>
<td>A single instance of the component type will be shared by all consumers.</td>
<td>SingletonLifestyleHandler</td>
</tr>
<tr>
<td>thread</td>
<td>A new instance of the component will be created relative to each distinct thread.</td>
<td>ThreadLocalLifestyleHandler</td>
</tr>
<tr>
<td>pool</td>
<td>A container shall maintain a pool of components.</td>
<td>PooledLifestyleHandler</td>
</tr>
<tr>
<td>transient</td>
<td>New instance of the component are created on a per request basis.</td>
<td>TransientLifestyleHandler</td>
</tr>
</table>
</subsection>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2003/04/02 21:57:58 $
</legal>
</footer>
</document>
1.1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<title>Merlin</title>
<body>
<links>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Excalibur" href="http://avalon.apache.org/excalibur"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html">
<item name="Kernel" href="/merlin/kernel/index.html"/>
<item name="Block" href="/merlin/block/index.html"/>
<item name="Appliance" href="/merlin/appliance/index.html">
<item name="Assembly" href="/merlin/appliance/assembly.html"/>
<item name="Lifestyle" href="/merlin/appliance/lifestyle.html"/>
<item name="Lifecycle" href="/merlin/appliance/lifecycle.html"/>
</item>
</item>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
<menu name="Extensions">
<item name="JNDI" href="/extensions/jndi/index.html"/>
</menu>
</body>
</project>
1.2 +16 -4 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 2 Apr 2003 15:51:56 -0000 1.1
+++ index.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -10,6 +10,17 @@
<body>
<section name="Introducing Blocks">
+ <subsection name="Overview">
+
+ <p>
+ A block is a specialization of an <a href="appliance/index.html">Appliance</a>. A block manages a container (a type of component). In addition, a block exposes services derived from the set of appliances that are managed by it's container. As such, a block can be view as a composite component. A block may be contained within other blocks.
+ </p>
+ <p>
+ A container manages a set of components declared within the containment scope. As such, a container represents a logical and structural partition within a containment heirachy. Each container is associated with a classloader. The classloader parent is the classloader of the parent container. As such, a container (and component within the container) have access to the services defined within the immediate container and all parent containers.
+ </p>
+
+ </subsection>
+ <subsection name="Cascading Containers">
<p>The Merlin system provides support for <strong>cascading containers</strong>. This model
enables component assemblers to (among other things) associate jar files under a protected
@@ -22,9 +33,8 @@
are resolved, Merlin will attempt to build an implicit solution based on components declared
in the respective container classpath.</p>
- </section>
-
- <section name="Block Model">
+ </subsection>
+ <subsection name="Block Model">
<p>A new block is defined by the <block> element. The element is the definition of a
block, its classpath, and the components it is responsible for managing.
@@ -38,6 +48,8 @@
</container>
</block>
]]></source>
+
+ </subsection>
</section>
</body>
1.2 +2 -2 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:51:56 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -14,12 +14,12 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html">
<item name="Kernel" href="/merlin/kernel/index.html"/>
- <item name="Blocks" href="/merlin/block/index.html">
+ <item name="Block" href="/merlin/block/index.html">
<item name="Structure" href="/merlin/block/structure.html"/>
<item name="Packaging" href="/merlin/block/packaging.html"/>
</item>
+ <item name="Appliance" href="/merlin/appliance/index.html"/>
</item>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.2 +1 -1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/packaging.xml
Index: packaging.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/packaging.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- packaging.xml 2 Apr 2003 15:51:56 -0000 1.1
+++ packaging.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -8,7 +8,7 @@
</authors>
</header>
<body>
- <section name="Users Guide">
+ <section name="Block">
<subsection name="Block Packaging">
<p>In preparation.</p>
</subsection>
1.2 +1 -1 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/structure.xml
Index: structure.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/structure.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- structure.xml 2 Apr 2003 15:51:56 -0000 1.1
+++ structure.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -8,7 +8,7 @@
</authors>
</header>
<body>
- <section name="Users Guide">
+ <section name="Block">
<subsection name="Block Composition and Structure">
<p>In preparation.</p>
</subsection>
1.2 +2 -2 avalon-sandbox/merlin/merlin-smp/xdocs/merlin/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/kernel/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:51:57 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -18,9 +18,9 @@
<item name="JNDI" href="/merlin/kernel/jndi.html"/>
<item name="NT" href="/merlin/kernel/nt.html"/>
</item>
- <item name="Blocks" href="/merlin/block/index.html"/>
+ <item name="Block" href="/merlin/block/index.html"/>
+ <item name="Appliance" href="/merlin/appliance/index.html"/>
</item>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.2 +23 -30 avalon-sandbox/merlin/merlin-smp/xdocs/meta/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 13 Mar 2003 01:05:53 -0000 1.1
+++ index.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -9,8 +9,9 @@
<body>
- <section name="Introduction">
+ <section name="Meta Model">
+ <subsection name="Introduction">
<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.
@@ -20,7 +21,7 @@
</p>
<p>
The Meta Model API is a set of well-known interfaces and classes that
-can be used to provide a runtime representation of the meta model.
+is used to provide a runtime representation of the meta model.
</p>
<p>
The Meta Model DTDs are a set of well-known XML DTDs that provide a
@@ -30,36 +31,28 @@
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>
-<p>
-The Meta Model should be well-known to all avalonized applications.
-Avalon Containers should share as much of a common meta model as
-possible. It should be easy to implement support for the common meta
-model in an Avalon Container.
-</p>
-
-<p>
-The Meta Model should allow for easy extensibility to provide additional
-container-specific functionality. It should be flexible to allow for
-dynamic and/or runtime manageable ("hot-pluggable") containers to
-function properly.
-</p>
-<p>
-It should provide support for both linear and hierarchical metadata.
-</p>
-
- </section>
- <section name="Design Constraints">
-
-<p>The Meta Model should be restricted to the same problem domain as avalon
-itself: it should be specifically about enabling COP. It should be small
-in terms of code size, footprint, resource consumption, just like avalon
-framework. It should be well-documented.</p>
-
-<p>ECM is stable and phoenix is in beta. The meta model should provide as
-much interoperability with and support for these projects as possible.</p>
+ </subsection>
+ <subsection name="Index">
+ <table>
+ <tr><th>Topic</th><th>Description</th></tr>
+ <tr><td><a href="info/index.html">Meta Info</a></td>
+ <td>
+ The meta info model describes 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>
+ <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.
+ </td>
+ </tr>
+ </table>
+ </subsection>
</section>
-
</body>
</document>
1.4 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 2 Apr 2003 15:51:59 -0000 1.3
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.4
@@ -13,7 +13,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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"/>
1.2 +20 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 2 Apr 2003 15:52:07 -0000 1.1
+++ index.xml 2 Apr 2003 21:57:58 -0000 1.2
@@ -12,7 +12,26 @@
<body>
<section name="Meta Info">
- <p>In preparation.</p>
+ <table>
+ <tr><th>Topic</th><th>Summary</th></tr>
+ <tr>
+ <td><a href="type/index.html">Type</a></td>
+ <td>
+ Definition of the component type. A Type meta info object
+ describes the structural features of component at the level
+ equivalent to a class. A type includes information about
+ deployment and runtime depedencies together arbitary attributes,
+ a component implementation version and a component type name.
+ </td>
+ </tr>
+ <tr>
+ <td><a href="service.html">Service</a></td>
+ <td>
+ A service is a meta info object that describes a service
+ provided by a component type. Service support the attribution
+ of a version and arbitary properties.</td>
+ </tr>
+ </table>
</section>
</body>
1.4 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 2 Apr 2003 15:52:07 -0000 1.3
+++ navigation.xml 2 Apr 2003 21:57:58 -0000 1.4
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html">
<item name="Meta Info" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html"/>
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:08 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html">
<item name="Meta Info" href="/meta/info/index.html">
<item name="Type" href="/meta/info/type/index.html">
1.3 +3 -3 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 2 Apr 2003 17:13:27 -0000 1.2
+++ index.xml 2 Apr 2003 21:57:59 -0000 1.3
@@ -25,16 +25,16 @@
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
- <td><a href="kernel/index.html">Kernel Meta Data</a></td>
+ <td><a href="kernel/index.html">Kernel</a></td>
<td>The meta data directives used to establish the Merlin Kernel.</td>
</tr>
<tr>
- <td><a href="block/index.html">Block Meta Data</a></td>
+ <td><a href="block/index.html">Block</a></td>
<td>The meta data directives used to establish a block and the
container hierachy and nested component.</td>
</tr>
<tr>
- <td><a href="block/index.html">Profile Meta Data</a></td>
+ <td><a href="block/index.html">Profile</a></td>
<td>The meta data directives used to establish component deployment
directives.</td>
</tr>
1.4 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 2 Apr 2003 15:52:09 -0000 1.3
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.4
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:10 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:11 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -13,7 +13,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:11 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -13,7 +13,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/classpath/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/classpath/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:12 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -13,7 +13,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.3 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/kernel/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 2 Apr 2003 16:32:53 -0000 1.2
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.3
@@ -13,7 +13,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:13 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/categories/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:14 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/context/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:15 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/context/entry/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/context/entry/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:15 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.2 +1 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/context/entry/parameter.xml
Index: parameter.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/context/entry/parameter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parameter.xml 2 Apr 2003 15:52:15 -0000 1.1
+++ parameter.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -39,7 +39,7 @@
<table>
<tr><th>Element</th><th>Cardinality</th><th>Description</th></tr>
<tr>
- <td><a href="index.html">parameter</a></td><td>n</td>
+ <td><a href="parameter.html">parameter</a></td><td>n</td>
<td>
A constructor argument.
</td>
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile/parameters/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:15 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.2
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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">
1.3 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/meta/service/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/service/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 29 Mar 2003 13:37:14 -0000 1.2
+++ navigation.xml 2 Apr 2003 21:57:59 -0000 1.3
@@ -14,7 +14,6 @@
<item name="Overview" href="/index.html"/>
<item name="Getting Started" href="/about/starting/index.html"/>
<item name="Merlin System" href="/merlin/facilities/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html">
<item name="Service" href="/meta/service/index.html"/>
<item name="Type" href="/meta/info/type.html"/>
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/starting/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:15 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:58:00 -0000 1.2
@@ -17,7 +17,6 @@
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:16 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:58:00 -0000 1.2
@@ -26,7 +26,6 @@
</item>
</item>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.2 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Apr 2003 15:52:17 -0000 1.1
+++ navigation.xml 2 Apr 2003 21:58:00 -0000 1.2
@@ -25,7 +25,6 @@
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
1.3 +0 -1 avalon-sandbox/merlin/merlin-smp/xdocs/tools/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/tools/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 2 Apr 2003 15:52:22 -0000 1.2
+++ navigation.xml 2 Apr 2003 21:58:00 -0000 1.3
@@ -14,7 +14,6 @@
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
- <item name="Assembly Framework" href="/assembly/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.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org