You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/02/01 02:23:12 UTC

svn commit: rev 6391 - in incubator/directory/sitedocs/trunk/sitedocs/xdocs: . community community/history community/process community/who doc related sandbox subprojects subprojects/eve subprojects/janus subprojects/ldap subprojects/naming subprojects/snickers

Author: akarasulu
Date: Sat Jan 31 17:23:11 2004
New Revision: 6391

Modified:
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/mailing-lists.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/apache.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/external.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/navigation.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/index.xml
   incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/navigation.xml
Log:


Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/history/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,7 +18,6 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html">
         <item name="Who We Are" href="/community/who/index.html"/>
         <item name="Process" href="/community/process/index.html"/>
@@ -30,6 +29,7 @@
             href="/community/history/naming-commons.html"/>
         </item>
       </item>
+      <item name="Latest News" href="/news.html"/>
       <item name="Sub-Projects" href="/subprojects/index.html"/>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,13 +18,13 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html">
         <item name="Who We Are" href="/community/who/index.html"/>
         <item name="Process" href="/community/process/index.html"/>
         <item name="History" href="/community/history/index.html"/>
       </item>
-      <item name="Products" href="/product/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html"/>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>
 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/process/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,7 +18,6 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html">
         <item name="Who We Are" href="/community/who/index.html"/>
         <item name="Process" href="/community/process/index.html">
@@ -34,6 +33,7 @@
         </item>
         <item name="History" href="/community/history/index.html"/>
       </item>
+      <item name="Latest News" href="/news.html"/>
       <item name="Sub-Projects" href="/subprojects/index.html"/>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/community/who/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -21,7 +21,9 @@
         <item name="Who We Are" href="/community/who/index.html">
           <item name="Wes McKean" href="/community/who/wesmckean.html"/>
           <item name="Jeff Machols" href="/community/who/jmachols.html"/>
+          <item name="Robb Penoyer" href="/community/who/rpenoyer.html"/>
           <item name="Alex Karasulu" href="/community/who/akarasulu.html"/>
+          <item name="Noel J. Bergman" href="/community/who/nbergman.html"/>
           <item name="Stephen McConnell" href="/community/who/mcconnell.html"/>
         </item>
         <item name="Process" href="/community/process/index.html"/>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/doc/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,9 +18,9 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html"/>
       <item name="Documentation" href="/doc/index.html">
         <item name="Apache Wiki" href="/doc/wiki.html"/>
         <item name="Articles" href="/doc/articles.html"/>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/download.html	Sat Jan 31 17:23:11 2004
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
     <html>
       <head>
-          <title>Apache Avalon - Apache Avalon Downloads</title>
+          <title>Apache Directory - Apache Directory Downloads</title>
         <style type="text/css">
           @import url("./style/tigris.css");
           @import url("./style/maven.css");
           @import url("./style/osm.css");
         </style>
         <link rel="stylesheet" href="./style/print.css" type="text/css" media="print"></link>
-          <meta name="author" value="Avalon Documentation Team"></meta>
-          <meta name="email" value="dev@avalon.apache.org"></meta>
+          <meta name="author" value="Alex Karasulu"></meta>
+          <meta name="email" value="akarasulu@apache.org"></meta>
       </head>
 
       <body marginwidth="0" class="composite" marginheight="0">
@@ -17,8 +17,9 @@
           <table height="103" border="0" width="100%" cellpadding="8" cellspacing="0">
             <tr>
               <td>
-                  <a href="http://avalon.apache.org/">
-                    <img border="0" alt="The Apache Avalon Project" src="./images/apache-avalon-logo.png" align="left"></img>
+                  <a href="http://incubator.apache.org/directory">
+                    <img border="0" alt="The Apache Directory Project" 
+                      src="./images/apache-avalon-logo.png" align="left"></img>
                   </a>
               </td>
               <td>
@@ -37,7 +38,7 @@
               <td>
                 <div align="right">
       <a href="http://apache.org/"> Apache </a> |
-      <a href="index.html"> Avalon </a> |
+      <a href="index.html"> Directory </a> |
       <a href="product/framework/index.html"> Framework </a> |
       <a href="product/containers/index.html"> Containers </a> |
       <a href="product/components/index.html"> Components </a>
@@ -52,7 +53,7 @@
             <td width="200" id="leftcol">
               <div id="navcolumn">
     <div>
-      <strong>About Avalon</strong>
+      <strong>About Directory</strong>
     <div>
       <small><a href="index.html">Overview</a></small>
     </div>
@@ -81,7 +82,7 @@
       <small><a href="cvs.html">CVS</a></small>
     </div>
     <div>
-      <small><a href="http://wiki.apache.org/avalon">WIKI</a></small>
+      <small><a href="http://wiki.apache.org/Directory">WIKI</a></small>
     </div>
     <div>
       <small><a href="sandbox/index.html">Sandbox</a></small>
@@ -90,7 +91,7 @@
       <small><a href="mailing-lists.html">Mailing Lists</a></small>
     </div>
     <div>
-      <small><a href="http://nagoya.apache.org/bugzilla/reports.cgi?product=Avalon&amp;amp;output=most_doomed&amp;amp;links=1&amp;amp;banner=1&amp;amp;quip=0">Bug Database</a></small>
+      <small><a href="http://nagoya.apache.org/bugzilla/reports.cgi?product=Directory&amp;amp;output=most_doomed&amp;amp;links=1&amp;amp;banner=1&amp;amp;quip=0">Bug Database</a></small>
     </div>
     <div>
       <small><a href="related/index.html">Related Projects</a></small>
@@ -103,28 +104,28 @@
                 <div class="app">
     <div class="h3">
         <h3>
-          <a name="download">Avalon Download Site</a>
+          <a name="download">Directory Download Site</a>
         </h3>
 
     <div>
      <!-- START DOWNLOAD PAGE CONTENT -->
 
       <p>Use the links below to download a binary distribution of
-      Avalon from one of our mirrors.  It's a good idea to
+      Directory from one of our mirrors.  It's a good idea to
       <a href="[location]#Verify Releases">verify the integrity</a>
       of the downloaded files using signatures downloaded from our
       main distribution directory.</p>
 
