You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/06/15 21:24:58 UTC

svn commit: rev 21304 - in avalon/trunk/central/site/src/xdocs: central central/about/news central/laboratory/developing central/laboratory/studio central/laboratory/studio/developing-plugins central/laboratory/studio/getting-started central/laboratory/studio/installation central/laboratory/studio/manual central/laboratory/studio/reference central/legacy central/legacy/developing central/legacy/doc central/legacy/product/components central/legacy/product/containers central/legacy/product/framework central/legacy/related products/runtime products/runtime/embedded products/runtime/execmodes products/runtime/reference/component/artifacts products/runtime/reference/component/descriptors products/runtime/reference/component/lifecycle products/runtime/system/logging/logkit/impl products/runtime/system/repository/example products/runtime/system/repository/tools

Author: niclas
Date: Tue Jun 15 12:24:57 2004
New Revision: 21304

Added:
   avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/
      - copied from rev 21301, avalon/trunk/central/site/src/xdocs/products/runtime/embedded/
Removed:
   avalon/trunk/central/site/src/xdocs/products/runtime/embedded/
Modified:
   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/laboratory/developing/compatiblity.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/developing/introduction.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/developing/compatiblity.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/developing/introduction.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/doc/articles.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/doc/index.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/doc/wiki.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/overview.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/product/components/index.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/history.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/index.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/overview.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/product/framework/index.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/related/apache.xml
   avalon/trunk/central/site/src/xdocs/central/legacy/related/external.xml
   avalon/trunk/central/site/src/xdocs/central/overview.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/context.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/logger.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/manager.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/descriptors/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/etherialization.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/incarnation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/runtime.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/logging/logkit/impl/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/example/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/tools/index.xml
Log:
Fixed heaps of links... have not checked them all yet.

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 12:24:57 2004
@@ -2,13 +2,13 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Avalon Central</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
     <section name="Merlin 3.0 beta 1 Release">
-    <p>26-SEP-2003</p>
-    <p>
+    <p>26-SEP-2003</p>
+    <p>
      The Avalon Team is proud to announce the release of Merlin 3.0
      Beta 1. Merlin is an advanced component and service management
      solution that simplifies and enhances component development,
@@ -38,7 +38,7 @@
  </ul>
 
   <p>Product documentation, tutorials and specifications are available
-     on the <a href="http://avalon.apache.org/products/runtime/index.html">Merlin Home</a>
+     on the <a href="../../../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 12:24:57 2004
@@ -2,16 +2,16 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Avalon Central</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
     <section name="Avalon Framework 4.1.5 and Avalon Meta 1.1">
-  <p>25-SEP-2003</p>
+  <p>25-SEP-2003</p>
    <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/products/runtime/system/meta">Avalon Meta</a>
+href="http://avalon.apache.org/download.html">Avalon Framework 4.1.5</a>
+and <a href="../../../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.

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/developing/compatiblity.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/developing/compatiblity.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/developing/compatiblity.xml	Tue Jun 15 12:24:57 2004
@@ -52,7 +52,7 @@
     </p>
     <p>
       It is also a good idea to understand the
-      <a href="http://avalon.apache.org/framework/cop/guide-patterns-soii.html">
+      <a href="../../about/cop/guide-patterns-soii.html">
       separation of interface and implementation</a> when designing components.
     </p>
   </section>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/developing/introduction.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/developing/introduction.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/developing/introduction.xml	Tue Jun 15 12:24:57 2004
@@ -44,9 +44,9 @@
       AvalonNet which is a Microsoft dotNet implementation of 
       Avalon. Avalon also carries a lot of legacy, which was deprecated
       in 2004, namely 
-      <a href="http://avalon.apache.org/excalibur">Excalibur</a>,
-      <a href="http://avalon.apache.org/phoenix">Phoenix</a> and 
-      <a href="http://avalon.apache.org/excalibur/fortress">Fortress</a>.
+      <a href="http://excalibur.apache.org">Excalibur</a>,
+      <a href="http://loom.codehaus.org">Phoenix now known as Loom</a> and 
+      <a href="http://excalibur.apache.org/fortress">Fortress</a>.
       These containers and utilities has been deprecated and no longer
       being actively worked on.
     </p>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/developing-plugins/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-<project href="http://avalon.apache.org/logkit" 
-         name="Avalon Framework">
+<project name="Avalon Framework">
   <title>Merlin Developer</title>
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/getting-started/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-<project href="http://avalon.apache.org/logkit" 
-         name="Avalon Framework">
+<project name="Avalon Framework">
   <title>Merlin Developer</title>
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/installation/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-<project href="http://avalon.apache.org/logkit" 
-         name="Avalon Framework">
+<project name="Avalon Framework">
   <title>Merlin Developer</title>
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-<project href="http://avalon.apache.org/logkit" 
-         name="Avalon Framework">
+<project name="Avalon Framework">
  <title>Merlin Developer</title>
 
  <body>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -17,8 +17,7 @@
  limitations under the License.
 -->
 
-<project href="http://avalon.apache.org/logkit" 
-         name="Avalon Framework">
+<project name="Avalon Framework">
   <title>Merlin Developer</title>
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/reference/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -17,9 +17,8 @@
  limitations under the License.
 -->
 
-<project href="http://avalon.apache.org/logkit" 
-         name="Avalon Framework">
-  <title>Merlin Developer</title>
+<project name="Avalon Studio">
+  <title>Avalon Studio</title>
 
   <body>
     <menu>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/developing/compatiblity.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/developing/compatiblity.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/developing/compatiblity.xml	Tue Jun 15 12:24:57 2004
@@ -52,7 +52,7 @@
     </p>
     <p>
       It is also a good idea to understand the
-      <a href="http://avalon.apache.org/framework/cop/guide-patterns-soii.html">
+      <a href="../../about/cop/guide-patterns-soii.html">
       separation of interface and implementation</a> when designing components.
     </p>
   </section>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/developing/introduction.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/developing/introduction.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/developing/introduction.xml	Tue Jun 15 12:24:57 2004
@@ -44,9 +44,9 @@
       AvalonNet which is a Microsoft dotNet implementation of 
       Avalon. Avalon also carries a lot of legacy, which was deprecated
       in 2004, namely 
-      <a href="http://avalon.apache.org/excalibur">Excalibur</a>,
-      <a href="http://avalon.apache.org/phoenix">Phoenix</a> and 
-      <a href="http://avalon.apache.org/excalibur/fortress">Fortress</a>.
+      <a href="http://excalibur.apache.org">Excalibur</a>,
+      <a href="http://loom.codehaus.org">Phoenix now known as Loom</a> and 
+      <a href="http://excalibur.apache.org/fortress">Fortress</a>.
       These containers and utilities has been deprecated and no longer
       being actively worked on.
     </p>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/doc/articles.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/doc/articles.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/doc/articles.xml	Tue Jun 15 12:24:57 2004
@@ -15,40 +15,40 @@
      <subsection name="General Documentation">
       <ul>
         <li>
-	 <a href="http://avalon.apache.org/developing/index.html">Developing With Avalon</a>:
-	 An excellent white paper on the Avalon framework.
-	 Recommended reading!
-        </li>
-	<li>
-	<a href="http://avalon.apache.org/framework/cop/index.html">An Introduction to COP</a>:
-	 An introduction to Component Oriented Programming and the
-	 core Avalon Framework.
-	</li>
-	<li>
-	<a href="http://avalon.apache.org/framework/principals/index.html">COP Development
-	 Principles</a>: A look at design principles to consider when
-	 developing in Avalon and COP in general.
-	</li>
-	<li>
-	 <a href="http://avalon.apache.org/framework/principals/lifecycle.html">The Avalon
-	 Lifecycle</a>: Introduces the standard Avalon lifecycle for components.
-	</li>
-	<li>
-	  <a href="../community/history/need-for-avalon.html">The Need For
-	  Avalon</a>:
+         <a href="../../cop/index.html">Developing With Avalon</a>:
+         An excellent white paper on the Avalon framework.
+         Recommended reading!
+        </li>
+        <li>
+        <a href="../../cop/index.html">An Introduction to COP</a>:
+         An introduction to Component Oriented Programming and the
+         core Avalon Framework.
+        </li>
+        <li>
+        <a href="../../../products/runtime/reference/component/index.html">COP Development
+         Principles</a>: A look at design principles to consider when
+         developing in Avalon and COP in general.
+        </li>
+        <li>
+         <a href="../../../products/runtime/reference/component/lifecycle/index.html">The Avalon
+         Lifecycle</a>: Introduces the standard Avalon lifecycle for components.
+        </li>
+        <li>
+          <a href="../../community/history/need-for-avalon.html">The Need For
+          Avalon</a>:
       In this document, Stefano introduces his vision for the Java Apache
       Server Framework project. He explain why he believes that
       open-source projects should invest more time in software
       engineering and why this may be worth while even in very successful
       and high quality software projects. [HISTOROICAL]
