mcconnell 2004/04/04 08:49:08
Modified: merlin INSTALL.TXT
merlin/platform/xdocs/about navigation.xml
merlin/platform/xdocs/dpml index.xml navigation.xml
merlin/platform/xdocs/extensions/facilities navigation.xml
merlin/platform/xdocs/extensions navigation.xml
merlin/platform/xdocs/extensions/platform navigation.xml
merlin/platform/xdocs/merlin/embedded navigation.xml
merlin/platform/xdocs/merlin navigation.xml
merlin/platform/xdocs/merlin/systems navigation.xml
merlin/platform/xdocs navigation.xml
merlin/platform/xdocs/reference/component/artifacts
navigation.xml
merlin/platform/xdocs/reference/component/descriptors
navigation.xml
merlin/platform/xdocs/reference/component/lifecycle
navigation.xml
merlin/platform/xdocs/reference/component/lifestyle
navigation.xml
merlin/platform/xdocs/reference/component navigation.xml
merlin/platform/xdocs/reference/containment/directives/categories
navigation.xml
merlin/platform/xdocs/reference/containment/directives/classloader/classpath
navigation.xml
merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository
navigation.xml
merlin/platform/xdocs/reference/containment/directives/classloader
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components/categories
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components/context/entry
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components/context
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components/dependencies
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components
navigation.xml
merlin/platform/xdocs/reference/containment/directives/components/parameters
navigation.xml
merlin/platform/xdocs/reference/containment/directives/include
navigation.xml
merlin/platform/xdocs/reference/containment/directives
navigation.xml
merlin/platform/xdocs/reference/containment/directives/services
navigation.xml
merlin/platform/xdocs/reference/containment navigation.xml
merlin/platform/xdocs/reference/containment/overrides
navigation.xml
merlin/platform/xdocs/reference/deployment navigation.xml
merlin/platform/xdocs/reference navigation.xml
merlin/platform/xdocs/reference/system/kernel navigation.xml
merlin/platform/xdocs/reference/system/kernel/repository
navigation.xml
merlin/platform/xdocs/reference/system/kernel/security
navigation.xml
merlin/platform/xdocs/reference/system/kernel/security/profile
navigation.xml
merlin/platform/xdocs/reference/system/kernel/security/profile/permissions
navigation.xml
merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission
navigation.xml
merlin/platform/xdocs/reference/system navigation.xml
merlin/platform/xdocs/resources navigation.xml
merlin/platform/xdocs/resources/roadmap navigation.xml
merlin/platform/xdocs/starting/advanced/lifecycle
navigation.xml
merlin/platform/xdocs/starting/advanced navigation.xml
merlin/platform/xdocs/starting/advanced/unit navigation.xml
merlin/platform/xdocs/starting/examples/afs navigation.xml
merlin/platform/xdocs/starting/examples/afs/simple
navigation.xml
merlin/platform/xdocs/starting/examples/james navigation.xml
merlin/platform/xdocs/starting/examples navigation.xml
merlin/platform/xdocs/starting/installation navigation.xml
merlin/platform/xdocs/starting navigation.xml
merlin/platform/xdocs/starting/tutorial/config
navigation.xml
merlin/platform/xdocs/starting/tutorial/context
navigation.xml
merlin/platform/xdocs/starting/tutorial/dependencies
navigation.xml
merlin/platform/xdocs/starting/tutorial navigation.xml
merlin/platform/xdocs/tools/maven navigation.xml
merlin/platform/xdocs/tools navigation.xml
Log:
Site updates.
Revision Changes Path
1.19 +99 -99 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- INSTALL.TXT 4 Apr 2004 06:30:54 -0000 1.18
+++ INSTALL.TXT 4 Apr 2004 15:49:05 -0000 1.19
@@ -1,99 +1,99 @@
-
-PROJECT: Merlin @VERSION@
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /system
- README.TXT
- LICENSE.TXT
- INSTALL.TXT
- /plugins
- @META_PLUGIN_JAR@
- @MERLIN_PLUGIN_JAR@
-
-
-Installing Merlin.
-------------------
-
-To use Merlin command line support or the Merlin NT Service
-you will need to define the MERLIN_HOME environment
-variable for your system and include MERLIN_HOME/bin in
-your system path. The MERLIN_HOME environment variable
-should point to the merlin directory.
-
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-Under Lunix you can do this as follows:
-
- $ echo '
- > # set location of merlin
- > export MERLIN_HOME=/opt/merlin
- > # include it in the path
- > export PATH=$PATH:$MERLIN_HOME/bin
- > ' >> ~/.bash_profile
- $ source ~/.bash_profile
-
-Versions of Merlin prior to the 3.2-dev 20031210 build maintained
-a local repository of jar files under the %MERLIN_HOME%/repository
-directory. As of the 20031210 build the repository is maintained
-under AVALON_HOME which defaults to ${user.home}/.avalon. To
-override this behaviour you can either define a AVALON_HOME
-environment variable or you can add a merlin.properties file to
-${user.home} containing the "merlin.repository" property key and
-a value point to you preferred repository location.
-
-To confirm that your environment variables are correct, you
-should open a new command window and invoke the Merlin
-CLI application.
-
-Under DOS:
-
- $ merlin -version
-
-Under Lunix:
-
- $ merlin.sh -version
-
-The installation of Merlin is now complete, however, two plugins are
-provided with the installation supporting merlin development under the
-Maven platform. These plugins should be placed in the Maven plugin
-directory (${maven.home.local}\plugins).
-
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
-
-Please note that if you are upgrading an existing installation you must
-delete the following two directories:
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
-
-Replace the existing avalon-meta and merlin plugin jar files with the
supplied
-versions. Finally, delete all *.cache files in the Maven plugin directory.
-
-You now have everything in place to start using the Merlin Tutorial or
-building you own components. If you have any problems, please subscribe
-and post a message to [EMAIL PROTECTED]
-
-Special Note for JRE 1.3 and earlier.
--------------------------------------
-
-Some applications assume that XML parsing classes are available withing
-the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
-you can copy the following files to the JAVAHOME/lib/ext directory or
-declare an alternative directory as a JVM argument under the
-MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
-
- system/xml-apis/jars/xml-apis-2.0.2.jar
- system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
- system/xerces/jars/xerces-2.4.0.jar
-
+
+PROJECT: Merlin @VERSION@
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.TXT
+ /plugins
+ @META_PLUGIN_JAR@
+ @MERLIN_PLUGIN_JAR@
+
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Under Lunix you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME which defaults to ${user.home}/.avalon. To
+override this behaviour you can either define a AVALON_HOME
+environment variable or you can add a merlin.properties file to
+${user.home} containing the "merlin.repository" property key and
+a value point to you preferred repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+Under DOS:
+
+ $ merlin -version
+
+Under Lunix:
+
+ $ merlin.sh -version
+
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the
+Maven platform. These plugins should be placed in the Maven plugin
+directory (${maven.home.local}\plugins).
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
+
+Replace the existing avalon-meta and merlin plugin jar files with the
supplied
+versions. Finally, delete all *.cache files in the Maven plugin directory.
+
+You now have everything in place to start using the Merlin Tutorial or
+building you own components. If you have any problems, please subscribe
+and post a message to [EMAIL PROTECTED]
+
+Special Note for JRE 1.3 and earlier.
+-------------------------------------
+
+Some applications assume that XML parsing classes are available withing
+the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
+you can copy the following files to the JAVAHOME/lib/ext directory or
+declare an alternative directory as a JVM argument under the
+MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
+
+ system/xml-apis/jars/xml-apis-2.0.2.jar
+ system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
+ system/xerces/jars/xerces-2.4.0.jar
+
1.11 +2 -2 avalon/merlin/platform/xdocs/about/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/about/navigation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.10
+++ navigation.xml 4 Apr 2004 15:49:05 -0000 1.11
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +1 -1 avalon/merlin/platform/xdocs/dpml/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/dpml/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 25 Jan 2004 13:28:47 -0000 1.2
+++ index.xml 4 Apr 2004 15:49:05 -0000 1.3
@@ -33,7 +33,7 @@
<p>
The Merlin platform provides a comprehensive environment for the
management of a broad spectrum of components. Open source projects
-such as the <a href="http://javajabber.net/en/";>OpenIM</a> instant
+such as the <a href="http://openim.dev.java.net/";>OpenIM</a> instant
messaging server, the <a href="http://phoenixjms.sourceforge.net/index.html";>
PhoenixJMS</a> a JMS messaging platform,
along with a suite of <a href="http://www.apache.org";>Apache</a> projects
can be viewed as
1.10 +2 -2 avalon/merlin/platform/xdocs/dpml/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/dpml/navigation.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.9
+++ navigation.xml 4 Apr 2004 15:49:05 -0000 1.10
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.5 +2 -2
avalon/merlin/platform/xdocs/extensions/facilities/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/extensions/facilities/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 3 Apr 2004 10:46:45 -0000 1.4
+++ navigation.xml 4 Apr 2004 15:49:05 -0000 1.5
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.8 +2 -2 avalon/merlin/platform/xdocs/extensions/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.7
+++ navigation.xml 4 Apr 2004 15:49:05 -0000 1.8
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/extensions/platform/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/extensions/platform/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:05 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/merlin/embedded/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/merlin/embedded/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.13 +2 -2 avalon/merlin/platform/xdocs/merlin/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/navigation.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.12
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.13
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/merlin/systems/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/merlin/systems/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.11 +2 -2 avalon/merlin/platform/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/navigation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.10
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.11
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.8 +2 -2
avalon/merlin/platform/xdocs/reference/component/artifacts/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/component/artifacts/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.7
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.8
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.9 +2 -2
avalon/merlin/platform/xdocs/reference/component/descriptors/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/component/descriptors/navigation.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.8
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.9
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.9 +2 -2
avalon/merlin/platform/xdocs/reference/component/lifecycle/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/component/lifecycle/navigation.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.8
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.9
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.8 +2 -2
avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.7
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.8
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.8 +2 -2
avalon/merlin/platform/xdocs/reference/component/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/component/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.7
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.8
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/categories/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/classloader/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:17 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/include/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/directives/services/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/services/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.3 +2 -2
avalon/merlin/platform/xdocs/reference/containment/overrides/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/containment/overrides/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.2
+++ navigation.xml 4 Apr 2004 15:49:06 -0000 1.3
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.8 +2 -2
avalon/merlin/platform/xdocs/reference/deployment/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/deployment/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.7
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.8
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.7 +2 -2 avalon/merlin/platform/xdocs/reference/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.6
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.7
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/reference/system/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/reference/system/kernel/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/repository/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/reference/system/kernel/security/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.4 +2 -2
avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.3
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.5 +2 -2
avalon/merlin/platform/xdocs/reference/system/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/reference/system/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.4
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.5
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.11 +2 -2 avalon/merlin/platform/xdocs/resources/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/resources/navigation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.10
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.11
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.11 +2 -2
avalon/merlin/platform/xdocs/resources/roadmap/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/resources/roadmap/navigation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.10
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.11
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.13 +2 -2
avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.12
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.13
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.17 +2 -2
avalon/merlin/platform/xdocs/starting/advanced/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/advanced/navigation.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- navigation.xml 3 Apr 2004 08:52:18 -0000 1.16
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.17
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/advanced/unit/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/examples/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/examples/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.11 +2 -2
avalon/merlin/platform/xdocs/starting/installation/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/installation/navigation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.10
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.11
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2 avalon/merlin/platform/xdocs/starting/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.14 +2 -2
avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.13
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.14
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2
avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -26,8 +26,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.12 +2 -2 avalon/merlin/platform/xdocs/tools/maven/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/maven/navigation.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.11
+++ navigation.xml 4 Apr 2004 15:49:07 -0000 1.12
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
1.13 +2 -2 avalon/merlin/platform/xdocs/tools/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/navigation.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- navigation.xml 3 Apr 2004 08:52:19 -0000 1.12
+++ navigation.xml 4 Apr 2004 15:49:08 -0000 1.13
@@ -27,8 +27,8 @@
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework"
href="http://avalon.apache.org/product/framework/"/>
- <item name="Containment"
href="http://avalon.apache.org/product/containers/"/>
- <item name="Components"
href="http://avalon.apache.org/product/components/"/>
+ <item name="Merlin"
href="http://avalon.apache.org/product/containers/"/>
+ <item name="Planet"
href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