-      <p>Avalon is distributed as <code>zip</code> and <code>tar.gz</code>
+      <p>Directory is distributed as <code>zip</code> and <code>tar.gz</code>
       archives - the contents are the same. Please note that the <code>tar.gz</code>
       archives contain file names longer than 100 characters and have been
       created using GNU tar extensions.  They must be untarred with a GNU
       compatible version of <code>tar</code>.</p>
 
       <p>If you do not see the file you need in the links below, please
-      see the <a href="http://www.apache.org/dist/avalon/">master
+      see the <a href="http://www.apache.org/dist/Directory/">master
       distribution directory</a> or, preferably, its
-      <a href="[preferred]/avalon/">mirror</a>.</p>
+      <a href="[preferred]/Directory/">mirror</a>.</p>
 
 <a name="Mirror"></a><h4>Mirror</h4>
       <p>You are currently using the <strong>[preferred]</strong>.
@@ -149,7 +150,7 @@
 
 <a name="Projects"></a><h4>License</h4>
 
-<p>All avalon products are distributed under the terms of a slightly
+<p>All Directory products are distributed under the terms of a slightly
 modified Apache Software License (version 1.1). See our
 <a href="license.html">License</a> page, or the LICENSE.txt files
 included in each distribution.</p>
@@ -157,7 +158,7 @@
 <a name="Projects"></a><h4>Projects</h4>
 
 <p>Here's a list of the most commonly requested distributions. You can
-<a href="[preferred]/avalon/">browse</a> the repository for a full
+<a href="[preferred]/Directory/">browse</a> the repository for a full
 range of our various distributions, including older versions.</p>
 
 <p>Please note: we're still filling up this list; its incomplete
@@ -172,34 +173,34 @@
       <th>Jars</th>
     </tr>
     <tr class="a">
-<td><a href="/fortress/">Avalon-Fortress</a></td>
-<td><a href="[preferred]/avalon/fortress/binaries">binaries</a></td>
-<td><a href="[preferred]/avalon/fortress/source">broswe</a></td>
-<td><a href="[preferred]/avalon/fortress/jars">jars</a></td>
+<td><a href="/fortress/">Directory-Fortress</a></td>
+<td><a href="[preferred]/Directory/fortress/binaries">binaries</a></td>
+<td><a href="[preferred]/Directory/fortress/source">broswe</a></td>
+<td><a href="[preferred]/Directory/fortress/jars">jars</a></td>
    </tr>
     <tr class="b">
-<td><a href="/framework/">Avalon-Framework</a></td>
-<td><a href="[preferred]/avalon/framework/binaries">binaries</a></td>
-<td><a href="[preferred]/avalon/framework/source">source</a></td>
-<td><a href="[preferred]/avalon/framework/jars">jars</a></td>
+<td><a href="/framework/">Directory-Framework</a></td>
+<td><a href="[preferred]/Directory/framework/binaries">binaries</a></td>
+<td><a href="[preferred]/Directory/framework/source">source</a></td>
+<td><a href="[preferred]/Directory/framework/jars">jars</a></td>
    </tr>
     <tr class="a">
-<td><a href="/logkit/">Avalon-Logkit</a></td>
-<td><a href="[preferred]/avalon/logkit/binaries">binaries</a></td>
-<td><a href="[preferred]/avalon/logkit/source">broswe</a></td>
-<td><a href="[preferred]/avalon/logkit/jars">jars</a></td>
+<td><a href="/logkit/">Directory-Logkit</a></td>
+<td><a href="[preferred]/Directory/logkit/binaries">binaries</a></td>
+<td><a href="[preferred]/Directory/logkit/source">broswe</a></td>
+<td><a href="[preferred]/Directory/logkit/jars">jars</a></td>
    </tr>
     <tr class="a">
-<td><a href="/merlin/">Avalon-Merlin</a></td>
-<td><a href="[preferred]/avalon/merlin/binaries">binaries</a></td>
-<td><a href="[preferred]/avalon/merlin/source">broswe</a></td>
-<td><a href="[preferred]/avalon/merlin/jars">jars</a></td>
+<td><a href="/merlin/">Directory-Merlin</a></td>
+<td><a href="[preferred]/Directory/merlin/binaries">binaries</a></td>
+<td><a href="[preferred]/Directory/merlin/source">broswe</a></td>
+<td><a href="[preferred]/Directory/merlin/jars">jars</a></td>
    </tr>
     <tr class="a">
-<td><a href="/phoenix/">Avalon-Phoenix</a></td>
-<td><a href="[preferred]/avalon/phoenix/binaries">binaries</a></td>
-<td><a href="[preferred]/avalon/phoenix/source">broswe</a></td>
-<td><a href="[preferred]/avalon/phoenix/jars">jars</a></td>
+<td><a href="/phoenix/">Directory-Phoenix</a></td>
+<td><a href="[preferred]/Directory/phoenix/binaries">binaries</a></td>
+<td><a href="[preferred]/Directory/phoenix/source">broswe</a></td>
+<td><a href="[preferred]/Directory/phoenix/jars">jars</a></td>
    </tr>
 </table>
 
@@ -208,10 +209,10 @@
 <p>It is essential that you verify the integrity of the downloaded
 files using the PGP or MD5 signatures.</p>
 <p>The PGP signatures can be verified using PGP or GPG.  First
-download the <a href="http://www.apache.org/dist/avalon/KEYS">KEYS</a>
+download the <a href="http://www.apache.org/dist/Directory/KEYS">KEYS</a>
 as well as the <code>asc</code> signature file for the particular
 distribution.  Make sure you get these files from the
-<a href="http://www.apache.org/dist/avalon/">main distribution
+<a href="http://www.apache.org/dist/Directory/">main distribution
 directory</a>, rather than from a mirror. Then verify the signatures
 using</p>
 <p><code>
@@ -242,18 +243,18 @@
 
 <a name="Maven Repository"></a><h4>Maven Repository</h4>
 
-<p>The avalon distribution layout is compatible with the
+<p>The Directory distribution layout is compatible with the
 <a href="http://maven.apache.org/">Maven</a> repository format. To
 enable maven to automatically use your chosen distribution mirror
 as a remote repository, add a line to your project.properties file:
 </p>
 
 <p><code>
-maven.repo.remote = [preferred]/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = [preferred]/Directory,http://www.ibiblio.org/maven
 </code></p>-->
 
 <p>Doing so will ensure that your maven-enabled projects will always