-	</li>
-	<li>
-	  <a href="../community/history/what-is-a-server.html">What Is A
-	  Server</a>: Pierpaolo Fumagalli explains how a
-	  server could be developed using the benefits offered by the 
-	  Java Apache Server Framework (Avalon) and introduces the
-	  reader to the concept of what a <code>Block</code>. [HISTORICAL]
-	</li>
+        </li>
+        <li>
+          <a href="../../community/history/what-is-a-server.html">What Is A
+          Server</a>: Pierpaolo Fumagalli explains how a
+          server could be developed using the benefits offered by the 
+          Java Apache Server Framework (Avalon) and introduces the
+          reader to the concept of what a <code>Block</code>. [HISTORICAL]
+        </li>
       </ul>
      </subsection>
     </section>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/doc/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/doc/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/doc/index.xml	Tue Jun 15 12:24:57 2004
@@ -33,94 +33,94 @@
        <tr>
          <td>
           <a href="http://wiki.apache.org/avalon/AvalonFAQ">
-	   FAQ</a>
-	 </td>
-	 <td>
-	  A community-maintained Frequenty Asked Questions database
+           FAQ</a>
+         </td>
+         <td>
+          A community-maintained Frequenty Asked Questions database
           in our wiki.
-	 </td>
+         </td>
        </tr>
        <tr>
          <td>
          <a href="http://wiki.apache.org/avalon/AvalonGlossary">
-	   Glossary</a>
+           Glossary</a>
          </td>
-	 <td>Glossary of terms for Avalon technology</td>
+         <td>Glossary of terms for Avalon technology</td>
        </tr>
        <tr>
          <td><a href="../product/index.html">Product Documentation</a></td>
-	 <td> Each individual product or sub-project has its own section which
-	 includes API documentation (javadocs), usage material, and
-	 often simple tutorials.</td>
+         <td> Each individual product or sub-project has its own section which
+         includes API documentation (javadocs), usage material, and
+         often simple tutorials.</td>
        </tr>
        <tr>
          <td><a href="../mailing-lists.html">Mailing Lists</a></td>
-	 <td>The mailing list archives are full of tips, examples,
+         <td>The mailing list archives are full of tips, examples,
          solutions, and explanations about Avalon.</td> 
        </tr>
      </table>
      <subsection name="Articles">
        <table>
          <tr>
-	  <th>Resource</th>
-	  <th>Description</th>
-	 </tr>
+          <th>Resource</th>
+          <th>Description</th>
+         </tr>
          <tr>
           <td>
-	   <a href="../developing/index.html">
+           <a href="../developing/index.html">
            Developing With Avalon</a>
           </td>
           <td> The Avalon Developers Guide. An excellent white paper
            on the Avalon framework. Recommended reading! </td>
-	</tr>
-	<tr>
+        </tr>
+        <tr>
           <td>
-	<a href="http://avalon.apache.org/framework/cop/index.html">An
+        <a href="../../about/cop/index.html">An
          Introduction to COP</a></td>
            <td>
-	 An introduction to Component Oriented Programming and the
-	 core Avalon Framework.</td>
-	</tr>
-	<tr>
+         An introduction to Component Oriented Programming and the
+         core Avalon Framework.</td>
+        </tr>
+        <tr>
           <td>
-	   <a href="http://avalon.apache.org/framework/principals/index.html">
+           <a href="../../about/cop/index.html">
             COP Development Principles</a></td>
-	  <td>
-	   A look at design principles to consider when developing in
+          <td>
+           A look at design principles to consider when developing in
            Avalon and COP in general.
-	 </td>
-	</tr>
-	<tr>
+         </td>
+        </tr>
+        <tr>
           <td>
-	  <a href="http://avalon.apache.org/framework/principals/lifecycle.html">
+          <a href="../../../products/runtime/reference/component/lifecycle.html">
            The Avalon Lifecycle</a>
            </td> 
-	   <td>Introduces the standard Avalon lifecycle for components.</td>
-	</tr>
-	<tr>
-	  <td>
-	  <a href="../community/history/need-for-avalon.html">
-	  The Need For Avalon</a>
+           <td>Introduces the standard Avalon lifecycle for components.</td>
+        </tr>
+        <tr>
+          <td>
+          <a href="../../community/history/need-for-avalon.html">
+          The Need For Avalon</a>
           </td>
-	  <td>
+          <td>
       In this document, Stefano introduces his vision for the Java Apache
       Server Framework project. He explain why he believes that
       open-source projects should invest more time in software
       engineering and why this may be worth while even in very successful
-      and high quality software projects. [HISTOROICAL]
+      and high quality software projects. [HISTORICAL]
           </td>
-	</tr>
-	<tr>
+        </tr>
+        <tr>
          <td>
-	  <a href="../community/history/what-is-a-server.html">What Is A
-	  Server</a></td>
-	 <td> Pierpaolo Fumagalli explains how a
-	  server could be developed using the benefits offered by the 
-	  Java Apache Server Framework (Avalon) and introduces the
-	  reader to the concept of what a
+          <a href="../../community/history/what-is-a-server.html">What Is A
+          Server</a></td>
+         <td> Pierpaolo Fumagalli explains how a
+          server could be developed using the benefits offered by the 
+          Java Apache Server Framework (Avalon) and introduces the
+          reader to the concept of what a
          <code>Block</code>. [HISTORICAL]
           </td>
-	</tr>
+        </tr>
        </table>
      </subsection>
     </section>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/doc/wiki.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/doc/wiki.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/doc/wiki.xml	Tue Jun 15 12:24:57 2004
@@ -7,7 +7,10 @@
 
   <body>
     <section name="Avalon Wiki">
-    <p>The <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?AvalonProjectPages">Avalon Wiki</a> contains a growing collection of information about Avalon, random thoughts on component models and container solutions, roadmaps, development discussions, general ideas and other inspirational material.</p>
+    <p>The <a href="http://wiki.apache.org/avalon">Avalon Wiki</a> contains a 
+    growing collection of information about Avalon, random thoughts on 
+    component models and container solutions, roadmaps, development 
+    discussions, general ideas and other inspirational material.</p>
     </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/overview.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/overview.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/overview.xml	Tue Jun 15 12:24:57 2004
@@ -125,7 +125,7 @@
        programming, then in addition to the <a
        href="doc/index.html">Articles</a> section, look at the
        Framework documentation.  The <a
-       href="http://avalon.apache.org/framework/index.html">Framework</a> 
+       href="../../products/runtime/reference/component/index.html">Framework</a> 
        project contains
        sections of COP practices and is itself a good COP reference
        implementation.
@@ -134,8 +134,8 @@
       <subsection name="General Resources">
        <p>
        Don't forget to wade through the wealth of material on our <a
-       href="http://nagoya.apache.org/wiki/apachewiki.cgi?AvalonProjectPages">
-       Wiki</a> site.  The <a href="mailing-lists.html">mailing
+       href="http://wiki.apache.org/avalon">
+       Wiki</a> site.  The <a href="../about/resources/mailing-lists.html">mailing
        lists</a> are also an excellent resource for support and more
        information.
        </p>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/product/components/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/product/components/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/product/components/index.xml	Tue Jun 15 12:24:57 2004
@@ -13,7 +13,7 @@
       <table>
         <tr><th>Topic</th><th>Description</th></tr>
         <tr><td>
-          <a href="http://avalon.apache.org/components/index.html">Cornerstone Collection</a></td>
+          Cornerstone Collection</td>
           <td>
             <p>
         The cornerstone project is the home of a set of component blocks
@@ -25,7 +25,7 @@
         </tr>
         <tr>
           <td>
-          <a href="http://avalon.apache.org/excalibur/index.html">Excalibur Utilities</a></td>
+          <a href="http://excalibur.apache.org">Excalibur Utilities</a></td>
           <td>
             <p>
         The Excalibur project is the home of a set of utility services

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/history.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/history.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/history.xml	Tue Jun 15 12:24:57 2004
@@ -18,8 +18,8 @@
         Phoenix model dealt with a strict singleton model supporting 
         project such as <a href="http://james.apache.org">James</a>.  
         Further developments resulted in the release of 
