Author: mcconnell
Date: Mon May 31 11:32:38 2004
New Revision: 20703
Modified:
avalon/trunk/central/site/build.xml
avalon/trunk/central/site/src/xdocs/central/about/navigation.xml
avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml
avalon/trunk/central/site/src/xdocs/central/navigation.xml
avalon/trunk/central/site/src/xdocs/central/tutorials/index.xml
avalon/trunk/central/site/src/xdocs/navigation.xml
avalon/trunk/central/site/src/xdocs/products/navigation.xml
avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/index.xml
Log:
Modified: avalon/trunk/central/site/build.xml
==============================================================================
--- avalon/trunk/central/site/build.xml (original)
+++ avalon/trunk/central/site/build.xml Mon May 31 11:32:38 2004
@@ -1,5 +1,5 @@
-<project name="site" default="" basedir="."
+<project name="site" default="site" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<x:project index="../system/index.xml"/>
Modified: avalon/trunk/central/site/src/xdocs/central/about/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/navigation.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/navigation.xml Mon May
31 11:32:38 2004
@@ -25,6 +25,7 @@
<menu>
<item name="Downloads" href="download.cgi"/>
<item name="Resources" href="resources/index.html"/>
+ <item name="News" href="news/index.html"/>
</menu>
</body>
Modified:
avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml
==============================================================================
---
avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml
(original)
+++
avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml
Mon May 31 11:32:38 2004
@@ -7,7 +7,7 @@
<body>
-<section name="Please follow netiquette!">
+<section name="Guidelines">
<p>A mailing list is an electronic discussion forum that anyone can
subscribe to.
When someone sends an email message to the mailing list, a copy of that
message is
broadcast to everyone who is subscribed to that mailing list. Mailing lists
provide
Modified: avalon/trunk/central/site/src/xdocs/central/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/navigation.xml Mon May 31
11:32:38 2004
@@ -25,7 +25,6 @@
<menu>
<item name="Welcome" href="about/index.html"/>
<item name="Community" href="community/index.html"/>
- <item name="News" href="news/index.html"/>
<item name="Tutorials" href="tutorials/index.html"/>
<item name="Laboratory" href="laboratory/index.html"/>
<item name="Legacy" href="legacy/index.html"/>
Modified: avalon/trunk/central/site/src/xdocs/central/tutorials/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tutorials/index.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/tutorials/index.xml Mon May
31 11:32:38 2004
@@ -28,11 +28,7 @@
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
- <td><a href="installation/index.html">Installation</a></td>
- <td>Installation instructions including build and verification
procedures.</td>
- </tr>
- <tr>
- <td><a href="tutorial/index.html">Using Merlin</a></td>
+ <td><a href="basic/index.html">Using Merlin</a></td>
<td>
A short introduction to using Merlin based on a Hello Block example that takes
your though the definition of a block, subsequent deployment, and general
aspects concerning configuration, contextualization, service publication, and
service dependency management.
</td>
Modified: avalon/trunk/central/site/src/xdocs/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/navigation.xml Mon May 31 11:32:38 2004
@@ -25,8 +25,8 @@
<links>
<item name="Planet" href="planet/components/index.html"/>
- <item name="Products" href="products/runtime/about/index.html"/>
- <item name="Central" href="central/news/index.html"/>
+ <item name="Products" href="products/runtime/index.html"/>
+ <item name="Central" href="central/about/index.html"/>
</links>
<menu>
Modified: avalon/trunk/central/site/src/xdocs/products/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/navigation.xml Mon May 31
11:32:38 2004
@@ -23,7 +23,7 @@
<body>
<menu>
- <item name="Merlin Runtime" href="runtime/about/index.html"/>
+ <item name="Merlin Runtime" href="runtime/index.html"/>
<item name="Merlin Studio" href="studio/index.html"/>
<item name="Merlin Discovery" href="discovery/index.html"/>
</menu>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
Mon May 31 11:32:38 2004
@@ -28,14 +28,6 @@
<section name="Merlin Runtime">
- <p>
-The Merlin project deals with the general area of service and component
management. The Merlin system is a container that provides comprehensive
support for the management of complex component based systems based on an
underlying meta-model that facilitates automated assembly and deployment of
components.
- </p>
-
- <p>
-<img src="/images/cover.gif"/>
- </p>
-
<subsection name="Service Management Platform (SMP)">
<p>
Merlin is a service management platform based on an advanced assembly engine.
Its focus is to provide support for the encapsulation of a set of components
and services within functional blocks. Blocks enable the separation of
components as an implementation solutions from services established by
respective components.
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/index.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/index.xml Mon May
31 11:32:38 2004
@@ -6,9 +6,15 @@
</properties>
<body>
- <section name="Merlin Runtime Platform">
- <p>
- </p>
+ <section name="Merlin Runtime">
+
+ <p>
+The Merlin project deals with the general area of service and component
management. The Merlin system is a container that provides comprehensive
support for the management of complex component based systems based on an
underlying meta-model that facilitates automated assembly and deployment of
components.
+ </p>
+
+ <p>
+<img src="/images/cover.gif"/>
+ </p>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