-be able to find the latest avalon binaries.</p>
+be able to find the latest Directory binaries.</p>
      <!-- END DOWNLOAD PAGE CONTENT -->
     </div>
 
@@ -267,7 +268,7 @@
           <table border="0" cellpadding="4" cellspacing="0">
             <tr>
               <td>
-                       1997-2003, The Apache Avalon Project
+                       1997-2003, The Apache Directory Project
               </td>
             </tr>
           </table>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/mailing-lists.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/mailing-lists.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/mailing-lists.xml	Sat Jan 31 17:23:11 2004
@@ -1,59 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon E-Mail Lists</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory E-Mail Lists</title>
   </properties> 
 
 <body>
 
 <section name="Please follow netiquette!">
-  <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
-  a simple and effective communication mechanism. With potentially thousands of
-  subscribers, there is a
-  <a href="http://jakarta.apache.org/site/mail.html">common set of etiquette
-  guidelines</a> that you should observe.</p>
+  <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 a simple and effective communication mechanism. With 
+    potentially thousands of subscribers, there is a
+    <a href="http://jakarta.apache.org/site/mail.html">common set of etiquette
+    guidelines</a> that you should observe.</p>
 </section>
   <section name="The lists">
-    <subsection name="The Avalon Users List">
+    <subsection name="The Directory Developers & Users List">
       <p>
-	<em>Light Traffic</em>
-	<a href="mailto:users-subscribe@avalon.apache.org">Subscribe</a>
-	<a href="mailto:users-unsubscribe@avalon.apache.org">Unsubscribe</a>
-	<a href="http://www.mail-archive.com/users@avalon.apache.org/">Archive</a>
-	<a href="nntp://news.gmane.org/gmane.comp.jakarta.avalon.user">News gateway</a>
+        Until we leave the incubator we're not discriminating between users and
+        developers.  All mail and concerns are managed via one list per 
+        incubator project.
       </p>
+      
       <p>
-	This list is for users who are using Avalon in their own projects to ask
-	questions, share knowledge, and discuss issues related to using the Avalon
-	suite of software.
+	<em>Light Traffic</em>
+<a href="mailto:directory-dev-subscribe@incubator.apache.org">Subscribe</a>
+<a href="mailto:directory-dev-unsubscribe@incubator.apache.org">Unsubscribe</a>
+<a href="http://nagoya.apache.org/eyebrowse/SummarizeList?listId=181">Archive
+  </a>
       </p>
     </subsection>
-    <subsection name="The Avalon Developers List">
-      <p>
-	<em>Medium Traffic</em>
-	<a href="mailto:dev-subscribe@avalon.apache.org">Subscribe</a>  
-	<a href="mailto:dev-unsubscribe@avalon.apache.org">Unsubscribe</a> 
-	<a href="http://www.mail-archive.com/dev@avalon.apache.org/">Archive</a> 
-	<a href="nntp://news.gmane.org/gmane.comp.jakarta.avalon.devel">News gateway</a>
-      </p>
+
+    <subsection name="The Directory SVN List">
       <p>
-	This list is for developers who are maintaining Avalon or wanting to influence
-	its design to ask questions, share knowledge, and discuss issues related to developing 
-	the Avalon framework.
+        This is kind of a misnomer.  We use subversion but the change 
+        notification still uses cvs since we were originally going to use CVS
+        but switched to SVN.
       </p>
-    </subsection>
-    <subsection name="The Avalon CVS List">
       <p>
 	<em>Medium Traffic</em> 
-	<a href="mailto:cvs-subscribe@avalon.apache.org">Subscribe</a>  
-	<a href="mailto:cvs-unsubscribe@avalon.apache.org">Unsubscribe</a> 
-	<a href="nntp://news.gmane.org/gmane.comp.jakarta.avalon.cvs">News gateway</a>
+<a href="mailto:directory-cvs-subscribe@incubator.apache.org">Subscribe</a>  
+<a href="mailto:directory-cvs-unsubscribe@incubator.apache.org">Unsubscribe</a>  
       </p>
       <p>
-        Changes to the Avalon CVSes are echoed to this list.
+        Changes to the Directory Subversion repository are echoed to this list.
       </p>
     </subsection>
 </section>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/apache.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/apache.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/apache.xml	Sat Jan 31 17:23:11 2004
@@ -1,61 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Related - Apache</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Related - Apache</title>
   </properties> 
 
   <body>
     <section name="Related Projects">
       <subsection name="Apache Projects">
         <table>
-	  <tr>
-	    <th width="200">Name</th>
-	    <th>Description</th>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://incubator.apache.org/projects/directory.html">Apache Directory Project</a></p></td>
-	    <td>
-            <p>
-The Apache Java LDAP Server (a.k.a. Eve, f.k.a. LDAPd) is the flagship server under the new Apache Directory Project.  Eve is a pure Java implementation of an LDAP version 3 server based on Avalon and SEDA.  Eve, as the first of its kind, will revolutionize the way directories are used by enabling server embedding and rich database constructs like stored procedures and triggers.  Eve leverages JNDI as the embedding API and allows the use of a server side JNDI LDAP provider to efficiently access server databases within stored procedures.
-            </p>
-            <p>
-Eve's simplicity and modularity, thanks primarily to Avalon design patterns, makes it an ideal protocol experimentation and extention framework.  Those forging the future of internet directory protocols on standards bodies like ldap-bis and others can use Eve to test and demonstrate the substance of new RFCs.  Eve's swapable protocol components and plugable backends puts the focus on the protocol rather than code management and porting.
-            </p>
-          </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://cocoon.apache.org/">Cocoon</a></p></td>
-	    <td><p>Apache Cocoon is a web development framework built around the concepts of separation of concerns and component-based web development.
-Cocoon implements these concepts around the notion of 'component pipelines', each component on the pipeline specializing on a particular operation. This makes it possible to use a Lego(tm)-like approach in building web solutions, hooking together components into pipelines without any required programming.
-Cocoon is "web glue for your web application development needs". It is a glue that keeps concerns separate and allows parallel evolution of all aspects of a web application, improving development pace and reducing the chance of conflicts.
-</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://incubator.apache.org/projects/ftpserver.html">FTP Server Project</a></p></td>
-	    <td><p>FtpServer is a server component for Avalon that allows remote FTP client to attach and download files. The client software can be any type of FTP client written in any language. The criteria for eligibility is RFC compliance. The server uses several components. Some of the components have multiple implementations. For example user management has implementations that will use LDAP, JDBC and Cornerstone's Store facility for storage. 
-The server has a management console (GUI) that can connect over RMI to the server. 
-</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a
-href="http://jakarta.apache.org/turbine/fulcrum/">Fulcrum</a></p></td>
-	    <td><p>Fulcrum was originally created as part of the Turbine 3 effort.
-The idea was to be able to decouple the services from Turbine 2 allowing
-them to be used on both projects. Fulcrum is currently evolving into a
-generic component repository useful in building web applications. Each
-service is been converted into a stand alone component that can be released
-independently of the other components.
- </p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://james.apache.org">James</a></p></td>
-	    <td>
-<p>The Java Apache Mail Enterprise Server (a.k.a. Apache James) is a 100% pure Java SMTP and POP3 Mail server and NNTP News server.  James was designed to be a complete and portable enterprise mail engine solution based on currently available open protocols. </p>
-<p>James is also a <i>mail application platform</i>.  The James team have developed a Java API to let you write Java code to process emails that we call the mailet API.  A <i>mailet</i> can generate an automatic reply, update a database, prevent spam, build a message archive, or whatever you can imagine.  A <i>matcher</i> determines whether your mailet should process an email in the server.  The James project hosts the Mailet API, and James provides an implementation of this mail application platform API.</p>
-          </td>
-	  </tr>
-	</table>
+          <tr>
+            <th width="200">Name</th>
+            <th>Description</th>
+          </tr>
+        </table>
       </subsection>
     </section>
   </body>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/external.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/external.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/external.xml	Sat Jan 31 17:23:11 2004