-        <a href="http://avalon.apache.org/excalibur/fortress/">Fortress</a> 
-        and <a href="http://avalon.apache.org/merlin/">Merlin</a>.  
+        <a href="http://excalibur.apache.org/fortress/">Fortress</a> 
+        and <a href="../../../../products/runtime/index.html">Merlin</a>.  
         Fortress replaced the ECM solution
         and was positioned as a migration vehicle for components to move
         towards Avalon's latest container - Merlin.  The Merlin container
@@ -38,7 +38,7 @@
       <p>
         Below is the list of legacy containers.
         Avalon recommend that new users only invest time in 
-        <a href="http://avalon.apache.org/merlin">Merlin</a>, the only 
+        <a href="../../../../products/runtime/index.html">Merlin</a>, the only 
         sustainable solution. ECM and Fortress will be
         partially supported during a transition period, but eventually
         taken out of Avalon completely. Users who are interested in Phoenix
@@ -53,7 +53,7 @@
           <td>
             <p>
               <a name="fortress"/>
-              <a href="http://avalon.apache.org/excalibur/fortress/">Avalon 
+              <a href="http://excalibur.apache.org/fortress/">Avalon 
               Fortress</a>
             </p>
           </td>
@@ -70,7 +70,7 @@
           <td>
             <p>
               <a name="ecm"/>
-              <a href="http://avalon.apache.org/excalibur/component.html">ECM</a>
+              <a href="http://excalibur.apache.org">ECM</a>
             </p>
           </td>
           <td>
@@ -84,7 +84,7 @@
           <td>
             <p>
               <a name="phoenix"/>
-              <a href="http://avalon.apache.org/phoenix/index.html">Phoenix</a>
+              Phoenix, see <a href="http://loom.codehaus.org">Loom project</a>
             </p>
           </td>
           <td>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/index.xml	Tue Jun 15 12:24:57 2004
@@ -14,7 +14,7 @@
           <td>
             <p>
               <a name="merlin"/>
-              <a href="http://avalon.apache.org/merlin/index.html">Avalon 
+              <a href="../../../../products/runtime/index.html">Avalon 
               Merlin</a>
             </p>
           </td>
@@ -72,4 +72,4 @@
       </table>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/overview.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/overview.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/product/containers/overview.xml	Tue Jun 15 12:24:57 2004
@@ -51,7 +51,7 @@
         <p>
           The Merlin container supports both LogKit and Log4J logging subsystem,
           and please look at the 
-          <a href="http://avalon.apache.org/logging/index.html">Avalon Logging</a> subsystem for 
+          <a href="../../../../products/runtime/system/logging/index.html">Avalon Logging</a> subsystem for 
           details.
         </p>
       </subsection>
@@ -72,7 +72,7 @@
           The ServiceManager will only provide the component with components
           that satisfy the <strong>dependencies</strong> declaration in the
           component's 
-          <a href="http://avalon.apache.org/meta/meta/info/type/index.html">Type descriptor</a> 
+          <a href="../../../../products/runtime/system/meta/meta/info/type/index.html">Type descriptor</a> 
           (.xinfo). If it attempts to lookup anything outside the declared
           dependencies, the container is expected to throw a ServiceException.
         </p>
@@ -99,7 +99,7 @@
         <p>
           The above construct allow for very complex Configurations, using
           XML nested elements, but not any XML, it must follow certain rules.
-          See <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/configuration/Configuration.html">
+          See <a href="/api/org/apache/avalon/framework/configuration/Configuration.html">
           Configuration</a> API docs for details.
         </p>
       </subsection>
@@ -120,7 +120,7 @@
 </source>
         <p>
           It is also possible to create custom context entries. 
-          <a href="http://avalon.apache.org/merlin/starting/advanced/context.html">Read more about it.</a>
+          <a href="../../../about/tutorials/advanced/context.html">Read more about it.</a>
         </p>
       </subsection>
       
@@ -137,7 +137,7 @@
         </p>
         <p>
           Avalon has in the meantime created the 
-          <a href="http://avalon.apache.org/repository/index.html">Avalon Repository</a> which allows
+          <a href="../../../../products/runtime/system/repository/index.html">Avalon Repository</a> which allows
           the applications to be distributed without any Jars, and the right
           versions of the Jars will be picked up at one or many central 
           repositories. This system is compatible with the Maven repositories,
@@ -153,7 +153,7 @@
           The most straight forward deployment case is the stand-alone server,
           that is started from the command-line. No programming is required, 
           and there are heaps of command-line arguments available. Read about
-          the details <a href="http://avalon.apache.org/merlin/merlin/kernel/cli.html">here</a>.
+          the details <a href="../../../../products/runtime/execmodes/cli.html">here</a>.
         </p>
         <p>
           Merlin even supports that it is bootstrapped, with a tiny JAR, which 
@@ -182,7 +182,7 @@
       <subsection name="Running as a Windows NT/XP Service" >
         <p>
           Merlin is capable of starting as a Windows NT/XP Service. You can
-          read about how on <a href="http://avalon.apache.org/merlin/merlin/kernel/nt.html">this 
+          read about how on <a href="../../../about/installation/nt.html">this 
           page.</a>
         </p>
       </subsection>
@@ -194,7 +194,9 @@
           into components, you will need to create Merlin embedded inside your
           application. About 10-15 lines of code is currently required, where
           the InitialContext is established, the Directives are setup and a 
-          Kernel is created. It looks more complicated than it is, but it is
+          Kernel is created. It 
+          <a href="../../../../products/runtime/execmodes/servlet.html">looks 
+          more complicated</a> than it is, but it is
           extremely powerful, and allows the same features as the stand-alone
           server, in fact the small bootstrapper in the stand-alone case, does
           exactly the same thing. 
@@ -205,7 +207,7 @@
         <p>
           If the Servlet engine allows, it is possible to embedd Merlin inside
           a Servlet. The code required to do it, can be seen
-          <a href="http://avalon.apache.org/merlin/extensions/servlet/index.html">here</a>.
+          <a href="../../../../products/runtime/execmodes/servlet.html">here</a>.
           It is expected that this Servlet will undergo some enhancement prior
           to be officially released in the Merlin distribution. This is to
           ensure maximum usability for our users.
@@ -228,4 +230,4 @@
       </subsection>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/product/framework/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/product/framework/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/product/framework/index.xml	Tue Jun 15 12:24:57 2004
@@ -1,4 +1,22 @@
 <?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.
+-->
+
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
@@ -23,59 +41,74 @@
           <td>
             <p>
               <a name="framework"/>
-              <a href="http://avalon.apache.org/framework/" name="framework">Avalon Framework API and Implementation</a>
+              <a href="../../../../products/runtime/system/framework/" 
+              name="framework">Avalon Framework API and Implementation</a>
             </p>
           </td>
           <td>
-            <p>The Avalon Framework API and Implementation consists of interfaces that define relationships between commonly used application components, best-of-practice pattern enforcements, and several lightweight convenience implementations of the generic components.</p>
+            <p>The Avalon Framework API and Implementation consists of 
+            interfaces that define relationships between commonly used 
+            application components, best-of-practice pattern enforcements, and 
+            several lightweight convenience implementations of the generic 
+            components.</p>
           </td>
         </tr>
         <tr>
           <td>
             <p>
               <a name="meta"/>
-              <a href="http://avalon.apache.org/meta/" name="meta">Avalon Meta</a>
+              <a href="../../../../products/runtime/system/meta/" name="meta">Avalon Meta</a>
             </p>
           </td>
           <td>
-            <p>The Avalon Meta Model defines the functional criteria for component types and services. A Type definition contains information about deployment and runtime dependencies together with information about the services that a component type can provide.</p>
+            <p>The Avalon Meta Model defines the functional criteria for 
+            component types and services. A Type definition contains 
+            information about deployment and runtime dependencies together 
+            with information about the services that a component type can 
+            provide.</p>
           </td>
         </tr>
         <tr>
           <td>
             <p>
               <a name="util"/>
-              <a href="http://avalon.apache.org/util/" name="util">Avalon Utilities</a>
+              <a href="../../../../products/runtime/system/util/" name="util">Avalon 
+              Utilities</a>
             </p>
           </td>
           <td>
-            <p>A set of utilities shared by framework components supporting default property
-            management, environment variable resolution, exceptio reporting and a 
-            parameterized map implementation (using within the repositroy package).</p>
+            <p>A set of utilities shared by framework components supporting 
+            default property management, environment variable resolution, 
+            exceptio reporting and a parameterized map implementation (using 
+            within the repositroy package).</p>
           </td>
         </tr>
         <tr>
           <td>
             <p>
               <a name="repository"/>
