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/03/02 01:00:17 UTC
cvs commit: avalon/merlin/platform/xdocs/tools/tags navigation.xml
niclas 2004/03/01 16:00:17
Modified: merlin/platform/xdocs navigation.xml
merlin/platform/xdocs/about navigation.xml
merlin/platform/xdocs/extensions/jndi index.xml
navigation.xml
merlin/platform/xdocs/extensions/servlet index.xml
navigation.xml
merlin/platform/xdocs/merlin navigation.xml
merlin/platform/xdocs/merlin/appliance navigation.xml
merlin/platform/xdocs/merlin/block navigation.xml
merlin/platform/xdocs/merlin/kernel navigation.xml
merlin/platform/xdocs/merlin/kernel/embedding navigation.xml
merlin/platform/xdocs/meta/block navigation.xml
merlin/platform/xdocs/meta/block/classloader navigation.xml
merlin/platform/xdocs/meta/block/classloader/classpath
navigation.xml
merlin/platform/xdocs/meta/block/classloader/classpath/repository
navigation.xml
merlin/platform/xdocs/meta/block/classloader/grant
navigation.xml
merlin/platform/xdocs/meta/block/classloader/grant/certificates
navigation.xml
merlin/platform/xdocs/meta/block/classloader/grant/permission
navigation.xml
merlin/platform/xdocs/meta/block/components navigation.xml
merlin/platform/xdocs/meta/block/components/categories
navigation.xml
merlin/platform/xdocs/meta/block/components/context
navigation.xml
merlin/platform/xdocs/meta/block/components/context/entry
navigation.xml
merlin/platform/xdocs/meta/block/components/context/entry/constructor
navigation.xml
merlin/platform/xdocs/meta/block/components/dependencies
navigation.xml
merlin/platform/xdocs/meta/block/components/parameters
navigation.xml
merlin/platform/xdocs/meta/block/include navigation.xml
merlin/platform/xdocs/meta/block/services navigation.xml
merlin/platform/xdocs/meta/config navigation.xml
merlin/platform/xdocs/meta/config/target navigation.xml
merlin/platform/xdocs/meta/config/target/categories
navigation.xml
merlin/platform/xdocs/meta/kernel navigation.xml
merlin/platform/xdocs/meta/kernel/logging navigation.xml
merlin/platform/xdocs/meta/kernel/parameters navigation.xml
merlin/platform/xdocs/meta/kernel/repository navigation.xml
merlin/platform/xdocs/resources navigation.xml
merlin/platform/xdocs/resources/roadmap navigation.xml
merlin/platform/xdocs/starting navigation.xml
merlin/platform/xdocs/starting/advanced navigation.xml
merlin/platform/xdocs/starting/advanced/lifecycle
navigation.xml
merlin/platform/xdocs/starting/advanced/unit navigation.xml
merlin/platform/xdocs/starting/examples 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/installation navigation.xml
merlin/platform/xdocs/starting/tutorial 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/tools navigation.xml
merlin/platform/xdocs/tools/maven navigation.xml
merlin/platform/xdocs/tools/tags navigation.xml
Added: merlin/platform/xdocs/extensions index.xml navigation.xml
merlin/platform/xdocs/extensions/3rdparty index.xml
navigation.xml
merlin/platform/xdocs/extensions/jmx index.xml
navigation.xml
merlin/platform/xdocs/extensions/persistence index.xml
navigation.xml
Log:
Added a section for various Extensions to Merlin. And started to populate that section a little.
Revision Changes Path
1.6 +2 -1 avalon/merlin/platform/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -37,8 +37,9 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
-
+
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -41,6 +41,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.1 avalon/merlin/platform/xdocs/extensions/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<title>JMX Extension</title>
<author email="avalon-dev@jakarta.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="JMX Extension">
<p>
</p>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2004/03/02 00:00:15 $
</legal>
</footer>
</document>
1.1 avalon/merlin/platform/xdocs/extensions/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html">
<item name="HTTP Server Facility" href="/extensions/http/index.html"/>
<item name="Merlin Servlet" href="/extensions/servlet/index.html"/>
<item name="JMX Facility" href="/extensions/jmx/index.html"/>
<!--
<item name="Persistence Facility" href="/extensions/persistence/index.html"/>
-->
<item name="3rd Party" href="/extensions/3rdparty/index.html"/>
</item>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
<menu name="Related Projects">
<item name="Meta" href="http://avalon.apache.org/meta"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
</menu>
</body>
</project>
1.1 avalon/merlin/platform/xdocs/extensions/3rdparty/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<title>Third Party Merlin Extensions</title>
<author email="avalon-dev@jakarta.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="Third Party Merlin Extensions">
<p>
If you have created any extensions to Merlin and want them to be
referenced from this page, please send a mail to
<a href="mailto:dev@avalon.apache.org">Avalon Developers Mailing
List</a>.
</p>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2004/03/02 00:00:15 $
</legal>
</footer>
</document>
1.1 avalon/merlin/platform/xdocs/extensions/3rdparty/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html">
<item name="HTTP Server Facility" href="/extensions/http/index.html"/>
<item name="Merlin Servlet" href="/extensions/servlet/index.html"/>
<item name="JMX Facility" href="/extensions/jmx/index.html"/>
<!--
<item name="Persistence Facility" href="/extensions/persistence/index.html"/>
-->
<item name="3rd Party" href="/extensions/3rdparty/index.html"/>
</item>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
<menu name="Related Projects">
<item name="Meta" href="http://avalon.apache.org/meta"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
</menu>
</body>
</project>
1.1 avalon/merlin/platform/xdocs/extensions/jmx/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<title>JMX Extension</title>
<author email="avalon-dev@jakarta.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="JMX Extension">
<p>
<strong>Status: Under Development</strong>
</p>
<p>
<strong>Since: Merlin 3.4</strong>
</p>
<p>
The Merlin JMX Extension is an MX4J adapter and contains everything
needed to expose components as MBeans, as well as the JMX Agent and
a couple of connectors, such as the HttpConnector and Remote JMX
connector (JSR-160).
</p>
<p>
To enable JMX, you will need to declare the JMX Facility, as well as
enable the components to be MBeans. See the example below on how to
enable the JMX Facility. To enable the components to become MBeans,
you have a few ways to do so;
</p>
<ul>
<li>
Create a management interface which the component implements and
declare the <code>@avalon.mx interface="com.mydomain.MyMxInterface"</code>
in the component.
</li>
<li>
Create a MBeanInfo class.
</li>
</ul>
</section>
<section name="Example" >
<subsection name="Enabling the JMX Agent" >
<p>
This is done by including the JMX Agent block, typically in your
top level block.xml.
</p>
<source><![CDATA[
]]>
</source>
</subsection>
<subsection name="Making a component an MBean" >
</subsection>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2004/03/02 00:00:15 $
</legal>
</footer>
</document>
1.1 avalon/merlin/platform/xdocs/extensions/jmx/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html">
<item name="HTTP Server Facility" href="/extensions/http/index.html"/>
<item name="Merlin Servlet" href="/extensions/servlet/index.html"/>
<item name="JMX Facility" href="/extensions/jmx/index.html"/>
<!--
<item name="Persistence Facility" href="/extensions/persistence/index.html"/>
-->
<item name="3rd Party" href="/extensions/3rdparty/index.html"/>
</item>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
<menu name="Related Projects">
<item name="Meta" href="http://avalon.apache.org/meta"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
</menu>
</body>
</project>
1.3 +34 -25 avalon/merlin/platform/xdocs/extensions/jndi/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/jndi/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 2 Mar 2004 00:00:15 -0000 1.3
@@ -25,22 +25,28 @@
</properties>
<body>
-
<section name="Merlin JNDI Connection">
-
-<p>
-The Merlin JNDI package provides support for the establishment fo a Merlin Kernel via JNDI.
-</p>
-
- <subsection name="Development Note">
-<p>
-This is an initial minimal JNDI connector implementation that enables the establishment of a Merlin Kernel via JNDI. This allows establishment and access to a Merlin kernel based on a set of properties containing the system and home path, the root block and internal kernel logging priority.
-</p>
-
-<p>
-Using the JNDI context, a servlet can do something like the following:
-</p>
-
+ <p>
+ <strong>Status: Under Development</strong>
+ </p>
+ <p>
+ <strong>Since: Merlin 3.4</strong>
+ </p>
+ <p>
+ The Merlin JNDI package provides support for the establishment of a
+ Merlin Kernel via JNDI.
+ </p>
+ <subsection name="Development Note">
+ <p>
+ This is an initial minimal JNDI connector implementation that enables
+ the establishment of a Merlin Kernel via JNDI. This allows
+ establishment and access to a Merlin kernel based on a set of
+ properties containing the system and home path, the root block and
+ internal kernel logging priority.
+ </p>
+ <p>
+ Using the JNDI context, a servlet can do something like the following:
+ </p>
<source>
Context context = new InitialContext();
Context env = (Context) context.lookup("java:comp/env");
@@ -48,12 +54,18 @@
// then use the kernel to get the service that you want
</source>
-<p>
-The current implementation relies on the fact that the server.xml has the definition of the root block to be loaded. Currently the connector is returning the kernel, however it should be possible to return a naming context from which services are access via JNDI lookups. If the initial lookup returns a context then it should be possible to eliminate knowledge of the kernel - and keep things focussed on simply accessing services. This also brings in the potential for including JNDI url resolution of services (i.e. service resolution with arguments) which seems to me a desirable direction.
-</p>
-
-</subsection>
-
+ <p>
+ The current implementation relies on the fact that the server.xml has
+ the definition of the root block to be loaded. Currently the
+ connector is returning the kernel, however it should be possible to
+ return a naming context from which services are access via JNDI
+ lookups. If the initial lookup returns a context then it should be
+ possible to eliminate knowledge of the kernel - and keep things
+ focussed on simply accessing services. This also brings in the
+ potential for including JNDI url resolution of services (i.e. service
+ resolution with arguments) which seems to me a desirable direction.
+ </p>
+ </subsection>
</section>
</body>
@@ -63,7 +75,4 @@
$Revision$ $Date$
</legal>
</footer>
-
</document>
-
-
1.6 +9 -0 avalon/merlin/platform/xdocs/extensions/jndi/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/jndi/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -37,6 +37,15 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html">
+ <item name="HTTP Server Facility" href="/extensions/http/index.html"/>
+ <item name="Merlin Servlet" href="/extensions/servlet/index.html"/>
+ <item name="JMX Facility" href="/extensions/jmx/index.html"/>
+<!--
+ <item name="Persistence Facility" href="/extensions/persistence/index.html"/>
+-->
+ <item name="3rd Party" href="/extensions/3rdparty/index.html"/>
+ </item>
</menu>
<menu name="Resources">
1.1 avalon/merlin/platform/xdocs/extensions/persistence/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<document>
<properties>
<title>HSQL Server</title>
<author email="avalon-dev@jakarta.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="HSQL Server">
<p>
<strong>Status: Under Development</strong>
</p>
<p>
<strong>Since: Merlin 3.4</strong>
</p>
</section>
</body>
<footer>
<legal>
Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision: 1.1 $ $Date: 2004/03/02 00:00:15 $
</legal>
</footer>
</document>
1.1 avalon/merlin/platform/xdocs/extensions/persistence/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html">
<item name="HTTP Server Facility" href="/extensions/http/index.html"/>
<item name="Merlin Servlet" href="/extensions/servlet/index.html"/>
<item name="JMX Facility" href="/extensions/jmx/index.html"/>
<!--
<item name="Persistence Facility" href="/extensions/persistence/index.html"/>
-->
<item name="3rd Party" href="/extensions/3rdparty/index.html"/>
</item>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
<menu name="Related Projects">
<item name="Meta" href="http://avalon.apache.org/meta"/>
<item name="Utilities" href="http://avalon.apache.org/util"/>
<item name="Repository" href="http://avalon.apache.org/repository"/>
</menu>
</body>
</project>
1.3 +26 -20 avalon/merlin/platform/xdocs/extensions/servlet/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/servlet/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 2 Mar 2004 00:00:15 -0000 1.3
@@ -25,21 +25,26 @@
</properties>
<body>
-
<section name="Merlin Servlet">
-
-<p>
-The Merlin Servlet package contains an abstract Servlet implementation that contains an embedded Merlin Kernel.
-</p>
-
- <subsection name="Development Notes">
-<p>
-This is a minimal implementation of a Servlet that contains an embedded kernel. The behaviour is a function of the block.xml resource resolved via the initialisation parameters. No support is included for configuration of the kernel and as such the kernel is established relative to defaults. This will be enhanced in a later revision.
-</p>
-
- </subsection>
- <subsection name="Example web.xml">
- <p><i>web.xml</i></p>
+ <p>
+ The Merlin Servlet package contains an abstract Servlet implementation
+ that contains an embedded Merlin Kernel.
+ </p>
+
+ <subsection name="Development Notes">
+ <p>
+ This is a minimal implementation of a Servlet that contains an
+ embedded kernel. The behaviour is a function of the block.xml
+ resource resolved via the initialisation parameters. No support
+ is included for configuration of the kernel and as such the kernel
+ is established relative to defaults. This will be enhanced in a
+ later revision.
+ </p>
+ </subsection>
+ <subsection name="Example web.xml">
+ <p>
+ <i>web.xml</i>
+ </p>
<source><![CDATA[
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
@@ -65,9 +70,11 @@
</web-app>
]]></source>
- </subsection>
- <subsection name="Servlet Implementation">
- <p><i>MerlinServlet.java</i></p>
+ </subsection>
+ <subsection name="Servlet Implementation">
+ <p>
+ <i>MerlinServlet.java</i>
+ </p>
<source>
package org.apache.avalon.merlin.servlet;
@@ -89,7 +96,7 @@
* and registration of the kernel base URL under the servlet
* context using the key {@link Kernel.BASE_URL_KEY}.
*
- * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
+ * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
*/
public class MerlinServlet extends HttpServlet
{
@@ -173,7 +180,6 @@
$Revision$ $Date$
</legal>
</footer>
-
</document>
1.6 +9 -0 avalon/merlin/platform/xdocs/extensions/servlet/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/servlet/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -37,6 +37,15 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html">
+ <item name="HTTP Server Facility" href="/extensions/http/index.html"/>
+ <item name="Merlin Servlet" href="/extensions/servlet/index.html"/>
+ <item name="JMX Facility" href="/extensions/jmx/index.html"/>
+<!--
+ <item name="Persistence Facility" href="/extensions/persistence/index.html"/>
+-->
+ <item name="3rd Party" href="/extensions/3rdparty/index.html"/>
+ </item>
</menu>
<menu name="Resources">
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -41,6 +41,7 @@
</item>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 avalon/merlin/platform/xdocs/merlin/appliance/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/appliance/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -45,6 +45,7 @@
</item>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 avalon/merlin/platform/xdocs/merlin/block/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/block/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.6
@@ -41,6 +41,7 @@
</item>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.8
@@ -46,6 +46,7 @@
</item>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.5 +1 -0 avalon/merlin/platform/xdocs/merlin/kernel/embedding/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/embedding/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.4
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.5
@@ -46,6 +46,7 @@
</item>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.7
@@ -47,6 +47,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 avalon/merlin/platform/xdocs/meta/block/classloader/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.8
@@ -51,6 +51,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/classloader/classpath/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/classpath/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:47 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.7
@@ -52,6 +52,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.7
@@ -55,6 +55,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.4 +1 -0 avalon/merlin/platform/xdocs/meta/block/classloader/grant/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/grant/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 23 Feb 2004 14:36:38 -0000 1.3
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.4
@@ -54,6 +54,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.2 +1 -0 avalon/merlin/platform/xdocs/meta/block/classloader/grant/certificates/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/grant/certificates/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 23 Feb 2004 14:36:38 -0000 1.1
+++ navigation.xml 2 Mar 2004 00:00:15 -0000 1.2
@@ -57,6 +57,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.2 +1 -0 avalon/merlin/platform/xdocs/meta/block/classloader/grant/permission/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/classloader/grant/permission/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 23 Feb 2004 14:36:38 -0000 1.1
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.2
@@ -56,6 +56,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -52,6 +52,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/categories/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -54,6 +54,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/context/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -54,6 +54,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/context/entry/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/context/entry/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -57,6 +57,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -59,6 +59,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/dependencies/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/dependencies/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -55,6 +55,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/components/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/components/parameters/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -55,6 +55,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/block/include/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/include/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -47,6 +47,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 avalon/merlin/platform/xdocs/meta/block/services/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/block/services/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.8
@@ -48,6 +48,7 @@
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 avalon/merlin/platform/xdocs/meta/config/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/config/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.8
@@ -43,6 +43,7 @@
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/config/target/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/config/target/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -46,6 +46,7 @@
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/config/target/categories/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/config/target/categories/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:48 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -48,6 +48,7 @@
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.9 +1 -0 avalon/merlin/platform/xdocs/meta/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/kernel/navigation.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- navigation.xml 14 Feb 2004 21:33:56 -0000 1.8
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.9
@@ -44,6 +44,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 avalon/merlin/platform/xdocs/meta/kernel/logging/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/kernel/logging/navigation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -48,6 +48,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 avalon/merlin/platform/xdocs/meta/kernel/parameters/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/kernel/parameters/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.6
@@ -47,6 +47,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 avalon/merlin/platform/xdocs/meta/kernel/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/meta/kernel/repository/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.8
@@ -49,6 +49,7 @@
<item name="config.xml" href="/meta/config/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.6
@@ -37,6 +37,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.6
@@ -37,6 +37,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -41,6 +41,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.12 +1 -0 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.11
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.12
@@ -47,6 +47,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.8
@@ -51,6 +51,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:49 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -49,6 +49,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -47,6 +47,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:16 -0000 1.7
@@ -49,6 +49,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -40,6 +40,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -51,6 +51,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.6
@@ -46,6 +46,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -48,6 +48,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.8 +1 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.7
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.8
@@ -53,6 +53,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -52,6 +52,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:50 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -51,6 +51,7 @@
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:51 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -41,6 +41,7 @@
<item name="Meta Plugin for Maven"
href="http://avalon.apache.org/meta/tools/index.html"/>
</item>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- navigation.xml 25 Jan 2004 13:28:51 -0000 1.6
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.7
@@ -44,6 +44,7 @@
<item name="Meta Plugin for Maven"
href="http://avalon.apache.org/meta/tools/index.html"/>
</item>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
1.6 +1 -0 avalon/merlin/platform/xdocs/tools/tags/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/tags/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 25 Jan 2004 13:28:51 -0000 1.5
+++ navigation.xml 2 Mar 2004 00:00:17 -0000 1.6
@@ -54,6 +54,7 @@
<item name="Meta-Info Generator Task" href="/tools/ant.html"/>
<item name="Merlin Plugin for Maven" href="/tools/maven/index.html"/>
</item>
+ <item name="Extensions" href="/extensions/index.html" />
</menu>
<menu name="Resources">
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org