@@ -1,158 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Related External</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Related External</title>
   </properties> 
 
   <body>
     <section name="External Projects">
-      <subsection name="Avalon Compatible Projects">
+
+      <subsection name="Projects Embedding Eve">
+        <table>
+          <tr>
+            <th width="150">Name</th>
+            <th>Description</th>
+          </tr>
+        </table>
+      </subsection>
+      
+      <subsection name="Projects Using LDAP Code">
+        <table>
+          <tr>
+            <th width="150">Name</th>
+            <th>Description</th>
+          </tr>
+        </table>
+      </subsection>
+      
+      <subsection name="Projects Using Janus">
+        <table>
+          <tr>
+            <th width="150">Name</th>
+            <th>Description</th>
+          </tr>
+        </table>
+      </subsection>
+      
+      <subsection name="Projects Using Naming Commons">
         <table>
-	  <tr>
-	    <th width="150">Name</th>
-	    <th>Description</th>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://plexus.codehaus.org/">Plexus</a></p></td>
-	    <td><p>An Avalon container developed externally at Codehaus</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://keelframework.org/">Keel Framework</a></p></td>
-	    <td><p>
-             Keel is ready made server side infrastructure Keel incorporates 
-             multiple open source projects to provide you with a best of breed 
-             framework that works right out of the box.</p>
-            </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://jingdao.sourceforge.net">Jing DAO</a></p></td>
-	    <td><p>Jing is a Data Access Object (DAO) framework that supports 
-	        Avalon components and works within Avalon containers.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://open-im.net/">OpenIM Instant Messaging</a></p></td>
-	    <td>
-            <p>The purpose of the OpenIM project is to produce a
-            fast, simple, and highly efficient instant messager server
-            with high modularisation and a codebase that uses the
-            Avalon tools and <a
-            href="http://avalon.apache.org/merlin">Merlin
-            Container</a> created by Apache's Avalon project.</p>
-          </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://jcrontab.sf.net">Jcrontab</a></p></td>
-	    <td>
-            <p>JCrontab provides a simple Java implementation of the 
-              Unix cron service. An Avalon interface is provided.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a
-href="http://cvs.sourceforge.net/viewcvs.py/hibernate/HibernateExt/avalon/">
-Hibernate Wrapper</a></p></td>
-	    <td>
-            <p>Hibernate is a topnotch ORM tool.  An Avalon wrapper has 
-             been written to faciliate using Hibernate in an Avalon 
-             Environment.</p>
-          </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://xingu.sf.net/">Xingu Components</a></p></td>
-	    <td><p>
-            A collection of Avalon components including OJB and Hibernate
-            support, a business object API, ACL component, Messenging 
-            component and more!</p>
-          </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://phoenixjms.sf.net">PhoenixJMS</a></p></td>
-	    <td><p>An Avalon component wrapper for OpenJMS</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://www.enterpriseobjectbroker.org/">
-              Enterprise Object Broker</a></p></td>
-	    <td><p>a "post-J2EE" application server.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://telnetd.sourceforge.net/">Telnetd</a></p></td>
-	    <td><p>Java telnet implementation</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://spice.sf.net">Spice</a></p></td>
-	    <td><p>Spice is a repository of Components which support
-             Component Oriented Programming (COP) paradigms - in
-             particular, the Inversion of Control (IoC) design
-             pattern.</p>
-            </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://ivory.codehaus.org/">Ivory</a></p></td>
-	    <td><p> Ivory provides easy integration between your
-             exiting java classes, Avalon services, and Axis. It
-             allows easy deployment of soap services with none of the
-             WSDD configuration that Axis normally mandates. Simply
-             register your class or service and wa-la, you have a new
-             RPC SOAP service. However, it also allows Avalon services
-             to be used with the standard WSDD configuration easily.</p>
-            </td>
-	  </tr>
-	</table>
+          <tr>
+            <th width="150">Name</th>
+            <th>Description</th>
+          </tr>
+        </table>
       </subsection>
-      <subsection name="Alternative Frameworks">
+      
+      <subsection name="Projects Using Snickers">
         <table>