-              <a href="http://avalon.apache.org/repository/" 
+              <a href="../../../../products/runtime/system/repository/" 
                   name="repository">Avalon Repository</a>
             </p>
           </td>
           <td>
-            <p>A joint initative by the Avalon Project and the Apache Directory Project 
-             in the development of an inteligent bootstrappig, resource replication,
-             and artifact management framework.</p>
+            <p>
+              A joint initative by the Avalon Project and the Apache Directory 
+              Project in the development of an inteligent bootstrappig, resource
+              replication, and artifact management framework.
+            </p>
           </td>
         </tr>
         <tr>
           <td>
-          <a href="http://avalon.apache.org/logkit/index.html">Avalon Logkit</a></td>
+            <a href="../../../../products/runtime/system/logging/logkit/index.html">Avalon 
+            Logkit</a>
+          </td>
           <td>
             <p>
-	     Logkit is a complete logging framework (like log4j) as an
-	     Avalon component.  Most Avalon containers use it as the
-	     default logging implementation. 
+             Logkit is a complete logging framework (like log4j) as an
+             Avalon component.  Most Avalon containers use it as the
+             default logging implementation. 
             </p>
           </td>
         </tr>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/related/apache.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/related/apache.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/related/apache.xml	Tue Jun 15 12:24:57 2004
@@ -9,53 +9,90 @@
     <section name="Related Projects">
       <subsection name="Apache Projects">
         <table>
-	  <tr>
-	    <th width="200">Name</th>
-	    <th>Description</th>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://incubator.apache.org/projects/directory.html">Apache Directory Project</a></p></td>
-	    <td>
+          <tr>
+            <th width="200">Name</th>
+            <th>Description</th>
+          </tr>
+          <tr>
+            <td><p><a href="http://incubator.apache.org/projects/directory.html">Apache Directory Project</a></p></td>
+            <td>
             <p>
-The Apache Java LDAP Server (a.k.a. Eve, f.k.a. LDAPd) is the flagship server under the new Apache Directory Project.  Eve is a pure Java implementation of an LDAP version 3 server based on Avalon and SEDA.  Eve, as the first of its kind, will revolutionize the way directories are used by enabling server embedding and rich database constructs like stored procedures and triggers.  Eve leverages JNDI as the embedding API and allows the use of a server side JNDI LDAP provider to efficiently access server databases within stored procedures.
+The Apache Java LDAP Server (a.k.a. Eve, f.k.a. LDAPd) is the flagship server 
+under the new Apache Directory Project.  Eve is a pure Java implementation of 
+an LDAP version 3 server based on Avalon and SEDA.  Eve, as the first of its 
+kind, will revolutionize the way directories are used by enabling server 
+embedding and rich database constructs like stored procedures and triggers.  
+Eve leverages JNDI as the embedding API and allows the use of a server side 
+JNDI LDAP provider to efficiently access server databases within stored 
+procedures.
             </p>
             <p>
-Eve's simplicity and modularity, thanks primarily to Avalon design patterns, makes it an ideal protocol experimentation and extention framework.  Those forging the future of internet directory protocols on standards bodies like ldap-bis and others can use Eve to test and demonstrate the substance of new RFCs.  Eve's swapable protocol components and plugable backends puts the focus on the protocol rather than code management and porting.
+Eve's simplicity and modularity, thanks primarily to Avalon design patterns, 
+makes it an ideal protocol experimentation and extention framework.  Those 
+forging the future of internet directory protocols on standards bodies like 
+ldap-bis and others can use Eve to test and demonstrate the substance of new 
+RFCs.  Eve's swapable protocol components and plugable backends puts the focus 
+on the protocol rather than code management and porting.
             </p>
           </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://cocoon.apache.org/">Cocoon</a></p></td>
-	    <td><p>Apache Cocoon is a web development framework built around the concepts of separation of concerns and component-based web development.
-Cocoon implements these concepts around the notion of 'component pipelines', each component on the pipeline specializing on a particular operation. This makes it possible to use a Lego(tm)-like approach in building web solutions, hooking together components into pipelines without any required programming.
-Cocoon is "web glue for your web application development needs". It is a glue that keeps concerns separate and allows parallel evolution of all aspects of a web application, improving development pace and reducing the chance of conflicts.
-</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://incubator.apache.org/projects/ftpserver.html">FTP Server Project</a></p></td>
-	    <td><p>FtpServer is a server component for Avalon that allows remote FTP client to attach and download files. The client software can be any type of FTP client written in any language. The criteria for eligibility is RFC compliance. The server uses several components. Some of the components have multiple implementations. For example user management has implementations that will use LDAP, JDBC and Cornerstone's Store facility for storage. 
-The server has a management console (GUI) that can connect over RMI to the server. 
-</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a
+          </tr>
+          <tr>
+            <td><p><a href="http://cocoon.apache.org/">Cocoon</a></p></td>
+            <td><p>Apache Cocoon is a web development framework built around 
+            the concepts of separation of concerns and component-based web 
+            development.
+            Cocoon implements these concepts around the notion of 'component 
+            pipelines', each component on the pipeline specializing on a 
+            particular operation. This makes it possible to use a Lego(tm)-like 
+            approach in building web solutions, hooking together components 
+            into pipelines without any required programming.
+            Cocoon is "web glue for your web application development needs". It 
+            is a glue that keeps concerns separate and allows parallel evolution
+            of all aspects of a web application, improving development pace and 
+            reducing the chance of conflicts.
+            </p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://incubator.apache.org/projects/ftpserver.html">FTP Server Project</a></p></td>
+            <td><p>FtpServer is a server component for Avalon that allows remote 
+            FTP client to attach and download files. The client software can be 
+            any type of FTP client written in any language. The criteria for 
+            eligibility is RFC compliance. The server uses several components. 
+            Some of the components have multiple implementations. For example 
+            user management has implementations that will use LDAP, JDBC and 
+            Cornerstone's Store facility for storage. 
+            The server has a management console (GUI) that can connect over RMI 
+            to the server. 
+            </p></td>
+          </tr>
+          <tr>
+            <td><p><a
 href="http://jakarta.apache.org/turbine/fulcrum/">Fulcrum</a></p></td>
-	    <td><p>Fulcrum was originally created as part of the Turbine 3 effort.
+            <td><p>Fulcrum was originally created as part of the Turbine 3 effort.
 The idea was to be able to decouple the services from Turbine 2 allowing
 them to be used on both projects. Fulcrum is currently evolving into a
 generic component repository useful in building web applications. Each
 service is been converted into a stand alone component that can be released
 independently of the other components.
  </p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://james.apache.org">James</a></p></td>
-	    <td>
-<p>The Java Apache Mail Enterprise Server (a.k.a. Apache James) is a 100% pure Java SMTP and POP3 Mail server and NNTP News server.  James was designed to be a complete and portable enterprise mail engine solution based on currently available open protocols. </p>
-<p>James is also a <i>mail application platform</i>.  The James team have developed a Java API to let you write Java code to process emails that we call the mailet API.  A <i>mailet</i> can generate an automatic reply, update a database, prevent spam, build a message archive, or whatever you can imagine.  A <i>matcher</i> determines whether your mailet should process an email in the server.  The James project hosts the Mailet API, and James provides an implementation of this mail application platform API.</p>
+          </tr>
+          <tr>
+            <td><p><a href="http://james.apache.org">James</a></p></td>
+            <td>
+<p>The Java Apache Mail Enterprise Server (a.k.a. Apache James) is a 100% pure 
+Java SMTP and POP3 Mail server and NNTP News server.  James was designed to be 
+a complete and portable enterprise mail engine solution based on currently 
+available open protocols. </p>
+<p>James is also a <i>mail application platform</i>.  The James team have 
+developed a Java API to let you write Java code to process emails that we 
+call the mailet API.  A <i>mailet</i> can generate an automatic reply, update a 
+database, prevent spam, build a message archive, or whatever you can imagine.  
+A <i>matcher</i> determines whether your mailet should process an email in the 
+server.  The James project hosts the Mailet API, and James provides an 
+implementation of this mail application platform API.</p>
           </td>
-	  </tr>
-	</table>
+          </tr>
+        </table>
       </subsection>
     </section>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/central/legacy/related/external.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/legacy/related/external.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/legacy/related/external.xml	Tue Jun 15 12:24:57 2004
