mcconnell 2004/04/02 20:34:08
Modified: merlin/platform/xdocs/about benefits.xml features.xml
merlin/platform/xdocs/merlin index.xml navigation.xml
merlin/platform/xdocs/reference/component/lifestyle
index.xml
merlin/platform/xdocs/reference/deployment assembly.xml
Added: merlin/platform/xdocs/merlin uml.xml
merlin/platform/xdocs/merlin/embedded cli.xml index.xml
main.xml navigation.xml servlet.xml unit.xml
merlin/platform/xdocs/merlin/systems activation.xml
composition.xml index.xml logging.xml meta.xml
navigation.xml repository.xml
Removed: merlin/platform/xdocs/merlin/appliance assembly.xml
index.xml lifecycle.xml lifestyle.xml
navigation.xml
merlin/platform/xdocs/merlin/block index.xml navigation.xml
merlin/platform/xdocs/merlin/kernel/embedding index.xml
navigation.xml
merlin/platform/xdocs/merlin/kernel index.xml navigation.xml
nt.xml
merlin/platform/xdocs/reference/deployment/directives/components/context/entry
import.xml index.xml navigation.xml
Log:
Reshuffling and improving docs.
Revision Changes Path
1.4 +8 -20 avalon/merlin/platform/xdocs/about/benefits.xml
Index: benefits.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/about/benefits.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- benefits.xml 25 Jan 2004 13:28:47 -0000 1.3
+++ benefits.xml 3 Apr 2004 04:34:08 -0000 1.4
@@ -65,31 +65,19 @@
The solution to the above is a framework that automates the process of
component deployment. The end result is that container side code becomes
independent of the component deployment strategy and component dependencies.
</p>
-<p>Consider the following code fragment:</p>
+<p>Consider the following code fragment in which we create a service
description, locate component model that provides the service, commission the
model and resolve the service instance.</p>
<source>
+ ReferenceDescriptor reference =
+ new ReferenceDescriptor( Widget.class.getName() );
+ ComponentModel model = (ComponentModel) m_model.getModel( reference );
+ model.commission();
- // add an implementation component to the engine
-
- engine.register( "org.apache.avalon.playground.BasicComponent" );
-
- // get an appliance handling the versioned service we want
-
- Appliance appliance = m_engine.resolve(
- new DependencyDescriptor(
- "demo",
- "org.apache.avalon.playground.BasicService",
- Version.getVersion( "1.1" ) )
- );
-
- // get the fully prepared component
-
- Object object = appliance.access( dependency );
-
+ Widget widget = (Widget) model.resolve();
</source>
<p>
-The above code demonstrates the elimination of knowledge about the component
deployment strategy. All aspect concerning the component logging,
configuration, parameterization, contexulization, dependency composition,
initialization, startup, shutdown, and disposal are managed by the engine.
+The above code demonstrates the elimination of knowledge about the component
deployment strategy. All aspect concerning the component logging,
configuration, parameterization, contexulization, dependency composition,
initialization, startup, shutdown, and disposal are managed by the container.
</p>
</subsection>
1.3 +15 -5 avalon/merlin/platform/xdocs/about/features.xml
Index: features.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/about/features.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- features.xml 25 Jan 2004 13:28:47 -0000 1.2
+++ features.xml 3 Apr 2004 04:34:08 -0000 1.3
@@ -30,25 +30,35 @@
<section name="Features and Benefits">
<subsection name="Composite Component Management">
<p>
-Merlin provides support for the packaging and deployment of composite
components with a structure called a Block. A block represents the association
of resources to a containment hierarchy within which components are managed.
In addition, a block enables the separation of a component assembly as
implementation from the subset of services published by the block.
+Merlin provides support for the packaging and deployment of composite
components with a structure called a Block. A block represents the association
of resources to a containment hierarchy within which components are managed.
In addition, a block enables the separation of a component assembly (the
composite implementation) from the set of services published by the block.
+ </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 scope where each container is
associated with its own classloader.
</p>
</subsection>
<subsection name="Automated Assembly">
<p>
-Underlying the Merlin system is a assembly engine that provides support for
the deployment of components. The assembly engine takes care of dependency
resolution, component instantiation, lifecycle processing, and component
decommissioning.
+Merlin will handle resolution of service dependencies for components by
looking for explicitly declared components commencing within the local
container, and working progressively up the container hierarchy. If
+no explicit solutions are resolved, Merlin will attempt to build a packaged
or implicit solution based on component types declared in the classloader
hierachy.
+ </p>
+ </subsection>
+ <subsection name="Deployment Engine">
+ <p>
+Underlying the Merlin system is a runtime deployment engine that provides
support for the orderly establishment of simple and composite components. The
deployment engine takes care of component instantiation, lifecycle processing,
and component decommissioning.
</p>
</subsection>
<subsection name="Lifestyle Management">
<p>
-Merlin provides support for different component instantiation policies.
These policies are referred to as lifestyles. Examples of supported lifestyle
include 'singleton', 'per-thread', 'pooled' and 'transient'.
+Merlin provides support for different component instantiation policies.
These policies are referred to as lifestyles. Examples of lifestyle include
'singleton', 'per-thread', 'pooled' and 'transient'.
</p>
</subsection>
<subsection name="Lifecycle Management">
<p>
-Following instantiation, a component is processed through a lifecycle.
Lifecycle processing involves the execution of a series of stages such
associating a logging channel, applying a configuration or component
parameters, setting the runtime context, supplying dependent services,
initialization, startup, shutdown and disposal. Within the Merlin system,
lifecycle stages can be extended or modified through association of other
components that provide lifecycle support. Merlin distinguishes these services
as deployment dependencies as distinct from classic runtime dependencies.
+Merlin provides support for constructor based injection of lifecycle
artifacts, or optional phased delivery under which a component is processed
through a series of lifecycle stages. Lifecycle processing involves the
execution of a series of stages such as associating a logging channel, applying
a configuration or component parameters, setting the runtime context, supplying
dependent services, initialization, startup, shutdown and disposal. Within the
Merlin system, lifecycle stages can be extended or modified through association
of other components that provide lifecycle support. Merlin distinguishes these
services as deployment dependencies as distinct from classic runtime
dependencies.
</p>
</subsection>
-
</section>
</body>
1.3 +33 -13 avalon/merlin/platform/xdocs/merlin/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 25 Jan 2004 13:28:47 -0000 1.2
+++ index.xml 3 Apr 2004 04:34:08 -0000 1.3
@@ -19,23 +19,43 @@
<document>
- <header>
- <title>Merlin Overview</title>
- <authors>
- <person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
- </authors>
- </header>
+ <properties>
+ <author email="[EMAIL PROTECTED]">Stephen McConnell</author>
+ <title>Specification</title>
+ </properties>
<body>
- <section name="Merlin System">
- <subsection name="UML">
- <p>
- <i>UML diagram of the principal abstractions within the
- Merlin platform.</i>
- </p>
- <img src="../images/uml-top-level.gif"/>
+
+ <section name="Merlin Platform">
+
+ <subsection name="Index">
+ <table>
+ <tr><th>Topic</th><th>Summary</th></tr>
+ <tr>
+ <td><a href="uml.html">Object Model</a></td>
+ <td>
+ The object model dealing with the notion of a composite
+ component.
+ </td>
+ </tr>
+ <tr>
+ <td><a href="system/index.html">Subsystems</a></td>
+ <td>
+ Introduction to the respective substems and relationships with
+ the Merlin system.
+ </td>
+ </tr>
+ <tr>
+ <td><a href="deployment/index.html">Embedded</a></td>
+ <td>
+ Introduction to a set of available applications solutions
+ the include an embedded Merlin Kernel.
+ </td>
+ </tr>
+ </table>
</subsection>
</section>
+
</body>
</document>
1.10 +15 -3 avalon/merlin/platform/xdocs/merlin/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/navigation.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- navigation.xml 1 Apr 2004 23:49:08 -0000 1.9
+++ navigation.xml 3 Apr 2004 04:34:08 -0000 1.10
@@ -35,9 +35,21 @@
<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="Object Model" href="/merlin/uml.html"/>
+ <item name="Subsystems">
+ <item name="Meta" href="/merlin/systems/meta.html"/>
+ <item name="Repository" href="/merlin/systems/repository.html"/>
+ <item name="Composition" href="/merlin/systems/composition.html"/>
+ <item name="Activation" href="/merlin/systems/activation.html"/>
+ <item name="Logging" href="/merlin/systems/logging.html"/>
+ <item name="Kernel" href="/merlin/systems/kernel.html"/>
+ </item>
+ <item name="Embedding">
+ <item name="CLI" href="/merlin/embedded/cli.html"/>
+ <item name="Application" href="/merlin/embedded/main.html"/>
+ <item name="Servlet" href="/merlin/embedded/servlet.html"/>
+ <item name="Unit" href="/merlin/embedded/unit.html"/>
+ </item>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html" />
1.1 avalon/merlin/platform/xdocs/merlin/uml.xml
Index: uml.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<header>
<title>Merlin Overview</title>
<authors>
<person name="Stephen McConnell" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<section name="Object Model">
<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.3 +22 -11
avalon/merlin/platform/xdocs/reference/component/lifestyle/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/component/lifestyle/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 29 Mar 2004 18:10:29 -0000 1.2
+++ index.xml 3 Apr 2004 04:34:08 -0000 1.3
@@ -28,17 +28,28 @@
<section name="Lifestyle Specification">
- <subsection name="Transient">
- </subsection>
-
- <subsection name="Thread">
- </subsection>
-
- <subsection name="Pooled">
- </subsection>
-
- <subsection name="Singleton">
- </subsection>
+ <table>
+ <tr>
+ <td><strong>Strategy</strong></td>
+ <td><strong>Description</strong></td>
+ </tr>
+ <tr>
+ <td>singleton</td>
+ <td>A single instance of the component type will be shared by all
consumers.</td>
+ </tr>
+ <tr>
+ <td>thread</td>
+ <td>A new instance of the component will be created relative to each
distinct thread.</td>
+ </tr>
+ <tr>
+ <td>pool</td>
+ <td>A container shall maintain a pool of components.</td>
+ </tr>
+ <tr>
+ <td>transient</td>
+ <td>New instance of the component are created on a per request
basis.</td>
+ </tr>
+ </table>
</section>
1.2 +6 -0
avalon/merlin/platform/xdocs/reference/deployment/assembly.xml
Index: assembly.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/deployment/assembly.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- assembly.xml 2 Apr 2004 08:10:00 -0000 1.1
+++ assembly.xml 3 Apr 2004 04:34:08 -0000 1.2
@@ -27,6 +27,12 @@
<body>
<section name="Assembly">
+<p>
+Components 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 handle candidate selection, wiring of providers to
consumers, and deployment ordering.
+</p>
</section>
</body>
1.1 avalon/merlin/platform/xdocs/merlin/embedded/cli.xml
Index: cli.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Command-line Merlin</title>
</properties>
<body>
<section name="Commandline Merlin">
<subsection name="Overview">
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/merlin/embedded/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Specification</title>
</properties>
<body>
<section name="Embedded Deployment Solutions">
<subsection name="Index">
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
<td><a href="cli.html">Merlin Command-line</a></td>
<td>
The classic Merlin CLI application.
</td>
</tr>
<tr>
<td><a href="main.html">Generic Embedding</a></td>
<td>
Overview and code sample describing generic embedding solutions.
</td>
</tr>
<tr>
<td><a href="servlet.html">Servlet</a></td>
<td>
Demonstration of Merlin emebedded in a servlet.
</td>
</tr>
<tr>
<td><a href="unit.html">Merlin Unit Test</a></td>
<td>
The Merlin UnitTest system.
</td>
</tr>
</table>
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/merlin/embedded/main.xml
Index: main.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Specification</title>
</properties>
<body>
<section name="Generic Embedding">
<subsection name="Overview">
</subsection>
</section>
</body>
</document>
1.1
avalon/merlin/platform/xdocs/merlin/embedded/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
<item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
<item name="Components"
href="http://avalon.apache.org/product/components/"/>
</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="Object Model" href="/merlin/uml.html"/>
<item name="Subsystems"/>
<item name="Embedding">
<item name="CLI" href="/merlin/embedded/cli.html"/>
<item name="Application" href="/merlin/embedded/main.html"/>
<item name="Servlet" href="/merlin/embedded/servlet.html"/>
<item name="Unit" href="/merlin/embedded/unit.html"/>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Specification" href="/reference/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
<menu name="Related Projects">
<item name="Meta" href="http://avalon.apache.org/meta"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
</menu>
</body>
</project>
1.1 avalon/merlin/platform/xdocs/merlin/embedded/servlet.xml
Index: servlet.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Specification</title>
</properties>
<body>
<section name="Merlin Servlet">
<subsection name="Overview">
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/merlin/embedded/unit.xml
Index: unit.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Specification</title>
</properties>
<body>
<section name="Merlin Unit">
<subsection name="Overview">
</subsection>
</section>
</body>
</document>
1.1
avalon/merlin/platform/xdocs/merlin/systems/activation.xml
Index: activation.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Avalon Activation Subsystem</title>
</properties>
<body>
<section name="Avalon Activation Subsystem">
<subsection name="Introduction">
</subsection>
</section>
</body>
</document>
1.1
avalon/merlin/platform/xdocs/merlin/systems/composition.xml
Index: composition.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Avalon Composition Subsystem</title>
</properties>
<body>
<section name="Avalon Composition Subsystem">
<subsection name="Introduction">
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/merlin/systems/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Specification</title>
</properties>
<body>
<section name="Merlin Subsystems Breakdown">
<subsection name="Index">
<table>
<tr><th>System</th><th>Summary</th></tr>
<tr>
<td><a href="meta.html">Avalon Meta</a></td>
<td>
The component type model.
</td>
</tr>
<tr>
<td><a href="repository.html">Avalon Repository</a></td>
<td>
The resource management facility.
</td>
</tr>
<tr>
<td><a href="composition.html">Avalon Composition</a></td>
<td>
The core containment meta-model.
</td>
</tr>
<tr>
<td><a href="activation.html">Avalon Activation</a></td>
<td>
The runtime deployment platform.
</td>
</tr>
<tr>
<td><a href="logging.html">Avalon Logging</a></td>
<td>
The logging system management framework.
</td>
</tr>
<tr>
<td><a href="kernel.html">Avalon Merlin Kernel</a></td>
<td>
The merlin kernel.
</td>
</tr>
</table>
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/merlin/systems/logging.xml
Index: logging.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Avalon Logging Subsystem</title>
</properties>
<body>
<section name="Avalon Logging Subsystem">
<subsection name="Introduction">
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/merlin/systems/meta.xml
Index: meta.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Avalon Meta Subsystem</title>
</properties>
<body>
<section name="Avalon Meta Subsystem">
<subsection name="Introduction">
</subsection>
</section>
</body>
</document>
1.1
avalon/merlin/platform/xdocs/merlin/systems/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
<item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
<item name="Components"
href="http://avalon.apache.org/product/components/"/>
</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="Object Model" href="/merlin/uml.html"/>
<item name="Subsystems">
<item name="Meta" href="/merlin/systems/meta.html"/>
<item name="Repository" href="/merlin/systems/repository.html"/>
<item name="Composition" href="/merlin/systems/composition.html"/>
<item name="Activation" href="/merlin/systems/activation.html"/>
<item name="Logging" href="/merlin/systems/logging.html"/>
<item name="Kernel" href="/merlin/systems/kernel.html"/>
</item>
<item name="Embedding"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Specification" href="/reference/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
<menu name="Related Projects">
<item name="Meta" href="http://avalon.apache.org/meta"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
</menu>
</body>
</project>
1.1
avalon/merlin/platform/xdocs/merlin/systems/repository.xml
Index: repository.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<author email="[EMAIL PROTECTED]">Stephen McConnell</author>
<title>Avalon Repository Subsystem</title>
</properties>
<body>
<section name="Avalon Repository Subsystem">
<subsection name="Introduction">
</subsection>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