-           <tr>
-	     <th width="150">Name</th>
-	     <th>Description</th>
-	   </tr>
-	   <tr>
-	    <td><p><a href="http://picocontainer.org">Picocontainer</a></p></td>
-	    <td><p>Picocontainer is a light weight IoC framework.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://www.opensymphony.com:8668/space/WebWork2">WebWork 2</a></p></td>
-	    <td><p>an MVC web framework</p></td>
-	  </tr>
-	  <tr>
-	    <td><p>
-            <a href="http://www.jboss.org/index.html?module=html&amp;op=userdisplay&amp;id=developers/projects/jboss/aop">
-             JBoss AOP</a></p></td>
-	    <td><p>The JBoss Aspect Oriented Programming (AOP) framework</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://www.springframework.org/">Spring Framework</a></p></td>
-	    <td><p>A J2EE Application Framework</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://jakarta.apache.org/commons/sandbox/hivemind/">Hivemind</a></p></td>
-	    <td><p>HiveMind is a services and configuration microkernel. 
-                HiveMind allows you to create your application using a service 
-                oriented architecture.</p></td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://fractal.objectweb.org/">ObjectWeb Fractal</a></p></td>
-	    <td><p>
-	    Fractal is a modular and extensible component model that
-             can be used with various programming languages to design,
-             implement, deploy and reconfigure various systems and
-             applications, from operating systems to middleware
-             platforms and to graphical user interfaces. </p>
-            </td>
-	  </tr>
-	  <tr>
-	    <td><p><a href="http://lsd.student.utwente.nl/jicarilla">Jicarilla</a></p></td>
-	    <td><p>
-              The Jicarilla-Framework builds upon Type-3 IoC, adding
-             an Active interface to better support multi-threaded
-             components. Besides some pretty generic utility code
-             (like a set of base classes for nested exceptions), it
-             adds basic abstractions for the building blocks of
-             lightweight event-based systems, like sources, sinks,
-             stages, multicasters, etc.</p>
-            </td>
-	  </tr>
-	</table>
+          <tr>
+            <th width="150">Name</th>
+            <th>Description</th>
+          </tr>
+        </table>
       </subsection>
+      
     </section>
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/index.xml	Sat Jan 31 17:23:11 2004
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Related Projects</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Related Projects</title>
   </properties> 
 
   <body>
     <section name="Related Projects">
       <subsection name="Index">
         <table>
+	    
 	    <tr>
 	      <th width="150">Name</th>
 	      <th>Description</th>
 	    </tr>
+	    
 	    <tr>
 	      <td><a href="apache.html">Apache Projects</a></td>
-	      <td>Overview of a number of Apache projects that leverage 
-              the Avalon framework, containers, and shared components.
-              The page includes details of the James Enterprise Messaging 
-              Platform that leverages the Avalon component model and several
-              of the Cornerstone common components; the Turbine Fulcrum 
-              component suite and development related to the Merlin 
-              container, and the Cocoon project that is leveraging the 
-              Fortress container as part of their overall development 
-              strategy.</td>
+	      <td>
+	        Overview of a number of Apache projects that leverage Directory code.
+        </td>
 	    </tr>
+	    
 	    <tr>
 	      <td><a href="external.html">External Projects</a></td>
-	      <td>A list of external projects based on Avalon technochnologies
-             and services. This list includes a number of container iniatives 
-             that leverage the Avalon container contract together with third-party
-             container extensions, through to dedication applications such the 
-             OpenIM instant messaging project.</td>
+	      <td>
+	        A list of external projects based on Apache Directory technochnologies
+        </td>
 	    </tr>
+	    
 	    <tr>
-	      <td><a href="powered.html">Avalon Powered</a></td>
-	      <td>Resources for the Avalon Powered logo 
-               and site linking.<br/></td>
+	      <td><a href="powered.html">Directory Powered</a></td>
+	      <td>Resources for the Directory Powered logo and site linking.<br/></td>
 	    </tr>
 	  </table>
       </subsection>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,6 +18,14 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
+      <item name="Community" href="/community/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html"/>
+      <item name="Documentation" href="/doc/index.html"/>
+    </menu>
+
+    <menu name="About Directory">
+      <item name="Overview" href="/index.html"/>
       <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
       <item name="Products" href="/product/index.html"/>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/related/powered.xml	Sat Jan 31 17:23:11 2004
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Powered By</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Powered By</title>
   </properties> 
 
   <body>
     <section name="Related Projects">
       <subsection name="Powered-By Avalon">
       <p>
-        Got a project using Avalon?  Email the <a href="../mailing-lists.html">developers'
-        mailing list</a> and we'll add it to our site.
+        Got a project using Directory code?  Email the 
+        <a href="../mailing-lists.html">developers' mailing list</a> and we'll 
+        add it to our site.
       </p>
-      <img src="../images/avalon-power.png" alt="Avalon Power"/>
+      <img src="../images/avalon-power.png" alt="Directory Power"/>
     </subsection>
     </section>
   </body>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/index.xml	Sat Jan 31 17:23:11 2004
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Sandbox</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Sandbox</title>
   </properties> 
 
   <body>
     <section name="Sandbox">
      <p>
-       The Sandbox is where Avaloners play with radical new ideas that result
-       in long "random thought" [RT] email threads and a few flame wars.  If
-       you want to see what's on the bleeding edge of Avalon development, check
-       out the <a href="../cvs.html">avalon-sandbox</a> module from CVS.
+       The Sandbox is where we play with radical new ideas that result in long 
+       "random thought" [RT] email threads.
      </p>
      <subsection name="Sandbox Projects">
        <table>
@@ -21,24 +19,9 @@
 	  <th>Developers</th>
 	 </tr>
 	 <tr>
-	  <td>Avalon#</td>
-	  <td>A C# implementation of the Avalon framework</td>
-	  <td>hammett</td>
-	 </tr>
-	 <tr>
-	   <td>exporter</td>
-	   <td>An AltRMI exporter for Merlin components</td>
-	   <td>farra, mcconnell</td>
-	 </tr>
-	 <tr>
-	   <td>sevak</td>
-	   <td>Phoenix block for embedded web/servlet containers</td>
-	   <td>proyal</td>
-	 </tr>
-	 <tr>
-	   <td>eclipse</td>
-	   <td>Eclipse IDE plugins for Avalon development</td>
-	   <td>niclas</td>
+	  <td>abc123</td>
+	  <td>Just a place holder</td>
+	  <td>akarasulu</td>
 	 </tr>
        </table>
      </subsection>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/sandbox/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,9 +18,9 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html"/>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>
 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/index.xml	Sat Jan 31 17:23:11 2004
@@ -1,104 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Containers</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Eve Directory Server Sub-Project</title>
   </properties>
 
   <body>