@@ -9,88 +9,88 @@
     <section name="External Projects">
       <subsection name="Avalon Compatible Projects">
         <table>
-	  <tr>
-	    <th width="150">Name</th>
-	    <th>Description</th>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://plexus.codehaus.org/">Plexus</a></p></td>
-	    <td><p>An Avalon container developed externally at Codehaus</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://keelframework.org/">Keel Framework</a></p></td>
-	    <td><p>
+          <tr>
+            <th width="150">Name</th>
+            <th>Description</th>
+          </tr>
+          <tr>
+            <td><p><a href="http://plexus.codehaus.org/">Plexus</a></p></td>
+            <td><p>An Avalon container developed externally at Codehaus</p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://keelframework.org/">Keel Framework</a></p></td>
+            <td><p>
              Keel is ready made server side infrastructure Keel incorporates 
              multiple open source projects to provide you with a best of breed 
              framework that works right out of the box.</p>
             </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://jingdao.sourceforge.net">Jing DAO</a></p></td>
-	    <td><p>Jing is a Data Access Object (DAO) framework that supports 
-	        Avalon components and works within Avalon containers.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://open-im.net/">OpenIM Instant Messaging</a></p></td>
-	    <td>
+          </tr>
+          <tr>
+            <td><p><a href="http://jingdao.sourceforge.net">Jing DAO</a></p></td>
+            <td><p>Jing is a Data Access Object (DAO) framework that supports 
+                Avalon components and works within Avalon containers.</p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://open-im.net/">OpenIM Instant Messaging</a></p></td>
+            <td>
             <p>The purpose of the OpenIM project is to produce a
             fast, simple, and highly efficient instant messager server
             with high modularisation and a codebase that uses the
             Avalon tools and <a
-            href="http://avalon.apache.org/merlin">Merlin
+            href="../../../products/runtime/index.html">Merlin
             Container</a> created by Apache's Avalon project.</p>
           </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://jcrontab.sourceforge.net">Jcrontab</a></p></td>
-	    <td>
+          </tr>
+          <tr>
+            <td><p><a href="http://jcrontab.sourceforge.net">Jcrontab</a></p></td>
+            <td>
             <p>JCrontab provides a simple Java implementation of the 
               Unix cron service. An Avalon interface is provided.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a
+          </tr>
+          <tr>
+            <td><p><a
 href="http://cvs.sourceforge.net/viewcvs.py/hibernate/HibernateExt/avalon/">
 Hibernate Wrapper</a></p></td>
-	    <td>
+            <td>
             <p>Hibernate is a topnotch ORM tool.  An Avalon wrapper has 
              been written to faciliate using Hibernate in an Avalon 
              Environment.</p>
           </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://xingu.sourceforge.net/">Xingu Components</a></p></td>
-	    <td><p>
+          </tr>
+          <tr>
+            <td><p><a href="http://xingu.sourceforge.net/">Xingu Components</a></p></td>
+            <td><p>
             A collection of Avalon components including OJB and Hibernate
             support, a business object API, ACL component, Messenging 
             component and more!</p>
           </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://phoenixjms.sourceforge.net/">PhoenixJMS</a></p></td>
-	    <td><p>An Avalon component wrapper for OpenJMS</p></td>
-	  </tr>
+          </tr>
+          <tr>
+            <td><p><a href="http://phoenixjms.sourceforge.net/">PhoenixJMS</a></p></td>
+            <td><p>An Avalon component wrapper for OpenJMS</p></td>
+          </tr>
         <!--
-	  <tr>
-	    <td><p><a href="http://www.enterpriseobjectbroker.org/">
+          <tr>
+            <td><p><a href="http://www.enterpriseobjectbroker.org/">
               Enterprise Object Broker</a></p></td>
-	    <td><p>a "post-J2EE" application server.</p></td>
-	  </tr>
+            <td><p>a "post-J2EE" application server.</p></td>
+          </tr>
         -->
-	  <tr>
-	    <td><p><a href="http://telnetd.sourceforge.net/">Telnetd</a></p></td>
-	    <td><p>Java telnet implementation</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://spice.codehaus.org">Spice</a></p></td>
-	    <td><p>Spice is a repository of Components which support
+          <tr>
+            <td><p><a href="http://telnetd.sourceforge.net/">Telnetd</a></p></td>
+            <td><p>Java telnet implementation</p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://spice.codehaus.org">Spice</a></p></td>
+            <td><p>Spice is a repository of Components which support
              Component Oriented Programming (COP) paradigms - in
              particular, the Inversion of Control (IoC) design
              pattern.</p>
             </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://ivory.codehaus.org/">Ivory</a></p></td>
-	    <td><p> Ivory provides easy integration between your
+          </tr>
+          <tr>
+            <td><p><a href="http://ivory.codehaus.org/">Ivory</a></p></td>
+            <td><p> Ivory provides easy integration between your
              exiting java classes, Avalon services, and Axis. It
              allows easy deployment of soap services with none of the
              WSDD configuration that Axis normally mandates. Simply
@@ -98,52 +98,52 @@
              RPC SOAP service. However, it also allows Avalon services
              to be used with the standard WSDD configuration easily.</p>
             </td>
-	  </tr>
-	</table>
+          </tr>
+        </table>
       </subsection>
       <subsection name="Alternative Frameworks">
         <table>
            <tr>
-	     <th width="150">Name</th>
-	     <th>Description</th>
-	   </tr>
-	   <tr>
-	    <td><p><a href="http://docs.codehaus.org/display/PICO">Picocontainer</a></p></td>
-	    <td><p>Picocontainer is a light weight IoC framework.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://www.opensymphony.com:8668/space/WebWork2">WebWork 2</a></p></td>
-	    <td><p>an MVC web framework</p></td>
-	  </tr>
-	  <tr>
-	    <td><p>
+             <th width="150">Name</th>
+             <th>Description</th>
+           </tr>
+           <tr>
+            <td><p><a href="http://docs.codehaus.org/display/PICO">Picocontainer</a></p></td>
+            <td><p>Picocontainer is a light weight IoC framework.</p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://www.opensymphony.com:8668/space/WebWork2">WebWork 2</a></p></td>
+            <td><p>an MVC web framework</p></td>
+          </tr>
+          <tr>
+            <td><p>
             <a href="http://www.jboss.org/index.html?module=html&amp;op=userdisplay&amp;id=developers/projects/jboss/aop">
              JBoss AOP</a></p></td>
-	    <td><p>The JBoss Aspect Oriented Programming (AOP) framework</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://www.springframework.org/">Spring Framework</a></p></td>
-	    <td><p>A J2EE Application Framework</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://jakarta.apache.org/commons/sandbox/hivemind/">Hivemind</a></p></td>
-	    <td><p>HiveMind is a services and configuration microkernel. 
+            <td><p>The JBoss Aspect Oriented Programming (AOP) framework</p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://www.springframework.org/">Spring Framework</a></p></td>
+            <td><p>A J2EE Application Framework</p></td>
+          </tr>
+          <tr>
+            <td><p><a href="http://jakarta.apache.org/commons/sandbox/hivemind/">Hivemind</a></p></td>
+            <td><p>HiveMind is a services and configuration microkernel. 
                 HiveMind allows you to create your application using a service 
                 oriented architecture.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://fractal.objectweb.org/">ObjectWeb Fractal</a></p></td>
-	    <td><p>
-	    Fractal is a modular and extensible component model that
+          </tr>
+          <tr>
+            <td><p><a href="http://fractal.objectweb.org/">ObjectWeb Fractal</a></p></td>
+            <td><p>
+            Fractal is a modular and extensible component model that
              can be used with various programming languages to design,
              implement, deploy and reconfigure various systems and
              applications, from operating systems to middleware
              platforms and to graphical user interfaces. </p>
             </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://lsd.student.utwente.nl/jicarilla">Jicarilla</a></p></td>
-	    <td><p>
+          </tr>
+          <tr>
+            <td><p><a href="http://lsd.student.utwente.nl/jicarilla">Jicarilla</a></p></td>
+            <td><p>
               The Jicarilla-Framework builds upon Type-3 IoC, adding
              an Active interface to better support multi-threaded
              components. Besides some pretty generic utility code
@@ -152,8 +152,8 @@
              lightweight event-based systems, like sources, sinks,
              stages, multicasters, etc.</p>
             </td>
-	  </tr>
-	</table>
+          </tr>
+        </table>
       </subsection>
     </section>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/central/overview.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/overview.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/overview.xml	Tue Jun 15 12:24:57 2004
