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 2004/06/15 19:46:16 UTC
svn commit: rev 21299 - in avalon/trunk: central/site/src/xdocs/central/about/cop central/site/src/xdocs/central/about/installation central/site/src/xdocs/central/about/installation/archive central/site/src/xdocs/central/about/news central/site/src/xdocs/central/about/resources central/site/src/xdocs/central/about/tutorials/advanced central/site/src/xdocs/central/community/process central/site/src/xdocs/central/dpml central/site/src/xdocs/central/tools central/site/src/xdocs/central/tools/magic/model central/site/src/xdocs/central/tools/maven central/site/src/xdocs/central/tools/maven/merlin central/site/src/xdocs/central/tools/plugins central/site/src/xdocs/products/runtime/embedded central/site/src/xdocs/products/runtime/reference central/site/src/xdocs/products/runtime/reference/kernel central/site/src/xdocs/products/runtime/reference/kernel/overrides/target central/system runtime/framework/api/src/java/org/apache/avalon/framework/context runtime/merlin/tools
Author: mcconnell
Date: Tue Jun 15 10:46:15 2004
New Revision: 21299
Added:
avalon/trunk/central/site/src/xdocs/products/runtime/embedded/generic.xml
Removed:
avalon/trunk/runtime/merlin/tools/
Modified:
avalon/trunk/central/site/src/xdocs/central/about/cop/guide-patterns-avalon.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.0.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.2.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/cvs.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/nt.xml
avalon/trunk/central/site/src/xdocs/central/about/news/20030901.xml
avalon/trunk/central/site/src/xdocs/central/about/news/20030925.xml
avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml
avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml
avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml
avalon/trunk/central/site/src/xdocs/central/community/process/index.xml
avalon/trunk/central/site/src/xdocs/central/dpml/index.xml
avalon/trunk/central/site/src/xdocs/central/tools/magic/model/index.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/deploy.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/index.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/goals.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/index.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/properties.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/meta.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/properties.xml
avalon/trunk/central/site/src/xdocs/central/tools/maven/replicate.xml
avalon/trunk/central/site/src/xdocs/central/tools/navigation.xml
avalon/trunk/central/site/src/xdocs/central/tools/plugins/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml
avalon/trunk/central/site/src/xdocs/products/runtime/reference/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/overrides/target/navigation.xml
avalon/trunk/central/system/index.xml
avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/context/Contextualizable.java
Log:
steve following niclas' orders
Modified: avalon/trunk/central/site/src/xdocs/central/about/cop/guide-patterns-avalon.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/cop/guide-patterns-avalon.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/cop/guide-patterns-avalon.xml Tue Jun 15 10:46:15 2004
@@ -45,9 +45,9 @@
military take orders from their officers.
</p>
<p>
-<link href="guide-patterns-ioc.html">
+<a href="guide-patterns-ioc.html">
More Information...
- </link>
+ </a>
</p>
</subsection>
@@ -59,9 +59,9 @@
Avalon. We do this with software as well.
</p>
<p>
-<link href="guide-patterns-soc.html">
+<a href="guide-patterns-soc.html">
More Information...
- </link>
+ </a>
</p>
</subsection>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.0.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.0.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.0.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.2.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.2.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/archive/install.3.2.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/cvs.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/cvs.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/cvs.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/nt.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/installation/nt.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/nt.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
Modified: avalon/trunk/central/site/src/xdocs/central/about/news/20030901.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/news/20030901.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/news/20030901.xml Tue Jun 15 10:46:15 2004
@@ -38,7 +38,7 @@
</ul>
<p>Product documentation, tutorials and specifications are available
- on the <a href="http://avalon.apache.org/merlin">Merlin Home</a>
+ on the <a href="http://avalon.apache.org/products/runtime/index.html">Merlin Home</a>
site or the download link referenced above.
</p>
Modified: avalon/trunk/central/site/src/xdocs/central/about/news/20030925.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/news/20030925.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/news/20030925.xml Tue Jun 15 10:46:15 2004
@@ -11,8 +11,8 @@
<p>
The Avalon Team is proud to announce the general availability of <a
href="http://avalon.apache.org/framework">Avalon Framework 4.1.5</a>
-and <a href=" http://avalon.apache.org/meta/">Avalon Meta 1.1</a>
-packages. The new framework release includes enhancements linked to
+and <a href=" http://avalon.apache.org/products/runtime/system/meta">Avalon Meta</a>
+1.1 packages. The new framework release includes enhancements linked to
the new Avalon Meta model. Collectively the two packages represent an
important step forward in the evolution of the Avalon component model.
</p>
Modified: avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml Tue Jun 15 10:46:15 2004
@@ -28,10 +28,10 @@
</td>
</tr>
<tr>
- <td><a href="subversion.html">Subversion</a></td>
+ <td><a href="svn/index.html">Subversion</a></td>
<td>
<p>
- Introduction to subversion - out code management solution.
+ Introduction to subversion - our code management solution.
</p>
</td>
</tr>
Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml Tue Jun 15 10:46:15 2004
@@ -41,7 +41,7 @@
</subsection>
<subsection name="Creating a Profile">
<p>
-This tutorial extends the interfaces, classes and meta info declared in the <a href="../tutorial/dependencies/index.html">dependencies tutorial</a> by adding a configurable seed value to the RandomGenerator component. Without the benefit of a profile, users would be forced to declare a configuration under the block.xml directive. By providing one or more profiles, we enable Merlin to automatically select a deployment scenario candidate and use this during the assembly phase.
+This tutorial extends the interfaces, classes and meta info declared in the <a href="../basic/dependencies/index.html">dependencies tutorial</a> by adding a configurable seed value to the RandomGenerator component. Without the benefit of a profile, users would be forced to declare a configuration under the block.xml directive. By providing one or more profiles, we enable Merlin to automatically select a deployment scenario candidate and use this during the assembly phase.
</p>
<p>
The RandomGeneratorProvider source and the corresponding profile directive are presented below.
Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml Tue Jun 15 10:46:15 2004
@@ -27,9 +27,8 @@
<section name="Advanced Features">
<subsection name="Profile Selection">
- <p><i>Requires Merlin 3.1</i></p>
<p>
-In the <a href="profiles.html">Profile tutorial</a> we covered the mechanisms used to establish a pre-configured deployment profile. In this tutorial we update the <classname>.xprofile to include multiple named profiles and show how you can select a specific profile when declaring a component in block descriptor.
+In the <a href="profiles.html">"Deployment Templates </a> tutorial we covered the mechanisms used to establish a pre-configured deployment profile. In this tutorial we update the <classname>.xprofile to include multiple named profiles and show how you can select a specific profile when declaring a component in block descriptor.
</p>
<p>
Component deployment profiles are co-located with the component implementation class under an .xprofile resource.
Modified: avalon/trunk/central/site/src/xdocs/central/community/process/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/community/process/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/community/process/index.xml Tue Jun 15 10:46:15 2004
@@ -11,24 +11,21 @@
Avalon, like all other projects at Apache, is a
<em>meritocracy</em> and follows the <em>Apache Way</em> of
community and project management. The following documents
- help define these terms and form the guidelines by which Avalon operates.
+ help define these terms and form the guidelines by which
+ Avalon operates.
</p>
<ul>
<li><a href="http://jakarta.apache.org/site/decisions.html">
Meritocracy</a></li>
- <li><a
- href="http://nagoya.apache.org/wiki/apachewiki.cgi?ApacheWay">
+ <li><a href="http://nagoya.apache.org/wiki/apachewiki.cgi?ApacheWay">
The Apache Way</a></li>
<li><a href="http://jakarta.apache.org/site/roles.html">Roles
and Responsibilities</a></li>
<li><a href="http://jakarta.apache.org/site/guidelines.html">
Jakarta Project Guidelines</a></li>
- <li><a href="http://incubator.apache.org/index.html">
- The Apache Incubator Project</a></li>
<li><a href="http://apache.org/foundation/">The Apache Software
Foundation</a> (ASF)</li>
- <li><a
- href="http://www.apache.org/licenses/#clas">
+ <li><a href="http://www.apache.org/licenses/#clas">
Contributor license Agreement</a> [PDF]</li>
<li><a href="http://james.apache.org/contribute.html">Getting Involved</a></li>
</ul>
Modified: avalon/trunk/central/site/src/xdocs/central/dpml/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/dpml/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/dpml/index.xml Tue Jun 15 10:46:15 2004
@@ -40,7 +40,7 @@
meta-driven component solutions. Each of these initative, from
complex system such as the <a href="http://james.apache.org/">
James</a> enterprise messaging platform through to utility components
-such as the <a href="http://avalon.apache.org/cornerstone/">Cornerstone</a>
+such as the <a href="/planet/components/index.html/">Cornerstone</a>
component suite (thread pools, persistence, task scheduling, etc.) can
be represented in Merlin as pluggable services within a composite
component context. Looking forward, the challenge will be the ability to
Modified: avalon/trunk/central/site/src/xdocs/central/tools/magic/model/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/magic/model/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/magic/model/index.xml Tue Jun 15 10:46:15 2004
@@ -7,7 +7,20 @@
</properties>
<body>
- <section name="Magic">
+ <section name="Magic's Project Model">
+
+ <p>
+ The notion of a POM (Project Object Model) is familiar to
+ Maven users. Magic extends this concepts through a central
+ index of projects, unique project keys, and complete support
+ for transitive inheritance of dependency information.
+ </p>
+ <p>
+ An example of a Magic project defintion is shown below:
+ </p>
+<source>
+</source>
+
</section>
</body>
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/deploy.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/deploy.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/deploy.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
<section name="Merlin Plugin for Maven">
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/index.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/goals.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/goals.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/goals.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
<section name="Merlin Plugin for Maven">
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/index.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/properties.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/properties.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/merlin/properties.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
<section name="Merlin Plugin for Maven">
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/meta.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/meta.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/meta.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
<section name="Merlin Plugin for Maven">
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/properties.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/properties.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/properties.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
<section name="Merlin Plugin for Maven">
Modified: avalon/trunk/central/site/src/xdocs/central/tools/maven/replicate.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/maven/replicate.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/maven/replicate.xml Tue Jun 15 10:46:15 2004
@@ -20,7 +20,7 @@
<document>
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
<section name="Merlin Plugin for Maven">
Modified: avalon/trunk/central/site/src/xdocs/central/tools/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/navigation.xml Tue Jun 15 10:46:15 2004
@@ -24,8 +24,8 @@
<body>
<menu>
<item name="Magic" href="magic/index.html"/>
- <item name="Magic Plugins" href="magic/index.html"/>
- <item name="Maven Plugins" href="maven/index.html"/>
+ <item name="Optional Plugins" href="plugins/index.html"/>
+ <item name="Legacy Support" href="maven/index.html"/>
</menu>
</body>
Modified: avalon/trunk/central/site/src/xdocs/central/tools/plugins/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/plugins/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/plugins/index.xml Tue Jun 15 10:46:15 2004
@@ -21,7 +21,7 @@
<properties>
<author email="mcconnell@apache.org">Stephen McConnell</author>
- <title>Merlin Runtime</title>
+ <title>Avalon Central</title>
</properties>
<body>
Added: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/generic.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/generic.xml Tue Jun 15 10:46:15 2004
@@ -0,0 +1,135 @@
+<?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="mcconnell@apache.org">Stephen McConnell</author>
+ <title>Merlin Runtime</title>
+ </properties>
+
+ <body>
+
+ <section name="Generic Embedding">
+
+ <subsection name="Overview">
+
+ <p>
+ The folowing information is a step by step decomposition of
+ a example of Merlin embedded in a main method. The details
+ presented here are the same as that used in all embedded Merlin
+ scenarios. Typically a embedded application will deviate from
+ this model to take into account the embedded context by resolving
+ factory parameters relative to the execution environment.
+ </p>
+
+ </subsection>
+
+ <subsection name="Sample Main">
+<source>
+/*
+ * 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.
+ */
+
+package tutorial;
+
+import java.io.File;
+import java.util.Map;
+
+import org.apache.avalon.repository.Artifact;
+import org.apache.avalon.repository.provider.Builder;
+import org.apache.avalon.repository.provider.Factory;
+import org.apache.avalon.repository.provider.InitialContextFactory;
+import org.apache.avalon.repository.provider.InitialContext;
+import org.apache.avalon.repository.main.DefaultInitialContextFactory;
+import org.apache.avalon.repository.Artifact;
+
+/**
+ * An example of the embedding of a merlin kernel inside a main
+ * method. The objective of the example is to demonstrate a
+ * simple embedded scenario.
+ */
+public class Main
+{
+ public static void main( String[] args ) throws Exception
+ {
+ //
+ // Create the initial context factory. This establishes
+ // the application group from which properties will
+ // be resolved. It also provides operations supporting
+ // customization of the application environment.
+ //
+
+ InitialContextFactory initial =
+ new DefaultInitialContextFactory( "merlin" );
+ File home = initial.getHomeDirectory();
+ initial.setCacheDirectory( new File( home, "system" ) );
+ InitialContext context = initial.createInitialContext();
+
+ //
+ // Using the initial context we can now load any repository
+ // application using an artifact specification. Meta
+ // information associated with the artifact is used to
+ // construct the classloader that the application needs in
+ // order to execute.
+ //
+
+ String spec = "artifact:merlin/merlin-impl#3.3-SNAPSHOT";
+ Artifact artifact = Artifact.createArtifact( spec );
+ Builder builder = context.newBuilder( artifact );
+
+ //
+ // With the classloader established we can go ahead and
+ // and get the application factory. The factory has already
+ // been parameterized with defaults derived from properties
+ // based on the application group. We can provide
+ // overriding values by setting the factory criteria to
+ // application specific values following which we instantiate
+ // the application.
+ //
+
+ Factory factory = builder.getFactory();
+ Map criteria = factory.createDefaultCriteria();
+ factory.create( criteria );
+ }
+}
+</source>
+ </subsection>
+
+ </section>
+
+ </body>
+
+</document>
+
+
+
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml Tue Jun 15 10:46:15 2004
@@ -26,104 +26,9 @@
<body>
- <section name="Generic Embedding">
+ <section name="Embedding">
- <subsection name="Overview">
-
- <p>
- The folowing information is a step by step decomposition of
- a example of Merlin embedded in a main method. The details
- presented here are the same as that used in all embedded Merlin
- scenarios. Typically a embedded application will deviate from
- this model to take into account the embedded context by resolving
- factory parameters relative to the execution environment.
- </p>
-
- </subsection>
-
- <subsection name="Sample Main">
-<source>
-/*
- * 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.
- */
-
-package tutorial;
-
-import java.io.File;
-import java.util.Map;
-
-import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.provider.Builder;
-import org.apache.avalon.repository.provider.Factory;
-import org.apache.avalon.repository.provider.InitialContextFactory;
-import org.apache.avalon.repository.provider.InitialContext;
-import org.apache.avalon.repository.main.DefaultInitialContextFactory;
-import org.apache.avalon.repository.Artifact;
-
-/**
- * An example of the embedding of a merlin kernel inside a main
- * method. The objective of the example is to demonstrate a
- * simple embedded scenario.
- */
-public class Main
-{
- public static void main( String[] args ) throws Exception
- {
- //
- // Create the initial context factory. This establishes
- // the application group from which properties will
- // be resolved. It also provides operations supporting
- // customization of the application environment.
- //
-
- InitialContextFactory initial =
- new DefaultInitialContextFactory( "merlin" );
- File home = initial.getHomeDirectory();
- initial.setCacheDirectory( new File( home, "system" ) );
- InitialContext context = initial.createInitialContext();
-
- //
- // Using the initial context we can now load any repository
- // application using an artifact specification. Meta
- // information associated with the artifact is used to
- // construct the classloader that the application needs in
- // order to execute.
- //
-
- String spec = "artifact:merlin/merlin-impl#3.3-SNAPSHOT";
- Artifact artifact = Artifact.createArtifact( spec );
- Builder builder = context.newBuilder( artifact );
-
- //
- // With the classloader established we can go ahead and
- // and get the application factory. The factory has already
- // been parameterized with defaults derived from properties
- // based on the application group. We can provide
- // overriding values by setting the factory criteria to
- // application specific values following which we instantiate
- // the application.
- //
-
- Factory factory = builder.getFactory();
- Map criteria = factory.createDefaultCriteria();
- factory.create( criteria );
- }
-}
-</source>
- </subsection>
+ <p>INDEX IN PREPARATION</p>
</section>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml Tue Jun 15 10:46:15 2004
@@ -23,7 +23,8 @@
<body>
<menu>
- <item name="CLI" href="cli.html"/>
+ <item name="Generic Embedding" href="generic.html"/>
+ <item name="CLI Handler" href="cli.html"/>
<item name="Servlet" href="servlet.html"/>
<item name="Unit" href="unit.html"/>
</menu>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/index.xml Tue Jun 15 10:46:15 2004
@@ -67,7 +67,7 @@
</td>
</tr>
<tr>
- <td><a href="system/index.html">System Specification</a></td>
+ <td><a href="kernel/index.html">System Specification</a></td>
<td>
Merlin system specification including kernel configuration
directives and system deployment properties.
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/index.xml Tue Jun 15 10:46:15 2004
@@ -34,7 +34,7 @@
<tr>
<td><a href="properties.html">System Properties</a></td>
<td>
-The Merlin kernel is established using the <a href="http://avalon.apache.org/repository">Avalon Repository</a> resource management system under the application key <strong>"merlin"</strong>. The complete specification of system properties (description and default values) together with supported property file locations are defined here.
+The Merlin kernel is established using the <a href="../../system/repository">Avalon Repository</a> resource management system under the application key <strong>"merlin"</strong>. The complete specification of system properties (description and default values) together with supported property file locations are defined here.
</td>
</tr>
<tr>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/overrides/target/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/overrides/target/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/kernel/overrides/target/navigation.xml Tue Jun 15 10:46:15 2004
@@ -23,10 +23,9 @@
<body>
<menu>
- <item name="Overview" href="index.html"/>
<item name="configuration" href="config.html"/>
<item name="categories" href="categories/index.html"/>
- <item name="security" href="target/security.html"/>
+ <!-- <item name="security" href="security.html"/> -->
</menu>
</body>
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Tue Jun 15 10:46:15 2004
@@ -120,7 +120,7 @@
<version>4.2.0</version>
</info>
<dependencies>
- <include key="avalon-logkit" runtime="true" test="false"/>
+ <!--<include key="avalon-logkit" runtime="true" test="false"/>-->
</dependencies>
</project>
Modified: avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/context/Contextualizable.java
==============================================================================
--- avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/context/Contextualizable.java (original)
+++ avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/context/Contextualizable.java Tue Jun 15 10:46:15 2004
@@ -27,7 +27,7 @@
{
/**
* Pass the Context to the component.
- * This method is called after the Loggable.setLogger() (if present)
+ * This method is called after the LogEnabled.enableLogging( Logger ) (if present)
* method and before any other method.
*
* @param context the context. Must not be <code>null</code>.
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org