-    <section name="Products">
-      <subsection name="Container Solutions">
-
-      <p>Within Avalon their are a number of container solutions. This 
-      reflects a historical divergence and a present convergence within 
-      the area of containment technology within Avalon. The original 
-      containment solutions ECM and Phoenix focussed on very different 
-      approaches to component management.  The ECM model dealt with 
-      primarily pooled objects used in environments such as 
-      <a href="http://cocoon.apache.org/">Cocoon</a>. The
-      Phoenix model dealt with a strict singleton model supporting 
-      project such as <a href="http://james.apache.org">James</a>.  
-      Recent developments have resulted in the 
-      release of 
-      <a href="http://avalon.apache.org/excalibur/fortress/">Fortress</a> 
-      and <a href="http://avalon.apache.org/merlin/">Merlin</a>.  
-      Fortress replaces the ECM solution
-      and is positioned as a migration vehicle for components to move
-      towards Avalon's latest container - Merlin.  The Merlin container
-      is an attempt at being a flexible and adaptive embedded container
-      that leverages a set of common containment facilities.
-      Merlin provides support for legacy Phoenix components and includes 
-      many of of the lifestyle concepts introduced within Fortress.</p>
-
-      <table>
-        <tr><th>Product</th><th>Description</th></tr>
-        <tr>
-          <td>
-            <p>
-              <a name="merlin"/>
-              <a href="http://avalon.apache.org/merlin/index.html">Avalon Merlin</a>
-            </p>
-          </td>
-          <td>
-            <p>
-                The Merlin project deals with the broad area of service
-                and component management. The Merlin system is a container
-                that provides comprehensive support for the management of
-                complex component-based systems. Merlin uses a component
-                meta-model to facilitate the automated assembly and
-                deployment of simple and composite components.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="fortress"/>
-              <a href="http://avalon.apache.org/excalibur/fortress/">Avalon Fortress</a>
-            </p>
-          </td>
-          <td>
-            <p>
-              Fortress contains a framework to help you create your own
-              avalon containers.  It boasts asynchronous management of your
-              component instances, high scalability, easier maintenance of
-              your code, and easy embedding into various environments like
-              servlet engines.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="ecm"/>
-              <a href="http://avalon.apache.org/excalibur/component.html">ECM</a>
-            </p>
-          </td>
-          <td>
-            <p>
-            This package contains the ExcaliburComponentManager (ECM). ECM has 
-            been depricated in favour of the new Fortress container.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="phoenix"/>
-              <a href="http://avalon.apache.org/phoenix/index.html">Phoenix</a>
-            </p>
-          </td>
-          <td>
-            <p>
-              Phoenix is a micro-kernel designed and implemented on top of 
-              the Avalon framework. It provides a number of facilities to 
-              manage the environment of Server Applications. Such facilities 
-              include log management, classloading, thread management and 
-              security.
-            </p>
-          </td>
-        </tr>
-      </table>
-      </subsection>
+    <section name="Eve Directory Server">
+      <p>
+        Comming soon ...
+      </p>
     </section>
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/eve/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,15 +18,14 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html">
-        <item name="Framework" href="/product/framework/index.html"/>
-        <item name="Containers" href="/product/containers/index.html">
-          <item name="Merlin" href="http://avalon.apache.org/merlin"/>
-          <item name="Fortress" href="http://avalon.apache.org/excalibur/fortress/"/>
-        </item>
-        <item name="Components" href="/product/components/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html">
+        <item name="Eve" href="/subprojects/eve/index.html"/>
+        <item name="LDAP" href="/subprojects/ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
       </item>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/index.xml	Sat Jan 31 17:23:11 2004
@@ -2,11 +2,11 @@
 <document>
   <properties>
     <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Major Subprojects</title>
+    <title>Apache Directory Project: Subprojects</title>
   </properties>
   
   <body>
-    <section name="Major Subprojects">
+    <section name="Subprojects">
       <p> 
         The Directory Project consists of a number of sub-projects. 
       </p>
@@ -16,37 +16,62 @@
           <th>Name</th>
           <th>Description</th>
         </tr>
-        <tr>
-          <td>
-            <a href="framework/index.html">Framework</a>
-          </td>
-          <td>
-            <p>The framework collection includes a component meta model used to 
-              describe component dependencies towards a container, and, the 
-              classic framework APIs that describe the runtime contact between 
-              a container and a component.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="containers/index.html">Containers</a>
-          </td>
-          <td>
-            <p>A container is a platform supporting the management of 
-              components. This page provides an overview of current and legacy 
-              container solutions and links to respective home pages.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="components/index.html">Components</a>
-          </td>
-          <td>
-            <p>The components page provides a summary of the two main component 
-              groups in Directory - the course grained cornerstone suite and 
-              the fine grain utilites under Excalibur.</p>
-          </td>
-        </tr>
+        
+        <tr>
+          <td>
+            <a href="eve/index.html">Eve</a>
+          </td>
+          <td>
+            <p>
+              Coming soon ...
+            </p>
+          </td>
+        </tr>
+        
+        <tr>
+          <td>
+            <a href="ldap/index.html">LDAP</a>
+          </td>
+          <td>
+            <p>
+              Coming soon ...
+            </p>
+          </td>
+        </tr>
+        
+        <tr>
+          <td>
+            <a href="janus/index.html">Janus</a>
+          </td>
+          <td>
+            <p>
+              Coming soon ...
+            </p>
+          </td>
+        </tr>
+        
+        <tr>
+          <td>
+            <a href="naming/index.html">Naming</a>
+          </td>
+          <td>
+            <p>
+              Coming soon ...
+            </p>
+          </td>
+        </tr>
+        
+        <tr>
+          <td>
+            <a href="snickers/index.html">Snickers</a>
+          </td>
+          <td>
+            <p>
+              Coming soon ...
+            </p>
+          </td>
+        </tr>
+        
       </table>
     </section>
   </body>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/index.xml	Sat Jan 31 17:23:11 2004
@@ -1,104 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Containers</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Janus Sub-Project</title>
   </properties>
 
   <body>