@@ -125,7 +125,7 @@
        programming, then in addition to the <a
        href="doc/index.html">Articles</a> section, look at the
        Framework documentation.  The <a
-       href="http://avalon.apache.org/framework/index.html">Framework</a> 
+       href="../products/runtime/framework/index.html">Framework</a> 
        project contains
        sections of COP practices and is itself a good COP reference
        implementation.
@@ -134,8 +134,8 @@
       <subsection name="General Resources">
        <p>
        Don't forget to wade through the wealth of material on our <a
-       href="http://nagoya.apache.org/wiki/apachewiki.cgi?AvalonProjectPages">
-       Wiki</a> site.  The <a href="mailing-lists.html">mailing
+       href="http://wiki.apache.org/avalon">
+       Wiki</a> site.  The <a href="about/resources/mailing-lists.html">mailing
        lists</a> are also an excellent resource for support and more
        information.
        </p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -23,10 +23,10 @@
 
   <body>
     <menu>
-      <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"/>
+      <item name="CLI Handler" href="cli.html"/>
+      <item name="Generic Embedded" href="generic.html"/>
+      <item name="Embedded in Servlet" href="servlet.html"/>
+      <item name="Unit Testing" href="unit.html"/>
     </menu>
  </body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/navigation.xml	Tue Jun 15 12:24:57 2004
@@ -23,9 +23,9 @@
 
  <body>
     <menu>
-      <item name="Embedding" href="embedded/index.html"/>
-      <item name="Specification" 
-        href="reference/index.html"/>
+      <item name="Execution" href="execmodes/index.html"/>
+      <item name="Specification" 
+        href="reference/index.html"/>
       <item name="Systems" href="system/index.html"/>
     </menu>
  </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/context.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/context.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/context.xml	Tue Jun 15 12:24:57 2004
@@ -31,11 +31,17 @@
       <subsection name="Overview">
 
         <p>
-A component may be supplied with a context object either by constructor or through an implementation of the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/context/Contextualizable.html">Contextualizable</a> lifecycle artifact delivery interface.  A context object is typically used to provide standard environment information to a component.  It may also be used a mechanisms to deliver domain specific resources to a component.
+A component may be supplied with a context object either by constructor or 
+through an implementation of the 
+<a href="/api/org/apache/avalon/framework/context/Contextualizable.html">Contextualizable</a> 
+lifecycle artifact delivery interface.  A context object is typically used to 
+provide standard environment information to a component.  It may also be used a 
+mechanisms to deliver domain specific resources to a component.
         </p>
 
         <p>
-The avalon platform defines a small number of standard context entries that are managed automatically by the container.
+The avalon platform defines a small number of standard context entries that are 
+managed automatically by the container.
         </p>
 
       </subsection>
@@ -70,7 +76,10 @@
       <subsection name="Standard Context Example">
 
         <p>
