svn commit: rev 21496 - in avalon/trunk/central/site/src/xdocs: . central central/archive central/legacy central/tools products products/runtime products/runtime/system products/studio products/tools

[mc...@apache.org]

Author: mcconnell
Date: Sun Jun 20 03:00:45 2004
New Revision: 21496

Added:
   avalon/trunk/central/site/src/xdocs/central/archive/
      - copied from rev 21458, avalon/trunk/central/site/src/xdocs/central/legacy/
   avalon/trunk/central/site/src/xdocs/central/tools/
      - copied from rev 21458, avalon/trunk/central/site/src/xdocs/products/tools/
Removed:
   avalon/trunk/central/site/src/xdocs/central/legacy/
   avalon/trunk/central/site/src/xdocs/products/studio/
   avalon/trunk/central/site/src/xdocs/products/tools/
Modified:
   avalon/trunk/central/site/src/xdocs/central/navigation.xml
   avalon/trunk/central/site/src/xdocs/index.xml
   avalon/trunk/central/site/src/xdocs/products/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml
Log:
move tools to central, move legacy site to archive, comment out front page graphic pending update, shift merlin pic to systems page

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	Sun Jun 20 03:00:45 2004
@@ -31,6 +31,8 @@
       <item name="Concepts" href="cop/index.html"/>
       <item name="Resources" href="resources/index.html"/>
       <item name="Avalon Laboratory" href="laboratory/index.html"/>
+      <item name="Developer Tools" href="tools/index.html"/>
+      <item name="Legacy" href="legacy/index.html"/>
       <item name="DPML" href="dpml/index.html"/>
       <!-- <item name="Legacy" href="legacy/index.html"/> -->
     </menu>

Modified: avalon/trunk/central/site/src/xdocs/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/index.xml	Sun Jun 20 03:00:45 2004
@@ -11,17 +11,25 @@
      <p>
       Apache Avalon provides a complete development platform for
       component and container programming utilizing key design patterns
-      such as Inversion of Control and Separation of Concerns.
+      such as Inversion of Control and Separation of Concerns.
+      <!--
       Read more on <a href="why-avalon.html">why</a> you should 
-      consider Avalon for your next application.
-     </p>
+      consider Avalon for your next application.
+      -->
+     </p>
+
+     <!-- comment out while content is incomplete -->
+     <!--
      <p>
       If you're new to Avalon, start out with our
       <a href="">five minute tour</a> or visit
       <a href="overview.html">overview</a> page which describes
       Avalon's layout and subprojects.
-     </p>
+     </p>
+     -->
 
+     <!-- comment out pending update from Aaron -->
+     <!--
      <table>
       <tr>
         <td><!--<a href="central/about/index.html"> -->
@@ -41,7 +49,8 @@
 	    </td>
       </tr>
      </table>
-     
+     -->
+
      </section>
   </body>
 </document>

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	Sun Jun 20 03:00:45 2004
@@ -26,8 +26,6 @@
       <item name="Merlin Runtime" href="runtime/index.html"/>
       <!-- <item name="Merlin Studio" href="studio/index.html"/> -->
       <!-- <item name="Merlin Discovery" href="discovery/index.html"/> -->
-      <item name="Developer Tools" href="tools/index.html"/>
-      <item name="Legacy" href="legacy/index.html"/>
     </menu>
  </body>
 

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	Sun Jun 20 03:00:45 2004
@@ -12,9 +12,6 @@
 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/avalon-merlin1.png"/>
-    </p>
     </section>
 
     <section name="Purpose">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/index.xml	Sun Jun 20 03:00:45 2004
@@ -7,8 +7,9 @@
 
   <body>
     <section name="Subsystem">
-      <p>
-      </p>
+    <p>
+<img src="/images/avalon-merlin1.png"/>
+    </p>
     </section>
   </body>
 </document>

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