-    <section name="Products">
-      <subsection name="Container Solutions">
-
-      <p>Within Avalon their are a number of container solutions. This 
-      reflects a historical divergence and a present convergence within 
-      the area of containment technology within Avalon. The original 
-      containment solutions ECM and Phoenix focussed on very different 
-      approaches to component management.  The ECM model dealt with 
-      primarily pooled objects used in environments such as 
-      <a href="http://cocoon.apache.org/">Cocoon</a>. The
-      Phoenix model dealt with a strict singleton model supporting 
-      project such as <a href="http://james.apache.org">James</a>.  
-      Recent developments have resulted in the 
-      release of 
-      <a href="http://avalon.apache.org/excalibur/fortress/">Fortress</a> 
-      and <a href="http://avalon.apache.org/merlin/">Merlin</a>.  
-      Fortress replaces the ECM solution
-      and is positioned as a migration vehicle for components to move
-      towards Avalon's latest container - Merlin.  The Merlin container
-      is an attempt at being a flexible and adaptive embedded container
-      that leverages a set of common containment facilities.
-      Merlin provides support for legacy Phoenix components and includes 
-      many of of the lifestyle concepts introduced within Fortress.</p>
-
-      <table>
-        <tr><th>Product</th><th>Description</th></tr>
-        <tr>
-          <td>
-            <p>
-              <a name="merlin"/>
-              <a href="http://avalon.apache.org/merlin/index.html">Avalon Merlin</a>
-            </p>
-          </td>
-          <td>
-            <p>
-                The Merlin project deals with the broad area of service
-                and component management. The Merlin system is a container
-                that provides comprehensive support for the management of
-                complex component-based systems. Merlin uses a component
-                meta-model to facilitate the automated assembly and
-                deployment of simple and composite components.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="fortress"/>
-              <a href="http://avalon.apache.org/excalibur/fortress/">Avalon Fortress</a>
-            </p>
-          </td>
-          <td>
-            <p>
-              Fortress contains a framework to help you create your own
-              avalon containers.  It boasts asynchronous management of your
-              component instances, high scalability, easier maintenance of
-              your code, and easy embedding into various environments like
-              servlet engines.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="ecm"/>
-              <a href="http://avalon.apache.org/excalibur/component.html">ECM</a>
-            </p>
-          </td>
-          <td>
-            <p>
-            This package contains the ExcaliburComponentManager (ECM). ECM has 
-            been depricated in favour of the new Fortress container.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="phoenix"/>
-              <a href="http://avalon.apache.org/phoenix/index.html">Phoenix</a>
-            </p>
-          </td>
-          <td>
-            <p>
-              Phoenix is a micro-kernel designed and implemented on top of 
-              the Avalon framework. It provides a number of facilities to 
-              manage the environment of Server Applications. Such facilities 
-              include log management, classloading, thread management and 
-              security.
-            </p>
-          </td>
-        </tr>
-      </table>
-      </subsection>
+    <section name="Janus">
+      <p>
+        Coming soon ...
+      </p>
     </section>
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/janus/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,15 +18,14 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html">
-        <item name="Framework" href="/product/framework/index.html"/>
-        <item name="Containers" href="/product/containers/index.html">
-          <item name="Merlin" href="http://avalon.apache.org/merlin"/>
-          <item name="Fortress" href="http://avalon.apache.org/excalibur/fortress/"/>
-        </item>
-        <item name="Components" href="/product/components/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html">
+        <item name="Eve" href="/subprojects/eve/index.html"/>
+        <item name="LDAP" href="/subprojects/ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
       </item>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/index.xml	Sat Jan 31 17:23:11 2004
@@ -1,104 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Containers</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: LDAP Commons API and Clients Sub-Project</title>
   </properties>
 
   <body>
-    <section name="Products">
-      <subsection name="Container Solutions">
-
-      <p>Within Avalon their are a number of container solutions. This 
-      reflects a historical divergence and a present convergence within 
-      the area of containment technology within Avalon. The original 
-      containment solutions ECM and Phoenix focussed on very different 
-      approaches to component management.  The ECM model dealt with 
-      primarily pooled objects used in environments such as 
-      <a href="http://cocoon.apache.org/">Cocoon</a>. The
-      Phoenix model dealt with a strict singleton model supporting 
-      project such as <a href="http://james.apache.org">James</a>.  
-      Recent developments have resulted in the 
-      release of 
-      <a href="http://avalon.apache.org/excalibur/fortress/">Fortress</a> 
-      and <a href="http://avalon.apache.org/merlin/">Merlin</a>.  
-      Fortress replaces the ECM solution
-      and is positioned as a migration vehicle for components to move
-      towards Avalon's latest container - Merlin.  The Merlin container
-      is an attempt at being a flexible and adaptive embedded container
-      that leverages a set of common containment facilities.
-      Merlin provides support for legacy Phoenix components and includes 
-      many of of the lifestyle concepts introduced within Fortress.</p>
-
-      <table>
-        <tr><th>Product</th><th>Description</th></tr>
-        <tr>
-          <td>
-            <p>
-              <a name="merlin"/>
-              <a href="http://avalon.apache.org/merlin/index.html">Avalon Merlin</a>
-            </p>
-          </td>
-          <td>
-            <p>
-                The Merlin project deals with the broad area of service
-                and component management. The Merlin system is a container
-                that provides comprehensive support for the management of
-                complex component-based systems. Merlin uses a component
-                meta-model to facilitate the automated assembly and
-                deployment of simple and composite components.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="fortress"/>
-              <a href="http://avalon.apache.org/excalibur/fortress/">Avalon Fortress</a>
-            </p>
-          </td>
-          <td>
-            <p>
-              Fortress contains a framework to help you create your own
-              avalon containers.  It boasts asynchronous management of your
-              component instances, high scalability, easier maintenance of
-              your code, and easy embedding into various environments like
-              servlet engines.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="ecm"/>
-              <a href="http://avalon.apache.org/excalibur/component.html">ECM</a>
-            </p>
-          </td>
-          <td>
-            <p>
-            This package contains the ExcaliburComponentManager (ECM). ECM has 
-            been depricated in favour of the new Fortress container.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="phoenix"/>
-              <a href="http://avalon.apache.org/phoenix/index.html">Phoenix</a>
-            </p>
-          </td>
-          <td>
-            <p>
-              Phoenix is a micro-kernel designed and implemented on top of 
-              the Avalon framework. It provides a number of facilities to 
-              manage the environment of Server Applications. Such facilities 
-              include log management, classloading, thread management and 
-              security.
-            </p>
-          </td>
-        </tr>
-      </table>
-      </subsection>
+    <section name="Common LDAP APIs">
+      <p>
+        Coming soon ...
+      </p>
+    </section>
+    <section name="LDAP Clients">
+      <p>
+        Coming soon ...
+      </p>
     </section>
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/ldap/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,15 +18,14 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html">
-        <item name="Framework" href="/product/framework/index.html"/>
-        <item name="Containers" href="/product/containers/index.html">
-          <item name="Merlin" href="http://avalon.apache.org/merlin"/>
-          <item name="Fortress" href="http://avalon.apache.org/excalibur/fortress/"/>
-        </item>
-        <item name="Components" href="/product/components/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html">
+        <item name="Eve" href="/subprojects/eve/index.html"/>
+        <item name="LDAP" href="/subprojects/ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
       </item>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/index.xml	Sat Jan 31 17:23:11 2004