-Both standard and custom context entry dependencies may be declared using the <a href="http://avalon.apache.org/meta/tools/tags/entry.html">@avalon.entry</a> source markup tag.  The following code fragment is an example of a constructor declaring a set of standard context entry dependencies.
+Both standard and custom context entry dependencies may be declared using the 
+<a href="../../../system/meta/tags/entry.html">@avalon.entry</a> 
+source markup tag.  The following code fragment is an example of a constructor 
+declaring a set of standard context entry dependencies.
         </p>
 <source>
    /**
@@ -119,7 +128,7 @@
         <p>
         The dependency of a component on a custom context type is 
         declared using the 
-        <a href="http://avalon.apache.org/meta/tools/tags/context.html">
+        <a href="../../../system/meta/tags/context.html">
         @avalon.context</a> tag type attribute.
         </p>
 <source>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/index.xml	Tue Jun 15 12:24:57 2004
@@ -31,12 +31,21 @@
       <subsection name="Overview">
 
       <p>
-Component-based solutions leverage the principals of Inversersion of Control (IoC). This principal leads to the notion that a component should be supplied with the resources it needs in order to function.  Another way of looking at this is that the component code should not be cluttered with content that is attempting to resolve resources relative to its environment. Through the application of a meta-info model a container has available to it a complete description of the component type and from this information can build the necessary resources that a component needs. These resources are supplied to a component through a set of standard Avalon lifecycle artificats.  These include 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/Logger.html">Logger</a>, 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/context/Context.html">Context</a>, 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/configuration/Configuration.html">Configuration</a>, 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/parameters/Parameters.html">Parameters</a>, and 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/service/ServiceManager.html">ServiceManager</a>.
+Component-based solutions leverage the principals of Inversersion of Control 
+(IoC). This principal leads to the notion that a component should be supplied 
+with the resources it needs in order to function.  Another way of looking at 
+this is that the component code should not be cluttered with content that is 
+attempting to resolve resources relative to its environment. Through the 
+application of a meta-info model a container has available to it a complete 
+description of the component type and from this information can build the 
+necessary resources that a component needs. These resources are supplied to 
+a component through a set of standard Avalon lifecycle artificats.  These 
+include 
+<a href="/api/org/apache/avalon/framework/logger/Logger.html">Logger</a>, 
+<a href="/api/org/apache/avalon/framework/context/Context.html">Context</a>, 
+<a href="/api/org/apache/avalon/framework/configuration/Configuration.html">Configuration</a>, 
+<a href="/api/org/apache/avalon/framework/parameters/Parameters.html">Parameters</a>, and 
+<a href="/api/org/apache/avalon/framework/service/ServiceManager.html">ServiceManager</a>.
       </p>
 
       <p>
@@ -57,7 +66,15 @@
           <tr>
             <td>phased</td>
             <td>
-The phased artifact delivery strategy is based on a set of delivery interfaces (<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/LogEnabled.html">LogEnabled</a>, <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/context/Contextualizable.html">Contextualizable</a>, <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/configuration/Configurable.html">Configurable</a>, <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/parameters/Parameterizable.html">Parameterizable</a> and <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/service/Serviceable.html">Serviceable</a>).  The advantage of phased delivery over the injection strategy relates to artifact re-assignment by a component management subsystem. Phased artifact delivery is the traditional approach used be earlier Avalon solutions.
+The phased artifact delivery strategy is based on a set of delivery interfaces 
+(<a href="/api/org/apache/avalon/framework/logger/LogEnabled.html">LogEnabled</a>, 
+<a href="/api/org/apache/avalon/framework/context/Contextualizable.html">Contextualizable</a>, 
+<a href="/api/org/apache/avalon/framework/configuration/Configurable.html">Configurable</a>, 
+<a href="/api/org/apache/avalon/framework/parameters/Parameterizable.html">Parameterizable</a> and 
+<a href="/api/org/apache/avalon/framework/service/Serviceable.html">Serviceable</a>).  
+The advantage of phased delivery over the injection strategy relates to artifact
+re-assignment by a component management subsystem. Phased artifact delivery is 
+the traditional approach used in earlier Avalon solutions.
             </td>
           </tr>
         </table>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/logger.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/logger.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/logger.xml	Tue Jun 15 12:24:57 2004
@@ -31,19 +31,31 @@
       <subsection name="Overview">
 
         <p>
-The <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/Logger.html">Logger</a> defines a implementation independent logging channel.  The logging channel supplied to a component represents the root loggging channel for the component.  A component may aquire additional subsidiary channels using the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/Logger.html#getChildLogger(java.lang.String)">getChildLogger()</a> operation.  The Logger interface exposes a set of operations to check if a particular logging priority is enabled, thus enabling optimization of typically expensive string manipulation operations related to log message construction. 
+The <a href="/api/org/apache/avalon/framework/logger/Logger.html">Logger</a> 
+defines a implementation independent logging channel.  The logging channel 
+supplied to a component represents the root loggging channel for the component. 
+A component may aquire additional subsidiary channels using the 
+<a href="/api/org/apache/avalon/framework/logger/Logger.html#getChildLogger(java.lang.String)">getChildLogger()</a> 
+operation.  The Logger interface exposes a set of operations to check if a 
+particular logging priority is enabled, thus enabling optimization of typically 
+expensive string manipulation operations related to log message construction. 
         </p>
       </subsection>
 
       <subsection name="Delivery Strategies">
         <p>
-A logging channel may be supplied via constructor or under an implementation of the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/LogEnabled.html">LogEnabled</a> lifecycle stage interface.
+A logging channel may be supplied via constructor or under an implementation of 
+the <a href="/api/org/apache/avalon/framework/logger/LogEnabled.html">LogEnabled</a> 
+lifecycle stage interface.
         </p>
       </subsection>
 
       <subsection name="Example">
         <p>
-An implementation may declare is usage of subsidiary logging channels to a management facility through the <a href="http://avalon.apache.org/meta/tools/tags/logger.html">@avalon.logger</a> source markup tag.
+An implementation may declare is usage of subsidiary logging channels to a 
+management facility through the 
+<a href="../../../system/meta/tags/logger.html">@avalon.logger</a> source 
+markup tag.
         </p>
 <p><i>Example:</i></p>
 <source>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/manager.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/manager.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/artifacts/manager.xml	Tue Jun 15 12:24:57 2004
@@ -30,9 +30,19 @@
 
       <subsection name="Overview">
         <p>
-A <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/service/ServiceManager.html"> ServiceManager </a> is used as a mechanisms to provide dependent services to a component.  A component implementation declares dependencies using the <a href="http://avalon.apache.org/meta/tools/tags/dependency.html">@avalon.dependency</a> tag.  Dependencies may be declared relative to the component constructor or through the optional <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/service/Serviceable.html">Serviceable</a> delivery interface.
+A <a href="/api/org/apache/avalon/framework/service/ServiceManager.html">ServiceManager</a> 
+is used as a mechanisms to provide dependent services to a component.  A 
+component implementation declares dependencies using the 
+<a href="../../../system/meta/tags/dependency.html">@avalon.dependency</a> tag.
+Dependencies may be declared relative to the component constructor or through 
+the optional 
+<a href="/api/org/apache/avalon/framework/service/Serviceable.html">Serviceable</a> 
+delivery interface.
+        </p>
+        <p>
+          <i>Example of a constructor based declaration of service 
+          dependencies.</i>
         </p>
-        <p><i>Example of a constructor based declaration of service dependencies.</i></p>
 <source>
    /**
     * Creation of a new instance.  The component receives

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/descriptors/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/descriptors/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/descriptors/index.xml	Tue Jun 15 12:24:57 2004
@@ -28,10 +28,22 @@
 
     <section name="Component Descriptors">
       <p>
-Within the COP (Component Oriented Programming) domain there is a principal that the component is supplied with the resources its needs in order to function properly.  The direct implication of this principal is that a component should declare exactly what it needs.  When we consider a portable and reusable component we need to think its deployment dependecies, structural dependencies, context assumptions, configuration and parameterization criteria, throught to minor details such the logging channels that the component implementation assumes.
+Within the COP (Component Oriented Programming) domain there is a principal
+that the component is supplied with the resources its needs in order to 
+function properly.  The direct implication of this principal is that a 
+component should declare exactly what it needs.  When we consider a 
+portable and reusable component we need to think its deployment 
+dependecies, structural dependencies, context assumptions, configuration 
+and parameterization criteria, throught to minor details such the logging 
+channels that the component implementation assumes.
       </p>
       <p>
-This information is captured in a object called a Type.  An instance of Type describes the component and can be used by a container without necessarily loading the component class.  Instance of Type are created from an XML external form.  The XML descriptor can be created manually or more typically through development tools that automate the creation process based on javadoc tags included in the source code.
+This information is captured in a object called a Type.  An instance of Type 
+describes the component and can be used by a container without necessarily 
+loading the component class.  Instance of Type are created from an XML 
+external form.  The XML descriptor can be created manually or more typically 
+through development tools that automate the creation process based on javadoc 
+tags included in the source code.
       </p>
     </section>
 
@@ -39,10 +51,16 @@
 
       <subsection name="Javadoc Tag Markup">
         <p>
-Information about a component type may be declared in the form of javadoc tags (refer <a href="http://avalon.apache.org/meta/tools/tags/index.html">Tag Specification</a>.  Using <a href="http://avalon.apache.org/meta/tools/index.html">development tools</a> supplied as part of the <a href="http://avalon.apache.org/meta/index.html">Avalon Meta</a> package - the process of generation of an XML type descriptor can be completely automated.  
+Information about a component type may be declared in the form of javadoc tags
+(refer <a href="../../../system/meta/tags/index.html">Tag Specification</a>.  
+Using <a href="../../../tools/index.html">development 
+tools</a> supplied as part of the 
+<a href="../../../system/meta/index.html">Avalon Meta</a> package - 
+the process of generation of an XML type descriptor can be completely automated.  
         </p>
         <p>
-A special tag @avalon.component is used to identify a class as a component.  The following code framgment illustrates the use of the @avalon.component tag.
+A special tag @avalon.component is used to identify a class as a component.  The
+following code framgment illustrates the use of the @avalon.component tag.
         </p>
 <source>
 /**
@@ -98,15 +116,23 @@
       <subsection name="XML External Form">
 
         <p>
-A component type may be associated with a component class by colocating an XML file with the suffix "xinfo" with the component implementation class.  For example, the class tutorial.Hello is packaged in a jar file under the path /tutorial/Hello.class.  The xinfo file is packaged as /tutorial/Hello.xinfo.
+A component type may be associated with a component class by colocating an 
+XML file with the suffix "xinfo" with the component implementation class.  
+For example, the class tutorial.Hello is packaged in a jar file under the 
+path /tutorial/Hello.class.  The xinfo file is packaged as 
+/tutorial/Hello.xinfo.
         </p>
 
         <p>
-The formal specification of the <a href="http://avalon.apache.org/meta/meta/info/index.html">XML external form</a> for component type descriptors is available as part of the <a href="http://avalon.apache.org/meta/index.html">Avalon Meta Package</a>.
+The formal specification of the 
+<a href="../../../system/meta/info/index.html">XML external 
+form</a> for component type descriptors is available as part of the 
+<a href="../../../systen/meta/index.html">Avalon Meta Package</a>.
         </p>
 
         <p>
-An example of a xinfo XML content taken from the context casting tutorial is presented below.
+An example of a xinfo XML content taken from the context casting tutorial is 
+presented below.
         </p>
 
 <source><![CDATA[
@@ -131,7 +157,16 @@
       <subsection name="Type Model">
 
         <p>
-The Avalon Meta package provides the overal meta-info layer within which a component type descriptor is defined.  The descriptor is an immutable data object that contains a component classname, attributes, context dependencies, deployment dependencies, runtime service dependencies, service and extension publication, and associating logging channel assumptions. The full specification of the <a href="http://avalon.apache.org/meta/api/org/apache/avalon/meta/info/Type.html">Type</a> class is provided in the package javadoc.  Type establishment is typically automated by the container by scanner jar file for xinfo descriptors (or possibly through dynamic type creation).
+The Avalon Meta package provides the overal meta-info layer within which a 
+component type descriptor is defined.  The descriptor is an immutable data 
+object that contains a component classname, attributes, context dependencies, 
+deployment dependencies, runtime service dependencies, service and extension 
+publication, and associating logging channel assumptions. The full specification
+of the 
+<a href="/api/org/apache/avalon/meta/info/Type.html">Type</a>
+class is provided in the package javadoc.  Type establishment is typically 
+automated by the container by scanner jar file for xinfo descriptors (or 
+possibly through dynamic type creation).
         </p>
 
       </subsection>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/etherialization.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/etherialization.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/etherialization.xml	Tue Jun 15 12:24:57 2004
@@ -39,7 +39,7 @@
             <td><p>execution</p></td>
             <td>
 <p>
-A component implementing the the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Startable.html">Startable</a> lifecycle interface will be shutdown by the container. 
+A component implementing the the <a href="/api/org/apache/avalon/framework/activity/Startable.html">Startable</a> lifecycle interface will be shutdown by the container. 
 </p>
 <p><i>Startable Example:</i></p>
 
@@ -59,7 +59,7 @@
             <td>
 <p>
 A component may participate in end-of-life processing by implementing the 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Disposable.html">Disposable</a> lifecycle interface. An implementation will typically released references during this stage.
+<a href="/api/org/apache/avalon/framework/activity/Disposable.html">Disposable</a> lifecycle interface. An implementation will typically released references during this stage.
 </p>
 <p><i>Example:</i></p>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/incarnation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/incarnation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/incarnation.xml	Tue Jun 15 12:24:57 2004
@@ -40,11 +40,11 @@
             <td>
 <p>
 A component may declare either a null constructor, or, a single constructor with any lifecycle artifact as a parameter argument where arguments may be in any combination or order. Recognized lifecycle artificats include 
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/Logger.html">Logger</a>,                
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/context/Context.html">Context</a>,                
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/parameters/Parameters.html">Parameters</a>,                
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/service/ServiceManager.html">ServiceManager</a>, and/or            
-<a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/configuration/Configuration.html">Configuration</a>. In addition, the Context object may be substituted with a custom context interface and implementation.
+<a href="/api/org/apache/avalon/framework/logger/Logger.html">Logger</a>,                
+<a href="/api/org/apache/avalon/framework/context/Context.html">Context</a>,                
+<a href="/api/org/apache/avalon/framework/parameters/Parameters.html">Parameters</a>,                
+<a href="/api/org/apache/avalon/framework/service/ServiceManager.html">ServiceManager</a>, and/or            
+<a href="/api/org/apache/avalon/framework/configuration/Configuration.html">Configuration</a>. In addition, the Context object may be substituted with a custom context interface and implementation.
 </p>
 <p>
 NOTE: A component implementation may not duplicate constructor injection of lifecycle artifacts with the equivalent lifecycle stage.
@@ -76,7 +76,7 @@
           <tr>
             <td><a name="logging"/><p>logging</p></td>
             <td>
-<p>Optional Logger delivery strategy.  A component implementation may implement the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/LogEnabled.html">LogEnabled</a> interface.  The container will supply the component root logger via the enableLogging operation.</p>
+<p>Optional Logger delivery strategy.  A component implementation may implement the <a href="/api/org/apache/avalon/framework/logger/LogEnabled.html">LogEnabled</a> interface.  The container will supply the component root logger via the enableLogging operation.</p>
 <p><i>Example:</i></p>
 <source>
     /**
@@ -95,7 +95,7 @@
           <tr>
             <td><a name="contextualization"/><p>contextualization</p></td>
             <td>
-<p>Optional context delivery strategy.  A component implementation may implement the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/context/Contextualizable.html">Contextualizable</a> interface.  The container will supply a component context via the contextualize operation.  The context instance will be pre-populated by the container will all requested entries.</p>
+<p>Optional context delivery strategy.  A component implementation may implement the <a href="/api/org/apache/avalon/framework/context/Contextualizable.html">Contextualizable</a> interface.  The container will supply a component context via the contextualize operation.  The context instance will be pre-populated by the container will all requested entries.</p>
 <p><i>Example:</i></p>
 <source>
     /**
@@ -117,7 +117,7 @@
           <tr>
             <td><a name="service"/><p>service</p></td>
             <td>
-<p>Optional service manager delivery strategy.  A component implementation may implement the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/service/Serviceable.html">Serviceable</a> interface.  The container will supply a service manager supporting all declared service dependencies.</p>
+<p>Optional service manager delivery strategy.  A component implementation may implement the <a href="/api/org/apache/avalon/framework/service/Serviceable.html">Serviceable</a> interface.  The container will supply a service manager supporting all declared service dependencies.</p>
 <p><i>Example:</i></p>
 <source>
     /**
@@ -143,7 +143,7 @@
           <tr>
             <td><a name="configuration"/><p>configuration</p></td>
             <td>
-<p>Optional configuration delivery strategy.  A component implementation may implement the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/configuration/Configurable.html">Configurable</a> interface.  The container will supply a component configuration via the configure operation.</p>
+<p>Optional configuration delivery strategy.  A component implementation may implement the <a href="/api/org/apache/avalon/framework/configuration/Configurable.html">Configurable</a> interface.  The container will supply a component configuration via the configure operation.</p>
 <p><i>Example:</i></p>
 <source>
     /**
@@ -165,7 +165,7 @@
           <tr>
             <td><a name="parameterization"/><p>parameterization</p></td>
             <td>
-<p>Optional parameters delivery strategy.  A component may implement the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/parameters/Parameterizable.html">Parameterizable</a> interface.  The container will supply a parameters instance via the parameterize operation.</p>
+<p>Optional parameters delivery strategy.  A component may implement the <a href="/api/org/apache/avalon/framework/parameters/Parameterizable.html">Parameterizable</a> interface.  The container will supply a parameters instance via the parameterize operation.</p>
 <p><i>Example:</i></p>
 <source>
     /**
@@ -216,7 +216,7 @@
           <tr>
             <td><a name="initialization"/><p>initialization</p></td>
             <td>
-<p>Optional initialization stage.  A component may implement the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Initializable.html">Initializable</a> interface.  The container will invoke initialization following completion of the delivery of lifecycle artifacts and any custom lifecycle stages.</p>
+<p>Optional initialization stage.  A component may implement the <a href="/api/org/apache/avalon/framework/activity/Initializable.html">Initializable</a> interface.  The container will invoke initialization following completion of the delivery of lifecycle artifacts and any custom lifecycle stages.</p>
 <p><i>Example:</i></p>
 <source>
     /**
@@ -235,7 +235,7 @@
           <tr>
             <td><a name="execution"/><p>execution</p></td>
             <td>
-<p>Optional execution stage.  A component may implement either the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Startable.html">Startable</a> or <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Executable.html">Executable</a> interfaces.  If the component implements Executable the execute method will be invoked before the component instance is exposed to any other component.  If the component implements the Startable interface the container will invoke the start operation.  An implementation is responsible for establishing a working thread and returned from the start operation promptly.</p>
+<p>Optional execution stage.  A component may implement either the <a href="/api/org/apache/avalon/framework/activity/Startable.html">Startable</a> or <a href="/api/org/apache/avalon/framework/activity/Executable.html">Executable</a> interfaces.  If the component implements Executable the execute method will be invoked before the component instance is exposed to any other component.  If the component implements the Startable interface the container will invoke the start operation.  An implementation is responsible for establishing a working thread and returned from the start operation promptly.</p>
 <p><i>Executable Example:</i></p>
 <source>
     /**

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/runtime.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/runtime.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/component/lifecycle/runtime.xml	Tue Jun 15 12:24:57 2004
@@ -39,7 +39,11 @@
             <td><p>suspension</p></td>
             <td>
 <p>
-A component implementing the the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Suspendable.html">Suspendable</a> lifecycle may be suspended by a container management system. Following suspension a container may re-apply lifecycle artifact delivery stages (logging, contextualization, service, parameterization). 
+A component implementing the
+<a href="/api/org/apache/avalon/framework/activity/Suspendable.html">Suspendable</a>
+lifecycle may be suspended by a container management system. Following 
+suspension a container may re-apply lifecycle artifact delivery stages 
+(logging, contextualization, service, parameterization). 
 </p>
 <p><i>Suspendable Example:</i></p>
 <source>
@@ -57,7 +61,10 @@
             <td><p>resumption</p></td>
             <td>
 <p>
-A component implementing the the <a href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/activity/Suspendable.html">Suspendable</a> lifecycle may be placed back into operation following suspension by a container management system.
+A component implementing the 
+<a href="/api/org/apache/avalon/framework/activity/Suspendable.html">Suspendable</a>
+lifecycle may be placed back into operation following suspension by a container
+management system.
 </p>
 <p><i>Suspendable Example:</i></p>
 <source>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/logging/logkit/impl/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/logging/logkit/impl/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/logging/logkit/impl/index.xml	Tue Jun 15 12:24:57 2004
@@ -26,7 +26,7 @@
         in applications. To get started using LogKit, it is recomended that you read the
         <a href="whitepaper.html">whitepaper</a>
         and browse the
-        <a href="http://avalon.apache.org/logkit/api/index.html">API docs</a>.
+        <a href="../../../../../../api/org/apache/log/package.html">API docs</a>.
       </p>
     </section>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/example/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/example/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/example/index.xml	Tue Jun 15 12:24:57 2004
@@ -29,7 +29,7 @@
       <section name="Avalon Repository - Example">
 
          <p>The following example is taken from the the 
-         <a href="http://avalon.apache.org/merlin">Merlin</a> project. 
+         <a href="../../../about/index.html">Merlin</a> project. 
          It demonstrates the creation of an embedded logging service using
          the Repository Facility builder, factory and criteria handling 
          patterns.</p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/tools/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/tools/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/tools/index.xml	Tue Jun 15 12:24:57 2004
@@ -23,7 +23,7 @@
 
     <properties>
         <author email="mcconnell@apache.org">Stephen McConnell</author>
-        <title>Merlin Runtime</title>
+        <title>Merlin Runtime</title>
     </properties>
 
     <body>
@@ -36,7 +36,7 @@
           that are used by the repository package
           to construct classloaders on demand.  
           </p>
-          <p><a href="http://avalon.apache.org/util/plugin/index.html">
+          <p><a href="../../util/plugin/index.html">
            Avalon Util Plugin</a></p>
 
         </section>

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org