mcconnell 2003/09/25 16:58:52
Modified: src/documentation/content/xdocs index.xml site.xml
src/documentation/content/xdocs/containers index.xml
src/documentation/content/xdocs/developing compatiblity.xml
Log:
Update framework related links.
Revision Changes Path
1.8 +1 -1 avalon-site/src/documentation/content/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-site/src/documentation/content/xdocs/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.xml 15 Aug 2003 16:28:49 -0000 1.7
+++ index.xml 25 Sep 2003 23:58:51 -0000 1.8
@@ -23,7 +23,7 @@
<p>
Having said that, what Avalon 'is', is a framework that allows components of
varying
scale to be created, managed via a specific set of
- <link
href="http://avalon.apache.org/framework/reference-the-lifecycle.html";>lifecycle</link>
methods,
+ <link
href="http://avalon.apache.org/framework/principals/lifecycle.html";>lifecycle</link>
methods,
and used in an application. While Avalon is geared towards server-side
applications,
it is not limited to such, and is quite flexible.
</p>
1.8 +1 -1 avalon-site/src/documentation/content/xdocs/site.xml
Index: site.xml
===================================================================
RCS file: /home/cvs/avalon-site/src/documentation/content/xdocs/site.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- site.xml 15 Jun 2003 14:12:33 -0000 1.7
+++ site.xml 25 Sep 2003 23:58:51 -0000 1.8
@@ -24,7 +24,7 @@
<ecm label="ECM" href="http://avalon.apache.org/excalibur/component/"/>
<fortress label="Fortress"
href="http://avalon.apache.org/excalibur/fortress/"/>
<phoenix label="Phoenix" href="http://avalon.apache.org/phoenix/"/>
- <merlin label="Merlin" href="http://avalon.apache.org/sandbox/merlin/"/>
+ <merlin label="Merlin" href="http://avalon.apache.org/merlin/"/>
</containers>
<apps label="Apps" href="http://avalon.apache.org/apps/index.html"/>
<sandbox label="Sandbox" href="http://avalon.apache.org/sandbox/"/>
1.6 +1 -1 avalon-site/src/documentation/content/xdocs/containers/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-site/src/documentation/content/xdocs/containers/index.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.xml 16 Jun 2003 10:20:06 -0000 1.5
+++ index.xml 25 Sep 2003 23:58:52 -0000 1.6
@@ -43,7 +43,7 @@
<section>
<title>Merlin</title>
<p>
-The <link href="http://avalon.apache.org/sandbox/merlin/";>Merlin</link> project
deals with the general area of service and component management. The Merlin system is
a container that provides comprehensive support for the management of complex
component based systems. Merlin uses a component meta-model to facilitate the
automated assembly and deployment of components.
+The <link href="http://avalon.apache.org/merlin/index.html";>Merlin</link> project
deals with the general area of service and component management. The Merlin system is
a container that provides comprehensive support for the management of complex
component based systems. Merlin uses a component meta-model to facilitate the
automated assembly and deployment of components.
</p>
<figure src="images/merlin.gif" alt="Merlin Conceptual Model"/>
</section>
1.3 +2 -2
avalon-site/src/documentation/content/xdocs/developing/compatiblity.xml
Index: compatiblity.xml
===================================================================
RCS file:
/home/cvs/avalon-site/src/documentation/content/xdocs/developing/compatiblity.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compatiblity.xml 2 Mar 2003 16:38:56 -0000 1.2
+++ compatiblity.xml 25 Sep 2003 23:58:52 -0000 1.3
@@ -23,7 +23,7 @@
</para>
<para>
This advise is applicable to all
- <ulink url="../framework/reference-containers.html">reference containers</ulink>
+ <ulink url="../framework/principals/containment.html">reference
containers</ulink>
</para>
<section>
<title>Making a Jar for a tool</title>
@@ -59,7 +59,7 @@
</para>
<para>
It is also a good idea to understand the
- <ulink url="../framework/guide-patterns-soii.html">separation of interface
+ <ulink url="../framework/cop/guide-patterns-soii.html">separation of
interface
and implementation</ulink> when designing components.
</para>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