@@ -3,62 +3,15 @@
 <document>
 
   <properties>
-    <author email="mcconnell@apache.org">Stephen McConnell</author>
-    <title>Apache Avalon: Components</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Naming Commons Subproject</title>
   </properties>
 
   <body>
-    <section name="Component Library">
-     <subsection name="Index">
-      <table>
-        <tr><th>Topic</th><th>Description</th></tr>
-        <tr><td>
-          <a href="http://avalon.apache.org/components/index.html">Cornerstone Collection</a></td>
-          <td>
-            <p>
-        The cornerstone project is the home of a set of component blocks
-        that can be used to simplify application development.  These components
-        and typically singleton components that represent structural building 
-        blocks.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <a href="http://avalon.apache.org/excalibur/index.html">Excalibur Utilities</a></td>
-          <td>
-            <p>
-        The Excalibur project is the home of a set of utility services
-        used in the construction of formal blocks or container facilities.
-        Services include internationalizatioin, configuration utilities, 
-        thread management, SEDA sytel even handling, a logging subsystems, 
-        etc.
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <a href="http://avalon.apache.org/logkit/index.html">Avalon Logkit</a></td>
-          <td>
-            <p>
-	     Logkit is a complete logging framework (like log4j) as an
-	     Avalon component.  Most Avalon containers use it as the
-	     default logging implementation. 
-            </p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <a href="../../related/index.html">Third-Party Components</a></td>
-          <td>
-            <p>
-        A series of third-party components developed both here at Apache
-        and under external projects are described on this page. 
-            </p>
-          </td>
-        </tr>
-      </table>
-     </subsection>
+    <section name="Naming Commons">
+      <p>
+        Coming soon ...
+      </p>
     </section>
   </body>
 

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/naming/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,12 +18,14 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html">
-        <item name="Framework" href="/product/framework/index.html"/>
-        <item name="Containers" href="/product/containers/index.html"/>
-        <item name="Components" href="/product/components/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html">
+        <item name="Eve" href="/subprojects/eve/index.html"/>
+        <item name="LDAP" href="/subprojects/ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
       </item>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -18,12 +18,14 @@
 
     <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html">
-        <item name="Framework" href="/product/framework/index.html"/>
-        <item name="Containers" href="/product/containers/index.html"/>
-        <item name="Components" href="/product/components/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html">
+        <item name="Eve" href="/subprojects/eve/index.html"/>
+        <item name="LDAP" href="/subprojects/ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
       </item>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/index.xml	Sat Jan 31 17:23:11 2004
@@ -1,76 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document>
   <properties>
-    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Framework</title>
+    <author email="akarasulu@apache.org">Alex Karasulu</author>
+    <title>Apache Directory Project: Snickers Subproject</title>
   </properties> 
 
   <body>
-    <section name="Products">
-      <subsection name="Component Model">
-
-      <p>The Avalon Component model is made up of a combination of classic
-      interfaces that define the artifacts exchanged between a container and 
-      a component.  The requirements presented by a component to container
-      are expressed using meta-info descriptors that are colocated with 
-      component classes.  Interfaces and default implementations are described
-      under Avalon Framework package. The meta-info descriptors and related tools
-      are included under the Avalon Meta package.</p>
-
-      <table>
-        <tr><th>Product</th><th>Description</th></tr>
-        <tr>
-          <td>
-            <p>
-              <a name="framework"/>
-              <a href="http://avalon.apache.org/framework/" name="framework">Avalon Framework API and Implementation</a>
-            </p>
-          </td>
-          <td>
-            <p>The Avalon Framework API and Implementation consists of interfaces that define relationships between commonly used application components, best-of-practice pattern enforcements, and several lightweight convenience implementations of the generic components.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="meta"/>
-              <a href="http://avalon.apache.org/meta/" name="meta">Avalon Meta</a>
-            </p>
-          </td>
-          <td>
-            <p>The Avalon Meta Model defines the functional criteria for component types and services. A Type definition contains information about deployment and runtime dependencies together with information about the services that a component type can provide.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="util"/>
-              <a href="http://avalon.apache.org/util/" name="util">Avalon Utilities</a>
-            </p>
-          </td>
-          <td>
-            <p>A set of utilities shared by framework components supporting default property
-            management, environment variable resolution, exceptio reporting and a 
-            parameterized map implementation (using within the repositroy package).</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <p>
-              <a name="repository"/>
-              <a href="http://avalon.apache.org/repository/" 
-                  name="repository">Avalon Repository</a>
-            </p>
-          </td>
-          <td>
-            <p>A joint initative by the Avalon Project and the Apache Directory Project 
-             in the development of an inteligent bootstrappig, resource replication,
-             and artifact management framework.</p>
-          </td>
-        </tr>
-
-      </table>
-      </subsection>
+    <section name="Snickers">
+      <p>
+        Coming soon ...
+      </p>
     </section>
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/sitedocs/xdocs/subprojects/snickers/navigation.xml	Sat Jan 31 17:23:11 2004
@@ -2,7 +2,7 @@
 
 <project>
 
- <title>Apache Avalon</title>
+ <title>Apache Directory Project</title>
 
  <body>
 
@@ -16,14 +16,16 @@
       <item name="Snickers" href="/subprojects/snickers/index.html"/>
     </links>
 
-    <menu name="About Avalon">
+    <menu name="About Directory">
       <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
       <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html">
-        <item name="Framework" href="/product/framework/index.html"/>
-        <item name="Containers" href="/product/containers/index.html"/>
-        <item name="Components" href="/product/components/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Sub-Projects" href="/subprojects/index.html">
+        <item name="Eve" href="/subprojects/eve/index.html"/>
+        <item name="LDAP" href="/subprojects/ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
       </item>
       <item name="Documentation" href="/doc/index.html"/>
     </menu>